shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Last roundup of fixes

Browse Source
This commit is contained in:
keronshb
2021-10-16 10:45:44 -04:00
parent df0e95885e
commit 9f13c7d8f3
4 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/SpookyStation/SpookyStation.dmm
+17 -17
View File
@@ -420,7 +420,7 @@
"aid" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/door/airlock/command/glass{name = "Bridge"; req_access_txt = "19"},/turf/open/floor/wood,/area/eventmap/inside)
"aie" = (/obj/structure/cable/white{icon_state = "2-4"},/obj/machinery/light/small{dir = 8},/turf/open/floor/carpet/purple,/area/eventmap/inside)
"aif" = (/obj/machinery/vending/cola/red,/turf/open/floor/wood,/area/eventmap/inside)
"aig" = (/obj/item/caution,/turf/open/floor/carpet/green,/area/eventmap/inside)
"aig" = (/obj/effect/turf_decal/caution,/turf/open/floor/carpet/green,/area/eventmap/inside)
"aih" = (/obj/structure/chair/wood{dir = 1},/turf/open/floor/carpet/green,/area/eventmap/inside)
"aii" = (/turf/open/floor/carpet/red,/area/eventmap/inside)
"aij" = (/mob/living/simple_animal/mouse/brown/Tom,/turf/open/floor/carpet/red,/area/eventmap/inside)
@@ -628,7 +628,7 @@
"amd" = (/obj/structure/table/optable,/obj/item/healthanalyzer/advanced,/obj/item/clothing/gloves/color/latex/nitrile,/obj/item/clothing/mask/surgical,/turf/open/floor/plasteel{icon_state = "sepia"},/area/eventmap/inside)
"ame" = (/obj/structure/bookcase/random/adult,/turf/open/floor/carpet/royalblue,/area/eventmap/inside)
"amf" = (/obj/structure/bookcase/random/fiction,/turf/open/floor/carpet/royalblue,/area/eventmap/inside)
"amg" = (/obj/structure/bookcase/random/nonfiction{book_count = 5},/turf/open/floor/carpet/royalblue,/area/eventmap/inside)
"amg" = (/obj/structure/bookcase/random/nonfiction{books_to_load = 5},/turf/open/floor/carpet/royalblue,/area/eventmap/inside)
"amh" = (/obj/structure/bookcase/random/reference,/turf/open/floor/carpet/royalblue,/area/eventmap/inside)
"ami" = (/obj/structure/bookcase/random/religion,/turf/open/floor/carpet/royalblue,/area/eventmap/inside)
"amj" = (/obj/structure/bookcase/manuals/medical,/turf/open/floor/carpet/royalblue,/area/eventmap/inside)
@@ -636,7 +636,7 @@
"aml" = (/obj/structure/flora/grass/jungle/b,/obj/effect/wisp,/turf/open/floor/spooktime/spooktimegrass,/area/eventmap/outside)
"amm" = (/obj/item/candle/infinite,/turf/open/floor/spooktime/nonspooktimegrass,/area/eventmap/outside)
"amn" = (/obj/structure/flora/junglebush{icon_state = "grassa4"},/obj/effect/wisp,/turf/open/floor/spooktime/nonspooktimegrass,/area/eventmap/outside)
"amo" = (/obj/item/toy/tennis/rainbow,/turf/open/floor/carpet/royalblue,/area/eventmap/inside)
"amo" = (/obj/item/toy/fluff/tennis_poly/tri/squeak/rainbow,/turf/open/floor/carpet/royalblue,/area/eventmap/inside)
"amp" = (/obj/item/seeds/pumpkin,/turf/open/floor/wood,/area/eventmap/inside)
"amq" = (/obj/structure/bedsheetbin/color,/obj/structure/table/reinforced/brass,/obj/item/storage/fancy/donut_box,/turf/open/floor/wood,/area/eventmap/inside)
"amr" = (/obj/item/chair/wood/wings{dir = 1},/turf/open/floor/wood,/area/eventmap/inside)
@@ -1098,8 +1098,8 @@
"avf" = (/obj/structure/kitchenspike,/obj/effect/decal/cleanable/blood/splatter{icon_state = "floor5"},/obj/item/stack/sheet/animalhide/human,/obj/effect/turf_decal/weather/snow/corner{color = "#991111"; dir = 1},/turf/open/floor/plasteel/dark/side,/area/eventmap/inside)
"avg" = (/obj/structure/kitchenspike,/obj/effect/decal/cleanable/blood/splatter{icon_state = "gibtorso"},/obj/effect/turf_decal/weather/snow/corner{color = "#991111"; dir = 5},/turf/open/floor/plasteel/dark/corner{dir = 8},/area/eventmap/inside)
"avh" = (/turf/closed/indestructible/necropolis,/area/eventmap/inside)
"avi" = (/obj/screen/alert/status_effect/blooddrunk{desc = "You see your disfigured skull screaming on the wall."; icon = 'icons/mob/screen_gen.dmi'; icon_state = "Devil-6"; name = "Foolish creature of meat and bone."},/turf/closed/indestructible/necropolis,/area/eventmap/inside)
"avj" = (/obj/screen/alert/status_effect/blooddrunk{desc = "You feel hollow and empy inside."; icon = 'icons/effects/cult_effects.dmi'; icon_state = "cultshield"; name = "You should not have come here."},/turf/closed/indestructible/necropolis,/area/eventmap/inside)
"avi" = (/atom/movable/screen/alert/status_effect/blooddrunk{desc = "You see your disfigured skull screaming on the wall."; icon = 'icons/mob/screen_gen.dmi'; icon_state = "Devil-6"; name = "Foolish creature of meat and bone."},/turf/closed/indestructible/necropolis,/area/eventmap/inside)
"avj" = (/atom/movable/screen/alert/status_effect/blooddrunk{desc = "You feel hollow and empy inside."; icon = 'icons/effects/cult_effects.dmi'; icon_state = "cultshield"; name = "You should not have come here."},/turf/closed/indestructible/necropolis,/area/eventmap/inside)
"avk" = (/obj/structure/necropolis_gate,/obj/structure/mineral_door/iron,/turf/open/floor/wood,/area/eventmap/inside)
"avl" = (/obj/structure/sink/kitchen{pixel_y = 28},/obj/structure/closet/crate/bin{storage_capacity = 300},/turf/open/floor/plasteel/cafeteria,/area/eventmap/inside)
"avm" = (/obj/structure/bed,/obj/item/bedsheet/captain,/turf/open/floor/carpet/royalblue,/area/eventmap/inside)
@@ -1127,9 +1127,9 @@
"avI" = (/obj/effect/turf_decal/weather/snow/corner{color = "#991111"},/obj/effect/decal/cleanable/blood/splatter{icon_state = "floor5"},/turf/open/floor/plasteel/dark,/area/eventmap/inside)
"avJ" = (/obj/effect/decal/cleanable/blood/splatter{icon_state = "gib4"},/turf/open/floor/plasteel/dark,/area/eventmap/inside)
"avK" = (/obj/effect/turf_decal/weather/snow/corner{color = "#991111"; dir = 4},/obj/effect/gibspawner/human,/turf/open/floor/plasteel/dark/side{dir = 8},/area/eventmap/inside)
"avL" = (/obj/screen/alert/status_effect/blooddrunk{desc = "I'M WATCHING YOU, COWARD."; name = "???"},/turf/open/indestructible/spooknecropolis,/area/eventmap/inside)
"avL" = (/atom/movable/screen/alert/status_effect/blooddrunk{desc = "I'M WATCHING YOU, COWARD."; name = "???"},/turf/open/indestructible/spooknecropolis,/area/eventmap/inside)
"avM" = (/turf/open/indestructible/spooknecropolis,/area/eventmap/inside)
"avN" = (/obj/screen/alert/status_effect/blooddrunk{desc = "YOUR SOUL IS MINE, MORTAL."; name = "???"},/turf/open/indestructible/spooknecropolis,/area/eventmap/inside)
"avN" = (/atom/movable/screen/alert/status_effect/blooddrunk{desc = "YOUR SOUL IS MINE, MORTAL."; name = "???"},/turf/open/indestructible/spooknecropolis,/area/eventmap/inside)
"avO" = (/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/sugar,/turf/open/floor/plasteel/cafeteria,/area/eventmap/inside)
"avP" = (/obj/structure/bookcase/random/fiction,/turf/open/floor/wood{icon_state = "wood-broken3"},/area/eventmap/inside)
"avQ" = (/obj/structure/bed,/obj/item/bedsheet/random,/obj/machinery/button/door/dorms/dorm15,/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood,/area/eventmap/inside)
@@ -1283,8 +1283,8 @@
"ayI" = (/obj/structure/kitchenspike,/obj/item/stack/sheet/animalhide/lizard,/obj/effect/turf_decal/weather/snow/corner{color = "#991111"},/obj/effect/decal/cleanable/blood/tracks,/obj/effect/decal/cleanable/blood/splatter{icon_state = "floor4-old"},/obj/effect/decal/cleanable/blood/splatter{icon_state = "splatter4"},/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,/turf/open/floor/plasteel/dark/side{dir = 1},/area/eventmap/inside)
"ayJ" = (/obj/structure/kitchenspike,/obj/item/stack/sheet/animalhide/monkey,/obj/effect/turf_decal/weather/snow/corner{color = "#991111"},/obj/effect/decal/cleanable/blood/tracks,/obj/effect/decal/cleanable/blood/splatter{icon_state = "gibmid3"},/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/turf/open/floor/plasteel/dark/side{dir = 1},/area/eventmap/inside)
"ayK" = (/obj/structure/kitchenspike,/obj/item/stack/sheet/animalhide/xeno,/obj/effect/turf_decal/weather/snow/corner{color = "#991111"; dir = 6},/obj/effect/decal/cleanable/blood/tracks,/obj/effect/decal/cleanable/blood/splatter{icon_state = "xgib2"},/obj/effect/decal/cleanable/blood/splatter{icon_state = "xgiblarvahead"},/obj/item/reagent_containers/food/snacks/meat/slab/xeno,/obj/item/reagent_containers/food/snacks/meat/slab/xeno,/turf/open/floor/plasteel/dark/corner{dir = 1},/area/eventmap/inside)
"ayL" = (/obj/screen/alert/status_effect/blooddrunk{desc = "BEWARE, I LIVE."; name = "???"},/turf/open/indestructible/spooknecropolis,/area/eventmap/inside)
"ayM" = (/obj/screen/alert/status_effect/blooddrunk{desc = "WELCOME TO HELL, CURSED ONE."; name = "???"},/turf/open/indestructible/spooknecropolis,/area/eventmap/inside)
"ayL" = (/atom/movable/screen/alert/status_effect/blooddrunk{desc = "BEWARE, I LIVE."; name = "???"},/turf/open/indestructible/spooknecropolis,/area/eventmap/inside)
"ayM" = (/atom/movable/screen/alert/status_effect/blooddrunk{desc = "WELCOME TO HELL, CURSED ONE."; name = "???"},/turf/open/indestructible/spooknecropolis,/area/eventmap/inside)
"ayN" = (/turf/closed/indestructible/spookytime/matrixblocker,/area/eventmap/mountain)
"ayO" = (/turf/open/floor/spooktime/cobble/sideS,/area/eventmap/outside)
"ayP" = (/obj/structure/fluff/bus/passable{icon_state = "wheredahoodat"},/turf/open/floor/spooktime/cobble/sideW{icon_state = "cobble_side_n"},/area/eventmap/outside)
@@ -1602,7 +1602,7 @@
"aEP" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/turf/open/floor/plasteel{icon_state = "sepia"},/area/eventmap/inside)
"aEQ" = (/obj/machinery/door/airlock{name = "Bar Backroom"; req_access_txt = "25"},/turf/open/floor/wood,/area/eventmap/inside)
"aER" = (/obj/structure/chair/sofa/right,/turf/open/floor/wood,/area/eventmap/mountaininside)
"aES" = (/obj/structure/table/optable,/obj/item/reagent_containers/glass/bowl,/obj/item/toy/tennis/red,/obj/item/clothing/neck/petcollar,/turf/open/floor/plasteel/dark,/area/eventmap/inside)
"aES" = (/obj/structure/table/optable,/obj/item/reagent_containers/glass/bowl,/obj/item/toy/fluff/tennis_poly/red,/obj/item/clothing/neck/petcollar,/turf/open/floor/plasteel/dark,/area/eventmap/inside)
"aET" = (/obj/effect/decal/cleanable/dirt{desc = "A thin layer of dust coating the floor."; name = "dust"},/turf/open/floor/mineral/titanium/white{name = "padded floor"},/area/eventmap/inside)
"aEU" = (/obj/structure/blob/normal{color = "#777777"; name = "peculiar goo"},/turf/open/floor/spooktime/dirtpatch,/area/eventmap/mountain)
"aEV" = (/obj/structure/table/plasmaglass,/obj/item/stock_parts/cell/hyper,/obj/item/stock_parts/cell/hyper,/obj/item/stock_parts/cell/hyper,/obj/item/stock_parts/cell/hyper,/obj/item/stock_parts/cell/hyper,/obj/item/stock_parts/cell/hyper,/obj/machinery/light/floor{alpha = 0; light_range = 20; mouse_opacity = 0},/turf/open/floor/circuit/off,/area/eventmap/mountaininside)
@@ -1613,7 +1613,7 @@
"aFa" = (/obj/item/flashlight/glowstick/cyan,/turf/open/floor/wood,/area/eventmap/inside)
"aFb" = (/obj/effect/decal/cleanable/cobweb/cobweb2,/obj/structure/spacevine,/turf/open/floor/spooktime/dirtpatch,/area/eventmap/mountain)
"aFc" = (/obj/structure/flora/tree/spookytimexl,/turf/open/floor/spooktime/spooktimegrass,/area/eventmap/outside)
"aFd" = (/turf/closed/wall/r_wall/rust,/area/quartermaster/miningstorage)
"aFd" = (/turf/closed/wall/r_wall/rust,/area/cargo/miningstorage)
"aFe" = (/obj/machinery/door/airlock/wood/dorms/patient1,/turf/open/floor/wood,/area/eventmap/inside)
"aFf" = (/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/wood/damturf/broken3,/area/eventmap/inside)
"aFg" = (/obj/machinery/door/airlock/security/glass{name = "Security Office"; req_access_txt = "63"},/obj/machinery/door/firedoor,/turf/open/floor/wood,/area/eventmap/inside)
@@ -1694,7 +1694,7 @@
"aGD" = (/obj/structure/flora/tree/spookytime,/turf/open/floor/spooktime/nonspooktimegrass,/area/eventmap/outside)
"aGE" = (/obj/structure/destructible/cult/tome,/turf/open/floor/wood,/area/eventmap/inside)
"aGF" = (/obj/effect/decal/cleanable/blood/tracks,/obj/effect/decal/cleanable/dirt,/turf/open/floor/carpet/royalblack,/area/eventmap/inside)
"aGG" = (/turf/closed/wall/rust,/area/quartermaster/miningstorage)
"aGG" = (/turf/closed/wall/rust,/area/cargo/miningstorage)
"aGH" = (/obj/structure/bed,/obj/item/bedsheet/random,/obj/machinery/button/door/dorms/patient2,/turf/open/floor/wood,/area/eventmap/inside)
"aGI" = (/obj/machinery/light{dir = 8},/obj/structure/table/wood/fancy,/turf/open/floor/wood,/area/eventmap/mountaininside)
"aGJ" = (/obj/item/chair,/turf/open/floor/spooktime/dirtpatch,/area/eventmap/mountaininside)
@@ -2169,11 +2169,11 @@
"aPK" = (/obj/item/clothing/neck/petcollar,/turf/open/floor/wood,/area/eventmap/inside)
"aPL" = (/obj/structure/fluff/broken_flooring,/turf/open/floor/plating,/area/eventmap/mountaininside)
"aPM" = (/obj/machinery/recycler/lumbermill,/turf/open/floor/plating,/area/eventmap/mountaininside)
"aPN" = (/obj/structure/cable/white{icon_state = "4-8"},/turf/open/floor/plating,/area/quartermaster/miningstorage)
"aPN" = (/obj/structure/cable/white{icon_state = "4-8"},/turf/open/floor/plating,/area/cargo/miningstorage)
"aPO" = (/turf/open/floor/plasteel/damturf/platdmg2,/area/eventmap/mountaininside)
"aPP" = (/obj/machinery/door/airlock/abandoned{name = "Filthy Powergame Shack"},/turf/open/floor/spooktime/dirtpatch,/area/eventmap/mountaininside)
"aPQ" = (/turf/open/floor/plasteel,/area/quartermaster/miningstorage)
"aPR" = (/obj/machinery/light/small{dir = 4; light_color = "#d8b1b1"},/turf/open/floor/plasteel,/area/quartermaster/miningstorage)
"aPQ" = (/turf/open/floor/plasteel,/area/cargo/miningstorage)
"aPR" = (/obj/machinery/light/small{dir = 4; light_color = "#d8b1b1"},/turf/open/floor/plasteel,/area/cargo/miningstorage)
"aPS" = (/obj/machinery/door/airlock/security,/turf/open/floor/wood,/area/eventmap/inside)
"aPT" = (/turf/closed/wall,/area/eventmap/mountaininside)
"aPU" = (/obj/item/clothing/head/hardhat/pumpkinhead/jaqc,/obj/structure/table/wood/fancy/green,/obj/effect/spawner/lootdrop/welder_tools,/turf/open/floor/wood,/area/eventmap/inside)
@@ -2189,7 +2189,7 @@
"aQe" = (/turf/open/floor/carpet/green,/area/eventmap/mountaininside)
"aQf" = (/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/wood/damturf/broken2,/area/eventmap/inside)
"aQg" = (/obj/structure/bookcase/manuals/research_and_development,/turf/closed/wall/mineral/wood,/area/eventmap/mountaininside)
"aQh" = (/obj/item/toy/tennis/red,/turf/open/floor/mineral/titanium/white,/area/eventmap/inside)
"aQh" = (/obj/item/toy/fluff/tennis_poly/red,/turf/open/floor/mineral/titanium/white,/area/eventmap/inside)
"aQi" = (/obj/effect/decal/cleanable/dirt{desc = "A thin layer of dust coating the floor."; name = "dust"},/obj/structure/noticeboard{pixel_y = 32},/obj/item/paper/fluff/balls/spookyasylum/cell03,/turf/open/floor/carpet/royalblack,/area/eventmap/inside)
"aQj" = (/obj/effect/decal/cleanable/cobweb{icon_state = "cobweb2"},/obj/structure/noticeboard{pixel_y = 32},/obj/item/paper/fluff/balls/spookyasylum/cell04,/turf/open/floor/wood,/area/eventmap/inside)
"aQk" = (/obj/structure/cable/pink{icon_state = "1-10"},/turf/open/floor/plating,/area/eventmap/mountain)
@@ -2318,7 +2318,7 @@
"aTE" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/structure/sign/directions/medical{dir = 4; pixel_x = 32; pixel_y = 24},/turf/open/floor/carpet,/area/eventmap/inside)
"aTG" = (/obj/structure/flora/grass/jungle/b,/obj/structure/flora/tree/jungle,/turf/open/floor/spooktime/nonspooktimegrass,/area/eventmap/outside)
"aTH" = (/obj/machinery/light/small,/turf/open/floor/plasteel/showroomfloor,/area/eventmap/mountaininside)
"aTJ" = (/obj/structure/closet,/obj/item/clothing/suit/hooded/wintercoat/miner,/obj/item/clothing/shoes/sneakers/brown,/obj/item/clothing/under/pants/classicjeans,/obj/item/clothing/neck/scarf,/obj/item/clothing/neck/stripedgreenscarf,/obj/item/toy/tennis/rainbow,/obj/item/toy/tennis,/obj/item/clothing/suit/hooded/wintercoat/miner,/obj/item/clothing/shoes/sneakers/brown,/obj/item/clothing/under/pants/classicjeans,/turf/open/floor/wood,/area/eventmap/mountaininside)
"aTJ" = (/obj/structure/closet,/obj/item/clothing/suit/hooded/wintercoat/miner,/obj/item/clothing/shoes/sneakers/brown,/obj/item/clothing/under/pants/classicjeans,/obj/item/clothing/neck/scarf,/obj/item/clothing/neck/stripedgreenscarf,/obj/item/toy/fluff/tennis_poly/tri/squeak/rainbow,/obj/item/toy/fluff/tennis_poly,/obj/item/clothing/suit/hooded/wintercoat/miner,/obj/item/clothing/shoes/sneakers/brown,/obj/item/clothing/under/pants/classicjeans,/turf/open/floor/wood,/area/eventmap/mountaininside)
"aTL" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel,/area/eventmap/mountaininside)
"aTM" = (/obj/item/soap/syndie,/turf/open/floor/sepia,/area/eventmap/mountaininside)
"aTN" = (/obj/item/storage/firstaid/tactical,/turf/open/floor/plasteel/damturf/platdmg1,/area/eventmap/mountaininside)
code/modules/library/lib_items.dm
+7
View File
@@ -193,6 +193,13 @@
new /obj/item/book/manual/wiki/research_and_development(src)
update_icon()
/obj/structure/bookcase/manuals/medical
name = "medical manuals bookcase"
/obj/structure/bookcase/manuals/medical/Initialize()
. = ..()
new /obj/item/book/manual/wiki/medical_cloning(src)
update_icon()
/*
* Book
modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm
+1 -1
View File
@@ -440,7 +440,7 @@
turfDebris = new randDebris(src)
//Make sure we delete the objects if we ever change turfs
/turf/open/floor/spooktime/spooktimegrass/ChangeTurf()
/turf/open/floor/spooktime/spooktimegrass/ChangeTurf(flags = CHANGETURF_INHERIT_AIR)
if(turfGrass)
qdel(turfGrass)
//if(turfTree)
tgstation.dme
-2
View File
@@ -15,9 +15,7 @@
// BEGIN_INCLUDE
#include "_maps\_basemap.dm"
#include "_maps\spookystation.dm"
#include "_maps\map_files\SpookyStation\halloweenPersiWork.dm"
#include "_maps\map_files\SpookyStation\job_changes.dm"
#include "_maps\map_files\SpookyStation\SpookyStation.dmm"
#include "code\_compile_options.dm"
#include "code\world.dm"