Code and Map Bugfixes (#4514)

- Access to Research Division Maintenance airlock is fixed #4477 
- Changed shower to wash any mob present on active shower tile, also added damage to slimes. #4483 
- Added missing emergency firelocks in interstatial level of security. #4444 
- Fixed wrong spelling of broken light  bulb icon state, issue #4541 
- Added for pool to use reagents water on mobs or objects, now pool cleans itself and user, plus damages slimes. #4544 #4545 
- `crush_act` now checks if atom is simulated. #4001 
- turbolifts now use `crush_act` on atoms.
- Closets have their own crush_act. They now gib mobs inside of them. issue #4538
- Closets uses its internal function to dump content upon destruction.
- Closet now spawn one sheet of steel when destroyed.
- Fixed chainsaw unwielded force to be appropriate. Buffed chainsaw on wielded/unwielded force. Wielded is now `60` and unwielded is `30` if it is powered. #4586 
- Added missing cameras to medical construction level. #4581 
- Hydroponics tray status no longer blocked by light fixture, moved it in a better spot. Added one more light to hydroponics to not have shadows. #4449
This commit is contained in:
Mykhailo Bykhovtsev
2018-04-19 00:03:46 +02:00
committed by Werner
parent 185834e0ca
commit e6baab0c23
10 changed files with 261 additions and 73 deletions
@@ -182,7 +182,6 @@
update_icon()
return 1
// this should probably use dump_contents()
/obj/structure/closet/ex_act(severity)
switch(severity)
if(1)
@@ -194,15 +193,16 @@
if (health <= 0)
for (var/atom/movable/A as mob|obj in src)
A.forceMove(loc)
A.ex_act(severity + 1)
dump_contents()
new /obj/item/stack/material/steel(get_turf(src))
qdel(src)
/obj/structure/closet/proc/damage(var/damage)
health -= damage
if(health <= 0)
for(var/atom/movable/A in src)
A.forceMove(loc)
dump_contents()
new /obj/item/stack/material/steel(get_turf(src))
qdel(src)
/obj/structure/closet/bullet_act(var/obj/item/projectile/Proj)
@@ -452,3 +452,14 @@
/obj/structure/closet/onDropInto(var/atom/movable/AM)
return
/obj/structure/closet/crush_act()
for (var/atom/movable/A in src)
if(istype(A, /mob/living))
var/mob/living/M = A
M.gib()
else if(A.simulated)
A.ex_act(1)
dump_contents()
new /obj/item/stack/material/steel(get_turf(src))
qdel(src)
+6 -4
View File
@@ -134,6 +134,7 @@
density = 0
anchored = 1
use_power = 0
var/spray_amount = 20
var/on = 0
var/obj/effect/mist/mymist = null
var/ismist = 0 //needs a var so we can make it linger~
@@ -221,10 +222,10 @@
/obj/machinery/shower/proc/wash(atom/movable/O as obj|mob)
if(!on) return
if(isliving(O))
var/mob/living/L = O
L.ExtinguishMob()
L.fire_stacks = -20 //Douse ourselves with water to avoid fire more easily
var/obj/effect/effect/water/W = new(O)
W.create_reagents(spray_amount)
W.reagents.add_reagent("water", spray_amount)
W.set_up(O, spray_amount)
if(iscarbon(O))
var/mob/living/carbon/M = O
@@ -326,6 +327,7 @@
wash_floor()
if(!mobpresent) return
for(var/mob/living/L in loc)
wash(L) // Why was it not here before?
process_heat(L)
/obj/machinery/shower/proc/wash_floor()