cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +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
co-authored by Contrabang Henri215 GDN GDN
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/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."