cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] a few more changes related to map (#11734)

Browse Source 
Co-authored-by: Olive <49600480+zeskorion@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-09-25 11:20:20 -07:00
committed by GitHub
parent 9abe7a4add
commit a3cc64cdd2
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/__defines/turfs.dm
View File

@@ -8,6 +8,7 @@
#define TURF_HAS_CORNERS 128 #define TURF_HAS_CORNERS 128
#define TURF_IS_FRAGILE 256 #define TURF_IS_FRAGILE 256
#define TURF_ACID_IMMUNE 512 #define TURF_ACID_IMMUNE 512
#define TURF_UNSHIELDABLE 1024
// The 0x800000 is blocked by INITIALIZED, do NOT use it! // The 0x800000 is blocked by INITIALIZED, do NOT use it!
//Used for floor/wall smoothing //Used for floor/wall smoothing

2
code/game/objects/micro_structures.dm
View File

@@ -139,7 +139,7 @@ GLOBAL_LIST_EMPTY(micro_tunnels)
if(!destinations.len) if(!destinations.len)
to_chat(user, span_warning("There are no other tunnels connected to this one!")) to_chat(user, span_warning("There are no other tunnels connected to this one!"))
return return
else if(destinations.len == 1) else if(destinations.len == 1 || random)
choice = pick(destinations) choice = pick(destinations)
else else
choice = tgui_input_list(user, "Where would you like to go?", "Pick a tunnel", destinations) choice = tgui_input_list(user, "Where would you like to go?", "Pick a tunnel", destinations)

1
code/game/turfs/simulated/nanogoop.dm
View File

@@ -226,6 +226,7 @@ GLOBAL_LIST_BOILERPLATE(nanite_turfs, /turf/simulated/floor/water/digestive_enzy
nutrients += how_much nutrients += how_much
targetcarbon.mind?.vore_death = TRUE targetcarbon.mind?.vore_death = TRUE
GLOB.prey_digested_roundstat++ GLOB.prey_digested_roundstat++
targetcarbon.ghostize() //prevent runtimes
qdel(targetcarbon) //glorp qdel(targetcarbon) //glorp
return return
targetcarbon.adjustFireLoss(damage) targetcarbon.adjustFireLoss(damage)

2
code/modules/shieldgen/shield_gen_external.dm
View File

@@ -20,7 +20,7 @@
for (var/x_offset = -field_radius; x_offset <= field_radius; x_offset++) for (var/x_offset = -field_radius; x_offset <= field_radius; x_offset++)
for (var/y_offset = -field_radius; y_offset <= field_radius; y_offset++) for (var/y_offset = -field_radius; y_offset <= field_radius; y_offset++)
T = locate(gen_turf.x + x_offset, gen_turf.y + y_offset, gen_turf.z) T = locate(gen_turf.x + x_offset, gen_turf.y + y_offset, gen_turf.z)
if (is_type_in_list(T,GLOB.external_shield_gen_blockedturfs)) if (is_type_in_list(T,GLOB.external_shield_gen_blockedturfs) && !(T.flags & TURF_UNSHIELDABLE))
//check neighbors of T //check neighbors of T
for(var/i in orange(1, T)) for(var/i in orange(1, T))
if(istype(i, /turf/simulated) && !is_type_in_list(i,GLOB.external_shield_gen_blockedturfs)) if(istype(i, /turf/simulated) && !is_type_in_list(i,GLOB.external_shield_gen_blockedturfs))