Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mapping hazards and types #3233

Merged
merged 21 commits into from
Jan 6, 2025
Merged

Mapping hazards and types #3233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2ece68a
basic stuff
Thera-Pissed Jul 21, 2024
c98aa20
autodoc and much better comments
Thera-Pissed Jul 21, 2024
85deaa2
living/carbon to appease apply_damage
Thera-Pissed Jul 21, 2024
e2606f3
temp notes file is failing linters, wee
Thera-Pissed Jul 21, 2024
3d0bfc2
atmos, foam, chem smoke, spray, floor rework.
Thera-Pissed Jul 22, 2024
46afeb3
linter dumb
Thera-Pissed Jul 22, 2024
baccf7a
linter again
Thera-Pissed Jul 22, 2024
39f1a29
is this linters bad ? help
Thera-Pissed Jul 22, 2024
8763adc
helmcrab moving code around fails again
Thera-Pissed Jul 22, 2024
828017a
Merge branch 'master' into electrical-hazards
Thera-Pissed Jul 22, 2024
bd51c0a
moves nearby check from hazard/radioactive to base hazard
Thera-Pissed Jul 22, 2024
522c8b4
adds client_range var because uh, choosing stuff is good?
Thera-Pissed Jul 22, 2024
06483a8
cleaner processing code
Thera-Pissed Jul 22, 2024
3dfc669
moves process logic to do_random_effect repeated
Thera-Pissed Jul 23, 2024
ec64084
powered shutoff
Thera-Pissed Aug 3, 2024
5e20fb2
example powered
Thera-Pissed Aug 3, 2024
95ab422
comment clarification
Thera-Pissed Oct 30, 2024
3806939
Merge branch 'master' into electrical-hazards
Thera-Pissed Oct 30, 2024
44adc4f
unused code
Thera-Pissed Oct 30, 2024
0dad9cb
merge fixes
Thera-Pissed Oct 30, 2024
3d786db
Merge remote-tracking branch 'upstream/master' into electrical-hazards
Thera-Pissed Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions _maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
},
/area/ruin/unpowered)
"cW" = (
/obj/structure/radioactive,
/obj/structure/hazard/radioactive,
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"dG" = (
Expand Down Expand Up @@ -233,7 +233,7 @@
/obj/effect/turf_decal/weather/sand{
dir = 1
},
/obj/structure/radioactive,
/obj/structure/hazard/radioactive,
/turf/open/floor/plating/rust,
/area/ruin/unpowered)
"kP" = (
Expand Down Expand Up @@ -991,7 +991,7 @@
/turf/open/floor/plating/asteroid/sand/dense/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Sl" = (
/obj/structure/radioactive/stack,
/obj/structure/hazard/radioactive/stack,
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Sx" = (
Expand Down Expand Up @@ -1060,7 +1060,7 @@
/turf/open/floor/plating,
/area/ruin/unpowered)
"TI" = (
/obj/structure/radioactive/waste,
/obj/structure/hazard/radioactive/waste,
/obj/effect/decal/cleanable/greenglow,
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
Expand Down Expand Up @@ -1147,7 +1147,7 @@
/turf/open/floor/plating/rust,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Xc" = (
/obj/structure/radioactive,
/obj/structure/hazard/radioactive,
/obj/effect/decal/cleanable/greenglow,
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/JungleRuins/jungle_paradise.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2071,7 +2071,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"mr" = (
/obj/machinery/light/directional/north,
/obj/structure/radioactive/stack,
/obj/structure/hazard/radioactive/stack,
/turf/open/floor/plating/dirt/jungle,
/area/overmap_encounter/planetoid/cave/explored)
"mt" = (
Expand Down Expand Up @@ -2551,7 +2551,7 @@
/obj/effect/turf_decal/box/corners{
dir = 4
},
/obj/structure/radioactive/stack,
/obj/structure/hazard/radioactive/stack,
/obj/effect/turf_decal/techfloor/corner{
dir = 4
},
Expand Down Expand Up @@ -3391,7 +3391,7 @@
},
/area/overmap_encounter/planetoid/cave/explored)
"uB" = (
/obj/structure/radioactive{
/obj/structure/hazard/radioactive{
pixel_x = 7;
pixel_y = 9
},
Expand Down
22 changes: 11 additions & 11 deletions _maps/RandomRuins/WasteRuins/wasteplanet_unhonorable.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
/turf/open/floor/plastic,
/area/ruin/wasteplanet/wasteplanet_radiation/main)
"nN" = (
/obj/structure/radioactive{
/obj/structure/hazard/radioactive{
pixel_x = 7
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -305,10 +305,10 @@
/turf/open/floor/plating/asteroid/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_radiation)
"sh" = (
/obj/structure/radioactive/stack{
/obj/structure/hazard/radioactive/stack{
pixel_y = -12
},
/obj/structure/radioactive{
/obj/structure/hazard/radioactive{
pixel_y = 6
},
/turf/open/floor/plating/rust,
Expand Down Expand Up @@ -807,7 +807,7 @@
/turf/open/floor/plating,
/area/ruin/wasteplanet/wasteplanet_radiation/main)
"Rz" = (
/obj/structure/radioactive/waste,
/obj/structure/hazard/radioactive/waste,
/obj/effect/decal/cleanable/greenglow/filled,
/obj/effect/dummy/lighting_obj{
light_color = "#80B425";
Expand Down Expand Up @@ -835,14 +835,14 @@
/turf/open/floor/plating,
/area/ruin/wasteplanet/wasteplanet_radiation/main)
"Tf" = (
/obj/structure/radioactive{
/obj/structure/hazard/radioactive{
pixel_x = -1;
pixel_y = 7
},
/obj/structure/radioactive{
/obj/structure/hazard/radioactive{
pixel_x = 8
},
/obj/structure/radioactive{
/obj/structure/hazard/radioactive{
pixel_x = 8;
pixel_y = 19
},
Expand Down Expand Up @@ -878,7 +878,7 @@
/turf/open/floor/plating/asteroid/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_radiation)
"Va" = (
/obj/structure/radioactive/stack,
/obj/structure/hazard/radioactive/stack,
/turf/open/floor/plating/rust,
/area/ruin/wasteplanet/wasteplanet_radiation/containment)
"Vg" = (
Expand All @@ -895,11 +895,11 @@
/turf/open/floor/plasteel/dark,
/area/ruin/wasteplanet/wasteplanet_radiation/containment)
"VA" = (
/obj/structure/radioactive{
/obj/structure/hazard/radioactive{
pixel_x = -6;
pixel_y = 9
},
/obj/structure/radioactive{
/obj/structure/hazard/radioactive{
pixel_x = 3;
pixel_y = 4
},
Expand All @@ -926,7 +926,7 @@
/turf/open/floor/plastic,
/area/ruin/wasteplanet/wasteplanet_radiation/main)
"WB" = (
/obj/structure/radioactive{
/obj/structure/hazard/radioactive{
pixel_x = 8
},
/obj/effect/decal/cleanable/dirt/dust,
Expand Down
2 changes: 2 additions & 0 deletions code/_globalvars/lists/objects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,5 @@ GLOBAL_LIST_EMPTY(ai_status_displays)
GLOBAL_LIST_EMPTY(mob_spawners)
/// List of Station alert consoles, /obj/machinery/computer/station_alert
GLOBAL_LIST_EMPTY(alert_consoles)
/// List of all ruin_hazards (obj/structure/hazard), used for ID toggles.
GLOBAL_LIST_EMPTY(ruin_hazards)
16 changes: 16 additions & 0 deletions code/game/objects/effects/effect_system/effects_smoke.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,22 @@
/datum/effect_system/smoke_spread/bad
effect_type = /obj/effect/particle_effect/smoke/bad

/////////////////////////////////////////////
// Hazard smoke
/////////////////////////////////////////////

/obj/effect/particle_effect/smoke/hazard
lifetime = 8

/obj/effect/particle_effect/smoke/hazard/smoke_mob(mob/living/carbon/M)
if(..())
M.adjustOxyLoss(4)
M.emote(pick("cough","gasp"))
return 1

/datum/effect_system/smoke_spread/hazard
effect_type = /obj/effect/particle_effect/smoke/hazard

/////////////////////////////////////////////
// Nanofrost smoke
/////////////////////////////////////////////
Expand Down
5 changes: 5 additions & 0 deletions code/game/objects/effects/effect_system/effects_water.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,8 @@

/datum/effect_system/steam_spread
effect_type = /obj/effect/particle_effect/steam

/proc/do_steam(amount=0, location = null, direction = null)
var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()
steam.set_up(amount, direction, location)
steam.start()
12 changes: 6 additions & 6 deletions code/game/objects/effects/spawners/random/waste_planet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@

/obj/effect/spawner/random/waste/radiation
loot = list(
/obj/structure/radioactive = 6,
/obj/structure/radioactive/stack = 6,
/obj/structure/radioactive/waste = 6
/obj/structure/hazard/radioactive = 6,
/obj/structure/hazard/radioactive/stack = 6,
/obj/structure/hazard/radioactive/waste = 6
)

/obj/effect/spawner/random/waste/radiation/more_rads
loot = list(
/obj/structure/radioactive = 3,
/obj/structure/radioactive/stack = 12,
/obj/structure/radioactive/waste = 12
/obj/structure/hazard/radioactive = 3,
/obj/structure/hazard/radioactive/stack = 12,
/obj/structure/hazard/radioactive/waste = 12
)

/obj/effect/spawner/random/waste/atmos_can
Expand Down
82 changes: 0 additions & 82 deletions code/game/objects/structures/radioactive.dm
View file
Open in desktop

This file was deleted.

Loading
Loading