Skip to content

Commit

Permalink
Merge branch 'master' into phantom2
Browse files Browse the repository at this point in the history
  • Loading branch information
@miniusAreas
miniusAreas authored Nov 14, 2024
2 parents 4130f61 + 9fb5e3c commit f0e0c7b
Show file tree
Hide file tree
Showing 38 changed files with 300 additions and 262 deletions.
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SpaceRuins/onehalf.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1401,7 +1401,7 @@
/obj/effect/turf_decal/industrial/warning/corner{
dir = 1
},
/mob/living/simple_animal/hostile/hivebot/range,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/onehalf)
"qC" = (
Expand Down Expand Up @@ -1606,7 +1606,7 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"zS" = (
/mob/living/simple_animal/hostile/hivebot/range,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/onehalf)
"Af" = (
Expand Down Expand Up @@ -1969,7 +1969,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/wood,
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/hivebot/range,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/wood/airless,
/area/ruin/space/has_grav/onehalf)
"OW" = (
Expand Down
32 changes: 16 additions & 16 deletions _maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/wasteplanet/tradepost/barracks)
"aM" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
"aQ" = (
Expand Down Expand Up @@ -90,7 +90,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/structure/foamedmetal/iron,
/turf/open/floor/pod,
/area/ruin/wasteplanet/tradepost/center)
Expand All @@ -116,7 +116,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 1
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged,
/mob/living/simple_animal/hostile/hivebot/ranged,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
dir = 1
},
Expand Down Expand Up @@ -382,7 +382,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 6
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
/obj/item/trash/plate,
/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
Expand All @@ -394,7 +394,7 @@
/turf/open/floor/pod,
/area/ruin/wasteplanet/tradepost/center)
"ew" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
"ez" = (
Expand Down Expand Up @@ -608,7 +608,7 @@
/obj/effect/decal/cleanable/blood/tracks,
/obj/item/paper_bin,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/item/trash/plate,
/obj/item/ammo_casing/spent,
/turf/open/floor/pod,
Expand Down Expand Up @@ -851,7 +851,7 @@
/obj/effect/decal/cleanable/oil/streak{
icon_state = "streak2"
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 4
},
Expand Down Expand Up @@ -897,7 +897,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"kr" = (
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/concrete/pavement/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
"ks" = (
Expand Down Expand Up @@ -1575,7 +1575,7 @@
"rN" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/holopad/secure,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/corner/opaque/yellow/full,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
Expand Down Expand Up @@ -2354,7 +2354,7 @@
/obj/effect/decal/cleanable/oil/streak{
icon_state = "streak2"
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/pod,
/area/ruin/wasteplanet/tradepost/center)
"zO" = (
Expand Down Expand Up @@ -2502,7 +2502,7 @@
/turf/open/floor/pod/dark,
/area/ruin/wasteplanet/tradepost/center)
"BN" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/turf/open/floor/plating/asteroid/wasteplanet/lit,
/area/overmap_encounter/planetoid/wasteplanet/explored)
"Cb" = (
Expand Down Expand Up @@ -2949,7 +2949,7 @@
/turf/open/floor/plasteel/tech,
/area/ruin/wasteplanet/tradepost/barracks)
"FK" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/item/ammo_casing/spent,
/turf/open/floor/concrete/pavement/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
Expand Down Expand Up @@ -3229,7 +3229,7 @@
/turf/open/floor/wood/walnut,
/area/ruin/wasteplanet/tradepost/center)
"IM" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/concrete/pavement/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
"IN" = (
Expand Down Expand Up @@ -3579,7 +3579,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"LW" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged,
/mob/living/simple_animal/hostile/hivebot/ranged,
/obj/item/ammo_casing/spent,
/turf/open/floor/concrete/pavement/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
Expand Down Expand Up @@ -3988,7 +3988,7 @@
/turf/open/floor/pod,
/area/ruin/wasteplanet/tradepost/center)
"Qn" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/turf/open/floor/plating/wasteplanet/rust,
/area/overmap_encounter/planetoid/wasteplanet/explored)
"QB" = (
Expand Down Expand Up @@ -4694,7 +4694,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 8
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/obj/structure/door_assembly/door_assembly_com,
/turf/open/floor/pod,
/area/ruin/wasteplanet/tradepost/center)
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/WasteRuins/wasteplanet_unhonorable.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
/turf/open/floor/plating/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_radiation)
"gx" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet,
/mob/living/simple_animal/hostile/hivebot,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_radiation)
"gM" = (
Expand Down Expand Up @@ -684,7 +684,7 @@
/turf/open/floor/plating/asteroid/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_radiation)
"Mh" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_radiation)
"Mq" = (
Expand Down
24 changes: 12 additions & 12 deletions _maps/RandomRuins/WasteRuins/wasteplanet_yard.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
/turf/open/floor/plasteel/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/ship)
"bB" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet,
/mob/living/simple_animal/hostile/hivebot,
/turf/open/floor/plating/wasteplanet/rust,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/bay)
"bD" = (
Expand Down Expand Up @@ -289,7 +289,7 @@
/turf/open/floor/plasteel/dark/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen)
"cP" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/effect/decal/cleanable/blood/old,
/obj/effect/mob_spawn/human/corpse/charredskeleton,
/obj/item/wrench/combat,
Expand Down Expand Up @@ -331,7 +331,7 @@
"dw" = (
/obj/effect/turf_decal/industrial/hatch/orange,
/obj/structure/closet/crate/large,
/mob/living/simple_animal/hostile/hivebot/wasteplanet,
/mob/living/simple_animal/hostile/hivebot,
/turf/open/floor/plasteel/dark/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/bay)
"dI" = (
Expand Down Expand Up @@ -939,7 +939,7 @@
/turf/open/floor/plasteel/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/dorms)
"kP" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged,
/mob/living/simple_animal/hostile/hivebot/ranged,
/obj/structure/railing{
dir = 4
},
Expand Down Expand Up @@ -1367,7 +1367,7 @@
/turf/open/floor/plating/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/bay)
"pt" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/structure/sign/warning/docking{
pixel_x = 32
},
Expand Down Expand Up @@ -1606,7 +1606,7 @@
/turf/open/floor/plating/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen)
"sf" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet,
/mob/living/simple_animal/hostile/hivebot,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/ruin/wasteplanet)
"sm" = (
Expand Down Expand Up @@ -2402,7 +2402,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet,
/mob/living/simple_animal/hostile/hivebot,
/turf/open/floor/plating/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/bay)
"CV" = (
Expand Down Expand Up @@ -2966,7 +2966,7 @@
/turf/open/floor/plasteel/dark/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen)
"KG" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/obj/structure/catwalk/over,
/turf/open/floor/plating/wasteplanet/lit,
/area/ruin/wasteplanet)
Expand Down Expand Up @@ -3148,7 +3148,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet,
/mob/living/simple_animal/hostile/hivebot,
/obj/machinery/light/directional/west,
/turf/open/floor/plating/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/bay)
Expand Down Expand Up @@ -3367,7 +3367,7 @@
/turf/open/floor/plasteel/dark/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/bay)
"QS" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/plating/wasteplanet/lit,
/area/ruin/wasteplanet)
"Ri" = (
Expand Down Expand Up @@ -3945,7 +3945,7 @@
/turf/open/floor/plasteel/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen)
"Yp" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen)
Expand Down Expand Up @@ -4007,7 +4007,7 @@
/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen)
"YW" = (
/obj/effect/turf_decal/industrial/hatch/orange,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/plating/wasteplanet/lit,
/area/ruin/wasteplanet)
"Za" = (
Expand Down
21 changes: 21 additions & 0 deletions code/datums/diseases/legionvirus.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,27 @@
stage4 = list(span_warning("You feel something pressing against your skin!"))
stage5 = list(span_warning("Your skin begins to tear apart-!"))
new_form = /mob/living/simple_animal/hostile/asteroid/hivelord/legion
COOLDOWN_DECLARE(warning_timer)
var/cooldown_time = 1 MINUTES

/datum/disease/transformation/legionvirus/infect(mob/living/infectee, make_copy = TRUE)
. = ..()
COOLDOWN_START(src, warning_timer, cooldown_time) //theos why don't you make this NOT A DISEASE if you don't plan on using ANY disease stuff??? good question:

/datum/disease/transformation/legionvirus/stage_act()
..()
if(!COOLDOWN_FINISHED(src, warning_timer))
return
COOLDOWN_START(src, warning_timer, cooldown_time)
switch(stage)
if(1)
to_chat(affected_mob, pick(stage1))
if(2)
to_chat(affected_mob, pick(stage2))
if(3)
to_chat(affected_mob, pick(stage3))
if(4)
to_chat(affected_mob, pick(stage4))

/datum/disease/transformation/legionvirus/do_disease_transformation(mob/living/H)
if(stage5)
Expand Down
Loading

0 comments on commit f0e0c7b

Please sign in to comment.