Skip to content
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.

Sign up for GitHub

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

Jump to bottom

new brig remap x3 #5027

Merged
merged 12 commits into from
Dec 14, 2023
Merged

new brig remap x3 #5027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9ca7a48
brig remap full commit
ItsVyzo Nov 24, 2023
cf0843a
map fix and cmp locker access
ItsVyzo Nov 25, 2023
58ce260
commit
ItsVyzo Nov 25, 2023
821afba
fixes
ItsVyzo Nov 25, 2023
d517413
fixes
ItsVyzo Nov 25, 2023
6b52726
Merge branch 'new_brig_remap' of https://github.com/ItsVyzo/cmss13 in…
ItsVyzo Nov 25, 2023
7c5ff0f
Update code/game/objects/structures/crates_lockers/closets/secure/sec…
ItsVyzo Dec 3, 2023
5692dc9
Update code/game/objects/structures/crates_lockers/closets/secure/sec…
ItsVyzo Dec 3, 2023
f4f0c7f
harry feedback
ItsVyzo Dec 3, 2023
0d0b5dd
Merge remote-tracking branch 'cmss13-devs/master' into new_brig_remap
ItsVyzo Dec 12, 2023
512e0de
Update code/game/objects/structures/crates_lockers/closets/secure/sec…
ItsVyzo Dec 13, 2023
529d78e
Update code/game/objects/structures/crates_lockers/closets/secure/sec…
ItsVyzo Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/machinery/computer/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
if("Released")
background = "'background-color:#3BB9FF;'"
if("Suspect")
background = "'background-color:#1AAFFF;'"
background = "'background-color:#686A6C;'"
if("NJP")
background = "'background-color:#faa20a;'"
if("None")
Expand Down
8 changes: 8 additions & 0 deletions code/game/machinery/doors/brig_system.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,14 @@
name = "Cell 4"
id = "Cell 4"

/obj/structure/machinery/brig_cell/cell_5
name = "Cell 5"
id = "Cell 5"

/obj/structure/machinery/brig_cell/cell_6
name = "Cell 6"
id = "Cell 6"

/obj/structure/machinery/brig_cell/perma_1
name = "Perma 1"
id = "Perma 1"
Expand Down
17 changes: 17 additions & 0 deletions code/game/machinery/vending/vending_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,23 @@
)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/storage/donut_box = 2)

/obj/structure/machinery/vending/security/riot
name = "\improper RiotTech"
desc = "A security riot equipment vendor."
hacking_safety = TRUE
wrenchable = FALSE
products = list(
/obj/item/handcuffs/zip = 40,
/obj/item/explosive/grenade/flashbang = 20,
/obj/item/explosive/grenade/custom/teargas = 40,
/obj/item/ammo_magazine/smg/m39/rubber = 40,
/obj/item/ammo_magazine/pistol/rubber = 40,
/obj/item/ammo_magazine/pistol/mod88/rubber = 40,
/obj/item/ammo_magazine/rifle/rubber = 40,
/obj/item/ammo_magazine/rifle/m4ra/rubber = 40,
/obj/item/clothing/head/helmet/marine/MP = 8,
)

/obj/structure/machinery/vending/sea
name = "\improper SeaTech"
desc = "An equipment vendor designed to save lives"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)

/obj/structure/closet/secure_closet/warrant_officer
name = "chief MP's locker"
req_access = list(ACCESS_MARINE_BRIG)
req_access = list(ACCESS_MARINE_ARMORY)
icon_state = "secure_locked_warrant"
icon_closed = "secure_unlocked_warrant"
icon_locked = "secure_locked_warrant"
Expand Down
53 changes: 53 additions & 0 deletions code/game/objects/structures/crates_lockers/closets/secure/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,59 @@
locked = TRUE
var/id = null

/obj/structure/closet/secure_closet/brig/prisoner

/obj/structure/closet/secure_closet/brig/prisoner/Initialize()
. = ..()
new /obj/item/clothing/under/color/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/device/radio/headset(src)

/obj/structure/closet/secure_closet/brig/prison_uni
name = "Spare Prison Uniforms"
req_one_access = list(ACCESS_MARINE_BRIG, ACCESS_CIVILIAN_BRIG)
anchored = TRUE
locked = TRUE


/obj/structure/closet/secure_closet/brig/prison_uni/Initialize()
ItsVyzo marked this conversation as resolved.
Show resolved Hide resolved
. = ..()
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/under/color/orange(src)
new /obj/item/clothing/under/color/orange(src)
new /obj/item/clothing/under/color/orange(src)
new /obj/item/clothing/under/color/orange(src)
new /obj/item/clothing/under/color/orange(src)
new /obj/item/device/radio/headset(src)
new /obj/item/device/radio/headset(src)
new /obj/item/device/radio/headset(src)
new /obj/item/device/radio/headset(src)
new /obj/item/device/radio/headset(src)

/obj/structure/closet/secure_closet/brig/restraints
name = "Spare Restraints"
req_one_access = list(ACCESS_MARINE_BRIG, ACCESS_CIVILIAN_BRIG)
anchored = TRUE
locked = TRUE


/obj/structure/closet/secure_closet/brig/restraints/Initialize()
ItsVyzo marked this conversation as resolved.
Show resolved Hide resolved
. = ..()
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/clothing/glasses/sunglasses/blindfold(src)
new /obj/item/clothing/glasses/sunglasses/blindfold(src)
new /obj/item/clothing/glasses/sunglasses/blindfold(src)
new /obj/item/clothing/glasses/sunglasses/blindfold(src)
new /obj/item/clothing/glasses/sunglasses/blindfold(src)

/obj/structure/closet/secure_closet/brig/Initialize()
. = ..()
new /obj/item/clothing/under/color/orange(src)
Expand Down
Loading