a step in the right direction

This commit is contained in:
Pinta
2024-03-25 23:02:43 -04:00
parent 4ace8e4f78
commit 55f5578d5b
13 changed files with 40 additions and 30 deletions
+1 -1
View File
@@ -90,7 +90,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
if (picked && is_station_level(picked.z))
GLOB.teleportlocs[AR.name] = AR
if(GLOB.teleportlocs.len) //DON'T TRY TO TIMSORT THINGS THAT HAVE NOTHING. FUCK.
sortTim(GLOB.teleportlocs, /proc/cmp_text_dsc)
sortTim(GLOB.teleportlocs, GLOBAL_PROC_REF(cmp_text_dsc))
// ===
+1 -1
View File
@@ -206,7 +206,7 @@
for(var/obj/item/co in replacer)
part_list += co
//Sort the parts. This ensures that higher tier items are applied first.
part_list = sortTim(part_list, /proc/cmp_rped_sort)
part_list = sortTim(part_list, GLOBAL_PROC_REF(cmp_rped_sort))
for(var/path in req_components)
while(req_components[path] > 0 && (locate(path) in part_list))
+16 -9
View File
@@ -8,7 +8,10 @@
//GS13 stuckage code
obj/machinery/door/airlock/Crossed(mob/living/carbon/L)
/obj/machinery/door/airlock/Crossed(mob/living/carbon/L)
if(!istype(L))
return ..()
if(L.fatness > 5000)
if(rand(1, 3) == 1)
L.doorstuck = 1
@@ -17,12 +20,8 @@ obj/machinery/door/airlock/Crossed(mob/living/carbon/L)
sleep(100)
L.doorstuck = 0
L.Knockdown(1)
return
else if(L.fatness > 1890)
if(rand(1, 5) == 1)
L.visible_message("<span class'danger'>[L]'s hips brush against the doorway...</span>")
to_chat(L, "<span class='danger'>As you pass through \the [src], you feel a slight brushing against your hips. The [src] frame accommodates your form, but it's a close fit..</span>")
return
return ..()
else if(L.fatness > 3000)
if(rand(1, 5) == 1)
L.doorstuck = 1
@@ -31,10 +30,18 @@ obj/machinery/door/airlock/Crossed(mob/living/carbon/L)
sleep(55)
L.doorstuck = 0
L.Knockdown(1)
return
return ..()
if(rand(1, 5) == 5)
to_chat(L, "<span class='danger'>With great effort, you manage to squeeze your massive form through \the [src]. It's a tight fit, but you successfully navigate the narrow opening, barely avoiding getting stuck.</span>")
return
return ..()
else if(L.fatness > 1890)
if(rand(1, 5) == 1)
L.visible_message("<span class'danger'>[L]'s hips brush against the doorway...</span>")
to_chat(L, "<span class='danger'>As you pass through \the [src], you feel a slight brushing against your hips. The [src] frame accommodates your form, but it's a close fit..</span>")
return ..()
else
return ..()
/obj/machinery/door/airlock/abandoned
abandoned = TRUE