-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upgraded prisoner transport bus #51891
Merged
Merged
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
db244df
Merge pull request #18 from CleverRaven/master
faefux e40ab80
Merge pull request #19 from CleverRaven/master
faefux d252bd5
Merge pull request #20 from CleverRaven/master
faefux a1a2c84
Added the prison van to vans_buses.son
faefux 7e7a495
added deconstruct, etc. for the bench.
faefux ccf701f
Okay, Lets see if this one passes tests.
faefux c86a5a6
Added science ID for both prisoner van and prisoner bus.
faefux 85252fa
Change that right wall on the Prison Bus to be more aesthetically ple…
faefux de904e1
Added a nice little aisle light. I think this is the last thing.
faefux File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -1669,20 +1669,20 @@ | |||||
"type": "vehicle", | ||||||
"name": "Prison Bus", | ||||||
"blueprint": [ | ||||||
[ "'''O'''''O-" ], | ||||||
[ "'##O#####'H" ], | ||||||
[ "+........'>" ], | ||||||
[ "'##O####.'H" ], | ||||||
[ "'''O''''+O-" ] | ||||||
[ "''O'''''O-" ], | ||||||
[ "'#O###|##'H" ], | ||||||
[ "+.....+.#'>" ], | ||||||
[ "'#O###|o.'H" ], | ||||||
[ "''O''+'+O-" ] | ||||||
], | ||||||
"parts": [ | ||||||
{ "x": 0, "y": 0, "parts": [ "frame_cross", "seat", "seatbelt", "roof", "controls" ] }, | ||||||
{ "x": 0, "y": 0, "parts": [ "dashboard", "vehicle_alarm", "vehicle_clock", "horn_car" ] }, | ||||||
{ "x": 0, "y": -1, "part": "frame_vertical_left" }, | ||||||
{ "x": 0, "y": -1, "parts": [ "reinforced_windshield_vertical_left", "roof" ] }, | ||||||
{ "x": 0, "y": -1, "part": "plating_steel" }, | ||||||
{ "x": 0, "y": 1, "parts": [ "frame_cross", "roof", "aisle_vertical", "plating_steel" ] }, | ||||||
{ "x": 0, "y": 2, "parts": [ "frame_cross", "aisle_horizontal", "roof" ] }, | ||||||
{ "x": 0, "y": 1, "parts": [ "frame_cross", "roof", "seat", "seatbelt" ] }, | ||||||
{ "x": 0, "y": 2, "parts": [ "frame_cross", "aisle_vertical", "roof" ] }, | ||||||
{ "x": 0, "y": 3, "parts": [ "frame_vertical_right", "door_front_right", "roof" ] }, | ||||||
{ "x": 0, "y": 3, "part": "plating_steel" }, | ||||||
{ "x": 1, "y": -1, "parts": [ "frame_vertical_T_left", "reinforced_windshield_nw" ] }, | ||||||
|
@@ -1710,50 +1710,48 @@ | |||||
{ "x": 2, "y": 2, "part": "plating_steel" }, | ||||||
{ "x": 2, "y": 3, "parts": [ "frame_ne", "halfboard_ne", "headlight" ] }, | ||||||
{ "x": 2, "y": 3, "part": "plating_steel" }, | ||||||
{ "x": -1, "y": 0, "parts": [ "frame_cross", "reclining_seat", "seatbelt", "roof" ] }, | ||||||
{ "x": -1, "y": -1, "part": "frame_vertical_left" }, | ||||||
{ "x": -1, "y": -1, "parts": [ "reinforced_windshield_vertical_left", "roof" ] }, | ||||||
{ "x": -1, "y": -1, "part": "plating_steel" }, | ||||||
{ "x": -1, "y": 0, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -1, "y": 1, "parts": [ "frame_cross", "aisle_vertical", "roof" ] }, | ||||||
{ "x": -1, "y": 2, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -1, "y": 3, "part": "frame_vertical_right" }, | ||||||
{ "x": -1, "y": 3, "parts": [ "reinforced_windshield_vertical_right", "roof" ] }, | ||||||
{ "x": -1, "y": 3, "parts": [ "plating_steel", { "part": "tank", "fuel": "diesel" } ] }, | ||||||
{ "x": -1, "y": 1, "parts": [ "frame_cross", "roof", "aisle_vertical" ] }, | ||||||
{ "x": -1, "y": 2, "parts": [ "frame_cross", "box", "roof" ] }, | ||||||
{ "x": -1, "y": 3, "parts": [ "frame_cross", "reinforced_windshield_vertical_left", "roof", "plating_steel" ] }, | ||||||
{ "x": -2, "y": -1, "part": "frame_vertical_left" }, | ||||||
{ "x": -2, "y": -1, "parts": [ "reinforced_windshield_vertical_left", "roof" ] }, | ||||||
{ "x": -2, "y": -1, "part": "plating_steel" }, | ||||||
{ "x": -2, "y": 0, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -2, "y": 1, "parts": [ "frame_cross", "trunk_floor", "roof" ] }, | ||||||
{ "x": -2, "y": 2, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -2, "y": 0, "parts": [ "frame_cross", "reinforced_windshield_horizontal_front", "roof" ] }, | ||||||
{ "x": -2, "y": 1, "parts": [ "frame_cross", "hddoor", "roof" ] }, | ||||||
{ "x": -2, "y": 2, "parts": [ "frame_cross", "reinforced_windshield_horizontal_front", "roof" ] }, | ||||||
{ "x": -2, "y": 3, "part": "frame_vertical_right" }, | ||||||
{ "x": -2, "y": 3, "parts": [ "reinforced_windshield_vertical_right", "roof" ] }, | ||||||
{ "x": -2, "y": 3, "parts": [ "plating_steel", { "part": "tank", "fuel": "diesel" } ] }, | ||||||
{ "x": -3, "y": -1, "part": "frame_vertical_left" }, | ||||||
{ "x": -3, "y": -1, "parts": [ "reinforced_windshield_vertical_left", "roof" ] }, | ||||||
{ "x": -3, "y": -1, "part": "plating_steel" }, | ||||||
{ "x": -3, "y": 0, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -3, "y": 0, "parts": [ "frame_cross", "metal_bench", "roof" ] }, | ||||||
{ "x": -3, "y": 1, "parts": [ "frame_cross", "aisle_vertical", "roof" ] }, | ||||||
{ "x": -3, "y": 2, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -3, "y": 2, "parts": [ "frame_cross", "aisle_vertical", "roof" ] }, | ||||||
{ "x": -3, "y": 3, "part": "frame_vertical_right" }, | ||||||
{ "x": -3, "y": 3, "parts": [ "reinforced_windshield_vertical_right", "roof" ] }, | ||||||
{ "x": -3, "y": 3, "part": "plating_steel" }, | ||||||
{ "x": -3, "y": 3, "parts": [ "hddoor", "roof" ] }, | ||||||
{ "x": -3, "y": 3, "parts": [ "plating_steel", { "part": "tank", "fuel": "diesel" } ] }, | ||||||
{ "x": -4, "y": -1, "part": "frame_vertical_left" }, | ||||||
{ "x": -4, "y": -1, "parts": [ "reinforced_windshield_vertical_left", "roof" ] }, | ||||||
{ "x": -4, "y": -1, "part": "plating_steel" }, | ||||||
{ "x": -4, "y": 0, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -4, "y": 0, "parts": [ "frame_cross", "metal_bench", "roof" ] }, | ||||||
{ "x": -4, "y": 1, "parts": [ "frame_cross", "aisle_vertical", "roof" ] }, | ||||||
{ "x": -4, "y": 2, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -4, "y": 2, "parts": [ "frame_cross", "metal_bench", "roof" ] }, | ||||||
{ "x": -4, "y": 3, "part": "frame_vertical_right" }, | ||||||
{ "x": -4, "y": 3, "parts": [ "reinforced_windshield_vertical_right", "roof" ] }, | ||||||
{ "x": -4, "y": 3, "part": "plating_steel" }, | ||||||
{ "x": -5, "y": -1, "part": "frame_vertical_left" }, | ||||||
{ "x": -5, "y": -1, "parts": [ "reinforced_windshield_vertical_left", "roof" ] }, | ||||||
{ "x": -5, "y": -1, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, | ||||||
{ "x": -5, "y": -1, "part": "plating_steel" }, | ||||||
{ "x": -5, "y": 0, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -5, "y": 0, "parts": [ "frame_cross", "metal_bench", "roof" ] }, | ||||||
{ "x": -5, "y": 0, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, | ||||||
{ "x": -5, "y": 1, "parts": [ "frame_cross", "trunk_floor", "roof" ] }, | ||||||
{ "x": -5, "y": 2, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -5, "y": 1, "parts": [ "frame_cross", "aisle_vertical", "roof" ] }, | ||||||
{ "x": -5, "y": 2, "parts": [ "frame_cross", "metal_bench", "roof" ] }, | ||||||
{ "x": -5, "y": 2, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, | ||||||
{ "x": -5, "y": 3, "part": "frame_vertical_right" }, | ||||||
{ "x": -5, "y": 3, "parts": [ "reinforced_windshield_vertical_right", "roof" ] }, | ||||||
|
@@ -1762,18 +1760,18 @@ | |||||
{ "x": -6, "y": -1, "part": "frame_vertical_left" }, | ||||||
{ "x": -6, "y": -1, "parts": [ "reinforced_windshield_vertical_left", "roof" ] }, | ||||||
{ "x": -6, "y": -1, "part": "plating_steel" }, | ||||||
{ "x": -6, "y": 0, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -6, "y": 0, "parts": [ "frame_cross", "metal_bench", "roof" ] }, | ||||||
{ "x": -6, "y": 1, "parts": [ "frame_cross", "aisle_vertical", "roof" ] }, | ||||||
{ "x": -6, "y": 2, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -6, "y": 2, "parts": [ "frame_cross", "metal_bench", "roof" ] }, | ||||||
{ "x": -6, "y": 3, "part": "frame_vertical_right" }, | ||||||
{ "x": -6, "y": 3, "parts": [ "reinforced_windshield_vertical_right", "roof" ] }, | ||||||
{ "x": -6, "y": 3, "part": "plating_steel" }, | ||||||
{ "x": -7, "y": -1, "part": "frame_vertical_left" }, | ||||||
{ "x": -7, "y": -1, "parts": [ "reinforced_windshield_vertical_left", "roof" ] }, | ||||||
{ "x": -7, "y": -1, "part": "plating_steel" }, | ||||||
{ "x": -7, "y": 0, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -7, "y": 0, "parts": [ "frame_cross", "metal_bench", "roof" ] }, | ||||||
{ "x": -7, "y": 1, "parts": [ "frame_cross", "aisle_vertical", "roof" ] }, | ||||||
{ "x": -7, "y": 2, "parts": [ "frame_cross", "seat", "roof" ] }, | ||||||
{ "x": -7, "y": 2, "parts": [ "frame_cross", "metal_bench", "roof" ] }, | ||||||
{ "x": -7, "y": 3, "part": "frame_vertical_right" }, | ||||||
{ "x": -7, "y": 3, "parts": [ "reinforced_windshield_vertical_right", "roof" ] }, | ||||||
{ "x": -7, "y": 3, "part": "plating_steel" }, | ||||||
|
@@ -1791,21 +1789,8 @@ | |||||
{ "x": -8, "y": 3, "part": "plating_steel" } | ||||||
], | ||||||
"items": [ | ||||||
{ "x": -1, "y": 0, "chance": 7, "item_groups": [ "contraband" ] }, | ||||||
{ "x": 0, "y": 0, "chance": 20, "items": [ "id_science_transport_1" ] }, | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
{ "x": -1, "y": 2, "chance": 6, "item_groups": [ "contraband" ] }, | ||||||
{ "x": -2, "y": 0, "chance": 5, "item_groups": [ "contraband" ] }, | ||||||
{ "x": -2, "y": 2, "chance": 11, "item_groups": [ "contraband" ] }, | ||||||
{ "x": -3, "y": 0, "chance": 8, "item_groups": [ "contraband" ] }, | ||||||
{ "x": -3, "y": 2, "chance": 5, "item_groups": [ "contraband" ] }, | ||||||
{ "x": -4, "y": 0, "chance": 6, "item_groups": [ "contraband" ] }, | ||||||
{ "x": -4, "y": 2, "chance": 10, "item_groups": [ "contraband" ] }, | ||||||
{ "x": -5, "y": 0, "chance": 6, "item_groups": [ "contraband" ] }, | ||||||
{ "x": -5, "y": 2, "chance": 11, "item_groups": [ "contraband" ] }, | ||||||
{ "x": -6, "y": 0, "chance": 7, "item_groups": [ "contraband" ] }, | ||||||
{ "x": -6, "y": 2, "chance": 9, "item_groups": [ "contraband" ] }, | ||||||
{ "x": -7, "y": 0, "chance": 8, "item_groups": [ "contraband" ] }, | ||||||
{ "x": -7, "y": 2, "chance": 7, "item_groups": [ "contraband" ] } | ||||||
{ "x": -1, "y": 2, "chance": 35, "magazine": 100, "ammo": 50, "item_groups": [ "guns_cop" ] }, | ||||||
{ "x": -1, "y": 2, "chance": 20, "magazine": 100, "ammo": 50, "item_groups": [ "guns_shotgun_milspec" ] } | ||||||
] | ||||||
}, | ||||||
{ | ||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why delete the science ID chance? This was added just a month ago to give some ways to legally enter the new labs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Specifically this one would be considered to be on one of the guards as these prisoners were being rerouted for experimentation.
{ "x": 0, "y": 0, "chance": 20, "items": [ "id_science_transport_1" ] },
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll give it the same chance of spawning except in the front compartment somewhere if that's okay with you guys. :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It sounds fine to me!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good. :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added it to the box in the front cabin, @Termineitor244, as well as in the same spot on the prison van but with a smaller chance of spawning. I feel those boxes should both be lock boxes really, (so behind a lockpicking skill-check, i guess) but would this make the card not accessible enough?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be even better if its behind a lock! It would give even more of a sense of "This is something important, I should keep it with me". And a few locks are never enough deterrent for an experienced player.