cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes the Quartermaster a Head of Staff (#22133)

Browse Source 
* remote

* more additions

* tgui + ssu

* map edits

* Shut your mug

More changes, huds, mugs and icons.

* mug time

* aaaa

* fixes cere edits

* should fix it

* Update tgui/packages/tgui/interfaces/common/CrewManifest.js

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/game/machinery/suit_storage_unit.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Revert "Update tgui/packages/tgui/interfaces/common/CrewManifest.js"

This reverts commit 5de07cba58.

* mugs all the way down

Fixes locker headset oversight, adds icon for supply management console, new QM mug sprite

* more map changes

* wow this worked?

* Misplaced comma

Removes a misplaced comma.

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Mr QM's Wild Ride

Resolves a number of review comments, including preventing the QM slot being altered by the B/E event, adds a flash to the locker and reverts removal of basic cargo access from the HOP.

* Forgot a var name change, I'm gonna cry edition.

Renames name to board_name for supply ID computer.

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* genesis 1:3

Alters light_color of supply management console to brown_orange from light_color_red

* Update code/modules/events/bureaucratic_error.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* another misplaced comma

Removes a comms where there should not be one.

* saving private ryan

Removes plasmacutter, adds mining GPS and crew monitor to QM locker contents.

* redone map changes

* oop

* the last of it

* merge time

---------

Co-authored-by: GDN <Roanrichards1@Gmail.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
Marm
2023-09-10 20:53:05 +01:00
committed by GitHub
parent 2866ac94ec
commit e59f0e8aea
32 changed files with 800 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/control_wand.dm
+1 -1
View File
@@ -124,7 +124,7 @@
/obj/item/door_remote/civillian
name = "civilian door remote"
icon_state = "gangtool-white"
region_access = list(REGION_GENERAL, REGION_SUPPLY)
region_access = list(REGION_GENERAL)
additional_access = list(ACCESS_HOP)
/obj/item/door_remote/centcomm
code/game/objects/items/devices/radio/encryptionkey.dm
+6 -1
View File
@@ -129,7 +129,12 @@
/obj/item/encryptionkey/heads/hop
name = "Head of Personnel's Encryption Key"
icon_state = "hop_cypherkey"
channels = list("Supply" = 1, "Service" = 1, "Security" = 0, "Command" = 1)
channels = list("Service" = 1, "Security" = 0, "Command" = 1)
/obj/item/encryptionkey/heads/qm
name = "Quartermaster's Encryption Key"
icon_state = "qm_cypherkey"
channels = list("Supply" = 1, "Command" = 1)
/obj/item/encryptionkey/heads/ntrep
name = "Nanotrasen Representative's Encryption Key"
code/game/objects/items/devices/radio/headset.dm
+7
View File
@@ -267,6 +267,13 @@
item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/hop
/obj/item/radio/headset/heads/qm
name = "quartermaster's headset"
desc = "Smelling of tobacco and gunpowder, this headset has likely seen many backroom deals."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/qm
/obj/item/radio/headset/headset_cargo
name = "supply radio headset"
desc = "A headset used by the cargo department."
code/game/objects/items/weapons/storage/boxes.dm
+1 -1
View File
@@ -312,7 +312,7 @@
/obj/item/storage/box/deathimp/populate_contents()
for(var/I in 1 to 6)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implanter(src)
new /obj/item/implanter/death_alarm (src)
/obj/item/storage/box/tapes
name = "Tape Box"
code/game/objects/items/weapons/storage/garment.dm
+8 -4
View File
@@ -195,12 +195,16 @@
new /obj/item/clothing/under/rank/cargo/quartermaster(src)
new /obj/item/clothing/under/rank/cargo/quartermaster/skirt(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/suit/hooded/wintercoat/cargo(src)
new /obj/item/clothing/suit/jacket/cargobomber(src)
new /obj/item/clothing/head/hardhat/orange(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas/explorer(src)
new /obj/item/clothing/suit/hooded/explorer(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/clothing/head/soft(src)
new /obj/item/clothing/gloves/fingerless(src)
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/tank/internals/emergency_oxygen/double(src)
/obj/item/storage/bag/garment/warden
name = "warden's garment bag"
code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
+10 -1
View File
@@ -21,8 +21,17 @@
open_door_sprite = "mining_door"
/obj/structure/closet/secure_closet/quartermaster/populate_contents()
new /obj/item/radio/headset/headset_cargo(src)
new /obj/item/radio/headset/heads/qm(src)
new /obj/item/door_remote/quartermaster(src)
new /obj/item/organ/internal/eyes/cybernetic/meson(src)
new /obj/item/storage/bag/garment/quartermaster(src)
new /obj/item/clothing/accessory/medal/supply(src)
new /obj/item/fulton_core(src)
new /obj/item/extraction_pack(src)
new /obj/item/gps/mining(src)
new /obj/item/sensor_device(src)
new /obj/item/rcs(src)
new /obj/item/destTagger(src)
new /obj/item/reagent_containers/food/drinks/mug/qm(src)
new /obj/item/flash(src)