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

Fixed virology themed redgate maps (#16577)

Browse Source 
* Fixed virology themed redgate maps

Added 4 new props based on the old virology machines for decoration.

Fixed the missing virology equipment in the city and facility redgate maps.

* Update facility.dmm
This commit is contained in:
SatinIsle
2024-11-09 02:00:05 +01:00
committed by GitHub
parent 7175a48c8d
commit e784285462
3 changed files with 121 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/props/machines.dm
+97 -11
View File
@@ -556,9 +556,9 @@
* This one is a bit more fancy than others. Anything in the contents (PLEASE LIMIT TO ONE THING)
* will show up inside it! Also if you map in an item on it, it will grab that at mapload and start
* in the 'closed, full of fluid' state, so you can put a body on it or whatever.
*
*
* As an aghost you can also dragdrop something into it (you have to be ghosted next to it)
*
*
* Possible 'state' options for change_state(state) are:
* open: Open, no fluid or anything. At the end the contents are ejected.
* closed: Closed, full of liquid
@@ -582,7 +582,7 @@
/obj/structure/prop/machine/nt_pod/Initialize(mapload)
// Our non-map-preview state
icon_state = "nt_pod"
// Alpha mask to make sure things don't sneak out
var/obj/effect/overlay/vis/mask = new
mask.icon = icon
@@ -607,7 +607,7 @@
// Save old settings
contents_vis_flags = AM.vis_flags
contents_original_pixel_y = AM.pixel_y
// Arrange
AM.add_filter("podmask", 1, alpha_mask_filter(render_source = "nt_podmask[REF(src)]", flags = MASK_INVERSE))
AM.pixel_y = 12
@@ -616,7 +616,7 @@
if(ismob(AM))
var/mob/M = AM
buckle_mob(M, TRUE, FALSE)
// TRAP THEM
change_state("closed")
@@ -639,7 +639,7 @@
return
if(!user.client?.holder)
return
AM.forceMove(src)
/obj/structure/prop/machine/nt_pod/change_state(state)
@@ -648,17 +648,17 @@
if("open")
cut_overlay("nt_pod_top_on")
cut_overlay("nt_pod_under")
// Fluid drains
fluid.icon_state = "nothing"
flick("nt_pod_emptying", fluid) // 8ds
sleep(8)
// Door opens
door.icon_state = "nothing"
flick("nt_pod_opening", door) // 9ds
sleep(9)
// GET OUT
outside.layer = BELOW_MOB_LAYER
if(contents.len)
@@ -670,7 +670,7 @@
cut_overlay("nt_pod_top_on")
add_overlay("nt_pod_top_on")
add_overlay("nt_pod_under")
// Door closes
door.icon_state = "nt_pod_glass"
flick("nt_pod_closing", door) // 9ds
@@ -683,4 +683,90 @@
cut_overlay("nt_pod_panel")
add_overlay("nt_pod_panel")
if("panel_closed")
cut_overlay("nt_pod_panel")
cut_overlay("nt_pod_panel")
// Old Virology stuff
/obj/structure/prop/machine/centrifuge
name = "centrifuge"
desc = "Used to separate things with different weight. Spin 'em round, round, right round."
icon = 'icons/obj/virology_vr.dmi'
icon_state = "centrifuge"
var/on = FALSE
/obj/structure/prop/machine/centrifuge/attack_hand(mob/user as mob)
..()
if(!on)
on = TRUE
user.visible_message("\The [user] turns on \the [src].")
icon_state = "centrifuge_moving"
else
on = FALSE
user.visible_message("\The [user] turns off \the [src].")
icon_state = "centrifuge"
update_icon()
/obj/structure/prop/machine/incubator
name = "incubator"
desc = "Encourages the growth of diseases. This model comes with a dispenser system and a small radiation generator."
icon = 'icons/obj/virology_vr.dmi'
icon_state = "incubator"
var/on = FALSE
/obj/structure/prop/machine/incubator/attack_hand(mob/user as mob)
..()
if(!on)
on = TRUE
user.visible_message("\The [user] turns on \the [src].")
icon_state = "incubator_on"
else
on = FALSE
user.visible_message("\The [user] turns off \the [src].")
icon_state = "incubator"
update_icon()
/obj/structure/prop/machine/disease_analyser
name = "disease analyser"
desc = "Analyzes diseases to find out information about them!"
icon = 'icons/obj/virology_vr.dmi'
icon_state = "analyser"
var/on = FALSE
/obj/structure/prop/machine/disease_analyser/attack_hand(mob/user as mob)
..()
if(!on)
on = TRUE
user.visible_message("\The [user] turns on \the [src].")
icon_state = "analyser_"
else
on = FALSE
user.visible_message("\The [user] turns off \the [src].")
icon_state = "analyser"
update_icon()
/obj/structure/prop/machine/isolator
name = "disease isolator"
desc = "Used to isolate and identify diseases, allowing for comparison with a remote database."
icon = 'icons/obj/virology_vr.dmi'
icon_state = "isolator_in"
var/on = FALSE
/obj/structure/prop/machine/isolator/attack_hand(mob/user as mob)
..()
if(!on)
on = TRUE
user.visible_message("\The [user] turns on \the [src].")
icon_state = "isolator_"
else
on = FALSE
user.visible_message("\The [user] turns off \the [src].")
icon_state = "isolator_in"
update_icon()
maps/redgate/cybercity.dmm
+18 -10
View File
@@ -3641,10 +3641,8 @@
/turf/simulated/floor/water/digestive_enzymes,
/area/redgate/city/waterworks)
"eSM" = (
/obj/machinery/disease2/incubator,
/obj/machinery/light{
dir = 1
},
/obj/structure/table/standard,
/obj/item/book/manual/virology,
/turf/simulated/floor/tiled/white,
/area/redgate/city/science)
"eTR" = (
@@ -11034,6 +11032,13 @@
/obj/structure/undies_wardrobe,
/turf/simulated/floor/tiled/freezer,
/area/redgate/city/laundry)
"ozN" = (
/obj/machinery/light{
dir = 1
},
/obj/structure/prop/machine/disease_analyser,
/turf/simulated/floor/tiled/white,
/area/redgate/city/science)
"ozW" = (
/obj/machinery/light{
dir = 1
@@ -14361,8 +14366,8 @@
/turf/simulated/floor/tiled/neutral,
/area/redgate/city/house10)
"sLw" = (
/obj/machinery/computer/centrifuge,
/obj/machinery/light,
/obj/machinery/computer/pandemic,
/turf/simulated/floor/tiled/white,
/area/redgate/city/science)
"sLB" = (
@@ -17015,7 +17020,7 @@
/turf/simulated/floor/tiled/eris/dark/gray_platform,
/area/redgate/city/engine)
"wgN" = (
/obj/machinery/disease2/diseaseanalyser,
/obj/structure/prop/machine/centrifuge,
/turf/simulated/floor/tiled/white,
/area/redgate/city/science)
"wgO" = (
@@ -17388,7 +17393,10 @@
/turf/simulated/floor/tiled/steel_dirty,
/area/redgate/city/dodgypharmacy)
"wIw" = (
/obj/machinery/computer/diseasesplicer,
/obj/structure/reagent_dispensers/virusfood{
pixel_y = 29
},
/obj/structure/prop/machine/incubator,
/turf/simulated/floor/tiled/white,
/area/redgate/city/science)
"wIy" = (
@@ -23051,10 +23059,10 @@ lyJ
jNE
kfL
rdM
ozN
fpI
fpI
eSM
fpI
fpI
uEa
rdM
btI
kWt
maps/redgate/facility.dmm
+6 -22
View File
@@ -3246,10 +3246,6 @@
/obj/item/bone,
/turf/simulated/floor/grass,
/area/redgate/facility/cell27)
"eFo" = (
/obj/machinery/computer/centrifuge,
/turf/simulated/floor/tiled/white,
/area/redgate/facility/cell20)
"eGK" = (
/turf/simulated/wall/tgmc/whitewall,
/area/redgate/facility/cell27)
@@ -4471,7 +4467,7 @@
/turf/simulated/floor/tiled/white,
/area/redgate/facility/cell2)
"gmR" = (
/obj/machinery/computer/centrifuge,
/obj/structure/prop/machine/disease_analyser,
/turf/simulated/floor/tiled/white,
/area/redgate/facility/sw)
"gmU" = (
@@ -4913,13 +4909,6 @@
/obj/random/forgotten_tram,
/turf/simulated/floor/tiled/white,
/area/redgate/facility/nw)
"gQm" = (
/obj/machinery/disease2/isolator,
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/tiled/white,
/area/redgate/facility/sw)
"gQy" = (
/obj/effect/floor_decal/corner/black/border{
dir = 4
@@ -11648,7 +11637,7 @@
/turf/simulated/floor/tiled/white,
/area/redgate/facility/cell15)
"qsU" = (
/obj/machinery/disease2/diseaseanalyser,
/obj/structure/prop/machine/centrifuge,
/turf/simulated/floor/tiled/white,
/area/redgate/facility/sw)
"qtt" = (
@@ -11908,7 +11897,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/redgate/facility/cell9)
"qMo" = (
/obj/machinery/disease2/incubator,
/obj/structure/closet/l3closet/virology,
/turf/simulated/floor/tiled/white,
/area/redgate/facility/sw)
"qNh" = (
@@ -11950,10 +11939,10 @@
/turf/simulated/floor/tiled/white,
/area/redgate/facility/sw)
"qQL" = (
/obj/machinery/computer/diseasesplicer,
/obj/machinery/light{
dir = 1
},
/obj/machinery/computer/pandemic,
/turf/simulated/floor/tiled/white,
/area/redgate/facility/sw)
"qQY" = (
@@ -14775,12 +14764,7 @@
"uMq" = (
/obj/structure/closet/walllocker_double/science/east,
/obj/item/book/manual/virology,
/obj/item/antibody_scanner,
/obj/item/antibody_scanner,
/obj/item/reagent_containers/glass/beaker,
/obj/item/virusdish/random,
/obj/item/virusdish/random,
/obj/item/virusdish/random,
/turf/simulated/floor/tiled/white,
/area/redgate/facility/sw)
"uNl" = (
@@ -19788,7 +19772,7 @@ pLg
fPE
mzU
aOv
gQm
xRG
vrp
oWf
aOv
@@ -30193,7 +30177,7 @@ aKz
ehw
lnw
sCO
eFo
ehw
hgj
hgj
hgj