cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 14:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes mentions of brig phys request terminal, replaces it with Detective, Give Detective disposals shipping (#18480)

Browse Source 
* bye bye brig phys

* mapping side

* wow! detective mail!

* Update code/game/machinery/requests_console.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Update code/game/machinery/requests_console.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Update code/game/machinery/requests_console.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Update code/game/machinery/requests_console.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
This commit is contained in:
Contrabang
2022-08-12 13:31:55 +01:00
committed by GitHub
co-authored by AffectedArc07
parent b38109e3d6
commit a5028fb0bf
6 changed files with 85 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Delta/delta.dmm
+7 -3
View File
@@ -36519,7 +36519,9 @@
},
/obj/machinery/requests_console{
name = "Detective Requests Console";
pixel_x = 30
pixel_x = 30;
department = "Detective";
departmentType = 5
},
/turf/simulated/floor/carpet,
/area/security/detectives_office)
@@ -40134,8 +40136,10 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/junction{
dir = 8
/obj/structure/disposalpipe/sortjunction{
dir = 8;
name = "Detective";
sortType = 24
},
/turf/simulated/floor/plasteel{
dir = 4;
_maps/map_files/MetaStation/MetaStation.dmm
+43 -8
View File
@@ -504,7 +504,9 @@
},
/obj/machinery/requests_console{
name = "Detective Requests Console";
pixel_y = 30
pixel_y = 30;
department = "Detective";
departmentType = 5
},
/turf/simulated/floor/carpet,
/area/security/detectives_office)
@@ -4825,6 +4827,9 @@
c_tag = "Detective's Office";
dir = 8
},
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-24"
},
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"axH" = (
@@ -11617,6 +11622,7 @@
dir = 4;
pixel_x = -32
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"aRO" = (
@@ -12701,6 +12707,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -54384,6 +54393,10 @@
d2 = 8;
icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -62986,12 +62999,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/disposalpipe/sortjunction{
dir = 1;
name = "Detective";
sortType = 24
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -66284,6 +66301,7 @@
/area/assembly/robotics)
"jIf" = (
/obj/machinery/hologram/holopad,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"jIs" = (
@@ -75982,6 +76000,10 @@
d2 = 8;
icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -78729,6 +78751,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/security/brig)
"pRz" = (
@@ -81551,6 +81576,7 @@
pixel_x = -28;
pixel_y = -7
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"rpG" = (
@@ -85238,6 +85264,10 @@
d2 = 4;
icon_state = "1-4"
},
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
@@ -87695,6 +87725,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/security/brig)
"usg" = (
@@ -89622,6 +89655,9 @@
d2 = 8;
icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -93303,9 +93339,8 @@
},
/area/engine/break_room)
"xta" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-24"
},
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal,
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"xtp" = (
@@ -125140,7 +125175,7 @@ mwK
jMs
lDa
uGy
rFq
ckr
cjQ
qeK
apz
@@ -125911,7 +125946,7 @@ mwK
arP
nvY
uGy
oNr
wyE
apP
hjE
awp
@@ -126168,7 +126203,7 @@ mwK
gvd
aSm
aSm
oNr
wyE
apP
uak
awp
_maps/map_files/cyberiad/cyberiad.dmm
+27 -3
View File
@@ -10963,7 +10963,6 @@
},
/area/hallway/primary/fore)
"aDn" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/light{
dir = 4
},
@@ -10976,6 +10975,11 @@
c_tag = "Brig Cell Block A South";
dir = 8
},
/obj/structure/disposalpipe/sortjunction{
dir = 2;
name = "Detective";
sortType = 24
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "rampbottom"
@@ -10994,6 +10998,10 @@
pixel_x = -24
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "rampbottom"
@@ -11427,6 +11435,7 @@
d2 = 4;
icon_state = "1-4"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkredcorners"
@@ -11983,6 +11992,7 @@
id_tag = "Secure Gate";
name = "Security Blast Door"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -12298,6 +12308,10 @@
/obj/machinery/camera{
c_tag = "Brig Detective's Office"
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -12322,6 +12336,10 @@
d2 = 8;
icon_state = "1-8"
},
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -12864,6 +12882,7 @@
/area/security/detectives_office)
"aHX" = (
/obj/machinery/hologram/holopad,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -13422,7 +13441,6 @@
},
/area/security/detectives_office)
"aJl" = (
/obj/machinery/vending/cigarette,
/obj/machinery/light_switch{
dir = 1;
name = "south bump";
@@ -13431,6 +13449,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -13449,7 +13471,9 @@
},
/obj/machinery/requests_console{
name = "Detective Requests Console";
pixel_y = -30
pixel_y = -30;
department = "Detective";
departmentType = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
code/_globalvars/lists/flavor_misc.dm
+1 -1
View File
@@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals",
"Atmospherics", "HoS Office", "Security", "Medbay",
"CMO Office", "Chemistry", "Research", "RD Office",
"Robotics", "HoP Office", "Library", "Chapel", "Captain's Office",
"Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics"))
"Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics", "Detective"))
GLOBAL_LIST_INIT(hit_appends, list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF"))
code/datums/supplypacks.dm
+1 -1
View File
@@ -758,7 +758,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
name = "HEADER"
containertype = /obj/structure/closet/crate/medical
group = SUPPLY_MEDICAL
announce_beacons = list("Medbay" = list("Medbay", "Chief Medical Officer's Desk"), "Security" = list("Brig Medbay"))
announce_beacons = list("Medbay" = list("Medbay", "Chief Medical Officer's Desk"))
/datum/supply_packs/medical/supplies
code/game/machinery/requests_console.dm
+6 -6
View File
@@ -20,12 +20,12 @@
#define RCS_SHIP_LOG 10 // View Shipping Label Log
//Radio list
#define ENGI_ROLES list("Atmospherics","Engineering","Chief Engineer's Desk","Telecoms Admin")
#define SEC_ROLES list("Warden","Security","Brig Medbay","Head of Security's Desk")
#define MISC_ROLES list("Bar","Chapel","Kitchen","Hydroponics","Janitorial")
#define MED_ROLES list("Virology","Chief Medical Officer's Desk","Medbay")
#define COM_ROLES list("Blueshield","NT Representative","Head of Personnel's Desk","Captain's Desk","Bridge")
#define SCI_ROLES list("Robotics","Science","Research Director's Desk")
#define ENGI_ROLES list("Atmospherics", "Engineering", "Chief Engineer's Desk")
#define SEC_ROLES list("Warden", "Security", "Detective", "Head of Security's Desk")
#define MISC_ROLES list("Bar", "Chapel", "Kitchen", "Hydroponics", "Janitorial")
#define MED_ROLES list("Virology", "Chief Medical Officer's Desk", "Medbay")
#define COM_ROLES list("Blueshield", "NT Representative", "Head of Personnel's Desk", "Captain's Desk", "Bridge")
#define SCI_ROLES list("Robotics", "Science", "Research Director's Desk")
#define RQ_NONEW_MESSAGES 0
#define RQ_NORMALPRIORITY 1