Skip to content

Commit b15eac5

Browse files
authored
[Code Bounty] Weeping Kudzu Trait and some heliostation fixes (#6318)
1 parent 9567b7c commit b15eac5

File tree

2 files changed

+76
-16
lines changed

2 files changed

+76
-16
lines changed

_maps/map_files/Heliostation/Heliostation.dmm

+47-16
Original file line numberDiff line numberDiff line change
@@ -5747,13 +5747,13 @@
57475747
/obj/item/clothing/gloves/latex,
57485748
/obj/item/clothing/gloves/latex,
57495749
/obj/item/clothing/gloves/latex,
5750-
/obj/item/clothing/glasses/science,
5751-
/obj/item/clothing/glasses/science,
57525750
/obj/item/reagent_containers/cup/tube,
57535751
/obj/item/reagent_containers/cup/tube,
57545752
/obj/item/reagent_containers/cup/tube,
5755-
/obj/item/clothing/glasses/science,
57565753
/obj/item/reagent_containers/cup/tube,
5754+
/obj/item/clothing/glasses/pathology,
5755+
/obj/item/clothing/glasses/pathology,
5756+
/obj/item/clothing/glasses/pathology,
57575757
/turf/open/floor/iron/white,
57585758
/area/station/medical/virology)
57595759
"aHK" = (
@@ -7132,6 +7132,7 @@
71327132
/obj/effect/turf_decal/trimline/blue/filled/line{
71337133
dir = 4
71347134
},
7135+
/obj/structure/cable,
71357136
/turf/open/floor/iron/white,
71367137
/area/station/medical/virology)
71377138
"aNq" = (
@@ -21443,7 +21444,7 @@
2144321444
/obj/item/clothing/mask/breath,
2144421445
/obj/item/tank/internals/oxygen,
2144521446
/turf/open/floor/plating,
21446-
/area/station/medical/virology)
21447+
/area/station/maintenance/department/medical/pathology)
2144721448
"cnu" = (
2144821449
/obj/effect/spawner/structure/window/reinforced,
2144921450
/obj/structure/cable,
@@ -22321,7 +22322,7 @@
2232122322
/obj/machinery/portable_atmospherics/canister/air,
2232222323
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
2232322324
/turf/open/floor/plating,
22324-
/area/station/medical/virology)
22325+
/area/station/maintenance/department/medical/pathology)
2232522326
"cwM" = (
2232622327
/obj/machinery/computer/security/qm{
2232722328
dir = 4
@@ -22747,7 +22748,7 @@
2274722748
"cAv" = (
2274822749
/obj/machinery/atmospherics/components/tank/air,
2274922750
/turf/open/floor/plating,
22750-
/area/station/medical/virology)
22751+
/area/station/maintenance/department/medical/pathology)
2275122752
"cAw" = (
2275222753
/obj/structure/table,
2275322754
/obj/item/storage/box{
@@ -28607,6 +28608,11 @@
2860728608
/obj/effect/turf_decal/delivery,
2860828609
/turf/open/floor/plating,
2860928610
/area/station/maintenance/aft/lesser)
28611+
"dNt" = (
28612+
/obj/effect/decal/cleanable/dirt,
28613+
/obj/machinery/electroplater,
28614+
/turf/open/floor/carpet/grimey,
28615+
/area/station/commons/vacant_room/office)
2861028616
"dNH" = (
2861128617
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
2861228618
/turf/open/floor/iron/dark/textured_half,
@@ -31500,8 +31506,9 @@
3150031506
dir = 4
3150131507
},
3150231508
/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
31509+
/obj/structure/cable,
3150331510
/turf/open/floor/iron/white,
31504-
/area/station/medical/virology)
31511+
/area/station/maintenance/department/medical/pathology)
3150531512
"eXb" = (
3150631513
/obj/structure/chair/office,
3150731514
/turf/open/floor/carpet/green,
@@ -36059,6 +36066,9 @@
3605936066
/obj/structure/cable,
3606036067
/turf/open/floor/plating,
3606136068
/area/station/cargo/warehouse)
36069+
"gTE" = (
36070+
/turf/closed/wall,
36071+
/area/station/maintenance/department/medical/pathology)
3606236072
"gTG" = (
3606336073
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
3606436074
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -47175,6 +47185,12 @@
4717547185
/obj/effect/turf_decal/tile/neutral/fourcorners,
4717647186
/turf/open/floor/iron/dark,
4717747187
/area/station/engineering/storage_shared)
47188+
"ldx" = (
47189+
/obj/docking_port/stationary/laborcamp_home{
47190+
dir = 4
47191+
},
47192+
/turf/open/space/basic,
47193+
/area/space)
4717847194
"ldB" = (
4717947195
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
4718047196
/turf/open/floor/iron/dark,
@@ -52126,6 +52142,11 @@
5212652142
/obj/effect/decal/cleanable/dirt,
5212752143
/obj/machinery/duct,
5212852144
/obj/machinery/door/firedoor,
52145+
/obj/machinery/computer/cryopod/directional/south{
52146+
dir = 1;
52147+
pixel_y = -22;
52148+
max_integrity = 10000
52149+
},
5212952150
/turf/open/floor/iron,
5213052151
/area/station/security/prison)
5213152152
"nbZ" = (
@@ -58317,8 +58338,10 @@
5831758338
/obj/machinery/space_heater,
5831858339
/obj/machinery/light/small/directional/east,
5831958340
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible,
58341+
/obj/machinery/power/apc/auto_name/directional/east,
58342+
/obj/structure/cable,
5832058343
/turf/open/floor/plating,
58321-
/area/station/medical/virology)
58344+
/area/station/maintenance/department/medical/pathology)
5832258345
"pqf" = (
5832358346
/obj/effect/decal/cleanable/dirt,
5832458347
/obj/effect/spawner/random/trash/graffiti,
@@ -67135,6 +67158,12 @@
6713567158
},
6713667159
/turf/open/floor/engine,
6713767160
/area/station/engineering/supermatter/room)
67161+
"sPh" = (
67162+
/obj/machinery/cryopod{
67163+
dir = 8
67164+
},
67165+
/turf/open/floor/iron,
67166+
/area/station/security/prison)
6713867167
"sPi" = (
6713967168
/obj/effect/turf_decal/stripes/line{
6714067169
dir = 5
@@ -67802,8 +67831,9 @@
6780267831
/area/station/cargo/sorting)
6780367832
"tbK" = (
6780467833
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible,
67834+
/obj/structure/cable,
6780567835
/turf/open/floor/plating,
67806-
/area/station/medical/virology)
67836+
/area/station/maintenance/department/medical/pathology)
6780767837
"tbN" = (
6780867838
/turf/open/floor/iron,
6780967839
/area/station/security/checkpoint/escape)
@@ -78173,8 +78203,9 @@
7817378203
dir = 4;
7817478204
name = "Virology air supply valve"
7817578205
},
78206+
/obj/structure/cable,
7817678207
/turf/open/floor/plating,
78177-
/area/station/medical/virology)
78208+
/area/station/maintenance/department/medical/pathology)
7817878209
"xgO" = (
7817978210
/obj/effect/mapping_helpers/burnt_floor,
7818078211
/obj/effect/turf_decal/box,
@@ -101312,7 +101343,7 @@ nbZ
101312101343
ohO
101313101344
lMJ
101314101345
hyj
101315-
nRe
101346+
dNt
101316101347
uGE
101317101348
nAS
101318101349
kuB
@@ -102782,7 +102813,7 @@ fCF
102782102813
fyd
102783102814
fyd
102784102815
jQo
102785-
agM
102816+
sPh
102786102817
aqB
102787102818
bkM
102788102819
dOP
@@ -106370,7 +106401,7 @@ aaa
106370106401
aaa
106371106402
aaa
106372106403
aaa
106373-
aaa
106404+
ldx
106374106405
aaP
106375106406
aaa
106376106407
aak
@@ -130057,7 +130088,7 @@ aKS
130057130088
aJO
130058130089
nSd
130059130090
aEe
130060-
aFd
130091+
gTE
130061130092
eWM
130062130093
aEe
130063130094
aOG
@@ -131085,8 +131116,8 @@ aLy
131085131116
lZF
131086131117
hzF
131087131118
aEe
131088-
aFd
131089-
aFd
131119+
gTE
131120+
gTE
131090131121
aEe
131091131122
aOG
131092131123
cXH

code/modules/events/space_vines/vine_mutations.dm

+29
Original file line numberDiff line numberDiff line change
@@ -353,3 +353,32 @@
353353
/datum/spacevine_mutation/flowering/on_cross(obj/structure/spacevine/holder, mob/living/crosser)
354354
if(prob(25))
355355
holder.entangle(crosser)
356+
357+
// MONKESTATION ADDITIONS
358+
359+
/datum/spacevine_mutation/weeping
360+
name = "Weeping"
361+
hue = "#6b6b6b"
362+
quality = NEGATIVE
363+
severity = SEVERITY_AVERAGE // not that bad (on its own)
364+
365+
/datum/spacevine_mutation/weeping/on_hit(obj/structure/spacevine/holder, mob/hitter, obj/item/item, expected_damage)
366+
var/scream = pick(
367+
'sound/voice/human/malescream_1.ogg',
368+
'sound/voice/human/femalescream_1.ogg',
369+
'sound/voice/lizard/lizard_scream_2.ogg',
370+
)
371+
playsound(holder, scream, 90, TRUE, frequency = 1.5)
372+
var/mob/living/victim = hitter
373+
374+
if(iscarbon(victim))
375+
var/list/reflist = list(1)
376+
SEND_SIGNAL(victim, COMSIG_CARBON_SOUNDBANG, reflist)
377+
var/intensity = reflist[1]
378+
var/ear_safety = victim.get_ear_protection()
379+
var/effect_amount = intensity - ear_safety
380+
if(effect_amount > 0)
381+
victim.soundbang_act(1, 0, 4, 15)
382+
victim.adjust_confusion(5 SECONDS)
383+
to_chat(victim, span_danger("The vines let out a terrible screech, disorienting you."))
384+
return expected_damage

0 commit comments

Comments
 (0)