cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4202 from mistyLuminescence/mappingstuff

Browse Source 
Chemist and Psychiatrist locker fixes, for real this time.
This commit is contained in:
Anewbe
2017-11-05 20:08:34 -06:00
committed by GitHub
parent c79cca6686 85d105d90a
commit 1126523497
3 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View File

@@ -243,21 +243,17 @@
New() New()
..() ..()
new /obj/item/clothing/under/rank/psych(src) new /obj/item/weapon/storage/box/pillbottles(src)
new /obj/item/clothing/under/rank/psych/turtleneck(src) new /obj/item/weapon/storage/box/pillbottles(src)
new /obj/item/clothing/suit/straight_jacket(src) new /obj/item/weapon/storage/box/beakers(src)
new /obj/item/weapon/reagent_containers/glass/bottle/stoxin(src) new /obj/item/weapon/storage/box/autoinjectors(src)
new /obj/item/weapon/reagent_containers/syringe(src) new /obj/item/weapon/storage/box/syringes(src)
new /obj/item/weapon/storage/pill_bottle/citalopram(src) new /obj/item/weapon/reagent_containers/dropper(src)
new /obj/item/weapon/reagent_containers/pill/methylphenidate(src) new /obj/item/weapon/reagent_containers/dropper(src)
new /obj/item/weapon/clipboard(src) new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/weapon/folder/white(src) new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/device/taperecorder(src) new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
new /obj/item/device/tape/random(src) new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
new /obj/item/device/tape/random(src)
new /obj/item/device/tape/random(src)
new /obj/item/device/camera(src)
new /obj/item/toy/plushie/therapy/blue(src)
return return
/obj/structure/closet/secure_closet/psych /obj/structure/closet/secure_closet/psych
@@ -274,8 +270,21 @@
New() New()
..() ..()
new /obj/item/weapon/storage/box/pillbottles(src) new /obj/item/clothing/under/rank/psych(src)
new /obj/item/weapon/storage/box/pillbottles(src) new /obj/item/clothing/under/rank/psych/turtleneck(src)
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/weapon/reagent_containers/glass/bottle/stoxin(src)
new /obj/item/weapon/reagent_containers/syringe(src)
new /obj/item/weapon/storage/pill_bottle/citalopram(src)
new /obj/item/weapon/reagent_containers/pill/methylphenidate(src)
new /obj/item/weapon/clipboard(src)
new /obj/item/weapon/folder/white(src)
new /obj/item/device/taperecorder(src)
new /obj/item/device/tape/random(src)
new /obj/item/device/tape/random(src)
new /obj/item/device/tape/random(src)
new /obj/item/device/camera(src)
new /obj/item/toy/plushie/therapy/blue(src)
return return
/obj/structure/closet/secure_closet/medical_wall /obj/structure/closet/secure_closet/medical_wall

1
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -210,6 +210,7 @@
icon_state = "vial" icon_state = "vial"
matter = list("glass" = 250) matter = list("glass" = 250)
volume = 30 volume = 30
w_class = ITEMSIZE_TINY
amount_per_transfer_from_this = 10 amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25) possible_transfer_amounts = list(5,10,15,25)
flags = OPENCONTAINER flags = OPENCONTAINER

4
maps/northern_star/polaris-1.dmm
View File

@@ -4630,7 +4630,7 @@
"bLb" = (/obj/effect/floor_decal/corner/pink{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bLb" = (/obj/effect/floor_decal/corner/pink{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay)
"bLc" = (/turf/simulated/floor,/area/medical/medbay_emt_bay) "bLc" = (/turf/simulated/floor,/area/medical/medbay_emt_bay)
"bLd" = (/obj/machinery/mech_recharger,/obj/machinery/light{dir = 1},/turf/simulated/floor/plating,/area/medical/medbay_emt_bay) "bLd" = (/obj/machinery/mech_recharger,/obj/machinery/light{dir = 1},/turf/simulated/floor/plating,/area/medical/medbay_emt_bay)
"bLe" = (/obj/structure/closet/secure_closet{name = "Psychiatrist's Locker"; req_access = list(64)},/obj/item/clothing/suit/straight_jacket{layer = 3},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/pill/methylphenidate,/obj/item/weapon/reagent_containers/pill/citalopram,/obj/item/weapon/reagent_containers/pill/citalopram,/obj/item/weapon/reagent_containers/pill/methylphenidate,/obj/item/weapon/reagent_containers/syringe,/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/wood,/area/medical/psych) "bLe" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/closet/secure_closet/psych,/turf/simulated/floor/wood,/area/medical/psych)
"bLf" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light{dir = 1},/turf/simulated/floor/wood,/area/medical/psych) "bLf" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light{dir = 1},/turf/simulated/floor/wood,/area/medical/psych)
"bLg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/wood,/area/medical/psych) "bLg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/wood,/area/medical/psych)
"bLh" = (/obj/structure/bookcase,/turf/simulated/floor/wood,/area/medical/psych) "bLh" = (/obj/structure/bookcase,/turf/simulated/floor/wood,/area/medical/psych)
@@ -4933,7 +4933,7 @@
"bQS" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bQS" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
"bQT" = (/obj/machinery/chem_master,/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bQT" = (/obj/machinery/chem_master,/turf/simulated/floor/tiled/white,/area/medical/chemistry)
"bQU" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bQU" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
"bQV" = (/obj/structure/closet/secure_closet/chemical,/obj/item/weapon/storage/box/pillbottles,/obj/item/device/radio/headset/headset_med,/obj/effect/floor_decal/corner/beige,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bQV" = (/obj/structure/closet/secure_closet/chemical,/obj/item/device/radio/headset/headset_med,/obj/effect/floor_decal/corner/beige,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
"bQW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/chemistry) "bQW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/chemistry)
"bQX" = (/obj/item/weapon/stool/padded,/obj/effect/landmark/start{name = "Paramedic"},/obj/effect/floor_decal/corner/pink{dir = 5},/obj/machinery/camera/network/medbay{c_tag = "MED - EMT Bay"; dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bQX" = (/obj/item/weapon/stool/padded,/obj/effect/landmark/start{name = "Paramedic"},/obj/effect/floor_decal/corner/pink{dir = 5},/obj/machinery/camera/network/medbay{c_tag = "MED - EMT Bay"; dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay)
"bQY" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bQY" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay)