cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into snaxi2

Browse Source
This commit is contained in:
Detective Google
2020-05-12 21:34:04 -05:00
parent 70094fb1cf fd30edca9c
commit 4378a34ea7
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
_maps/map_files/BoxStation/BoxStation.dmm
View File

@@ -27777,7 +27777,7 @@
},
/obj/machinery/firealarm{
dir = 4;
pixel_x = -24
pixel_x = -26
},
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
@@ -39447,6 +39447,14 @@
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bPh" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 4
},
/turf/open/floor/plating,
/area/engine/atmos)
"bPi" = (
/obj/machinery/light{
dir = 4

6
code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
View File

@@ -21,10 +21,10 @@ Doesn't work on other aliens/AI.*/
. = ..()
action = new(src)
/obj/effect/proc_holder/alien/Trigger(mob/living/carbon/user, skip_cost_check)
if(!istype(user))
/obj/effect/proc_holder/alien/Trigger(mob/living/carbon/user, skip_cost_check = FALSE)
if(!skip_cost_check || !istype(user))
return TRUE
if(!skip_cost_check || cost_check(check_turf,user))
if(cost_check(check_turf,user))
if(fire(user) && user) // Second check to prevent runtimes when evolving
user.adjustPlasma(-plasma_cost)
return TRUE