More bugfixes (#5018)

Microwave can now eject items that are inside even when there is no power to it using Eject content verb. Fixes #4847

Mechs who were IONed and got into maint mode(while have maint mode change forbidden) can now change if they are allowed to switch maint mode by DNA owner. Fixes #4532

Changed door names. Fixes #5009

Found important bug in rejuvinate proc of living.dm It would crash when called on mobs that do not contain any reagents in it (AI, borgs, some simple animals). Effectively fixes #4986

Renamed sprite for basic service module so their eyes overlay is not missing anymore.
This commit is contained in:
Mykhailo Bykhovtsev
2018-07-24 08:06:56 +03:00
committed by Erki
parent e5121d1b3e
commit a14adaf747
7 changed files with 32 additions and 5 deletions
+17
View File
@@ -426,6 +426,23 @@
dispose()
return
/obj/machinery/microwave/verb/Eject()
set src in oview(1)
set category = "Object"
set name = "Eject content"
usr.visible_message(
"<span class='notice'>[usr] is trying to open [src] to take out its content.</span>" ,
"<span class='notice'>You are trying to open [src] to take out its content</span>"
)
if (!do_after(usr, 1 SECONDS, act_target = src))
return
usr.visible_message(
"<span class='notice'>[usr] opened [src] and has taken out [english_list(contents)].</span>" ,
"<span class='notice'>You have opened [src] and taken out [english_list(contents)].</span>"
)
dispose()
/obj/machinery/microwave/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if (!mover)
+1 -1
View File
@@ -1657,7 +1657,7 @@
return
if(href_list["toggle_maint_access"])
if(usr != src.occupant) return
if(state)
if(state && src.dna != src.occupant.dna.unique_enzymes)
occupant_message("<font color='red'>Maintenance protocols in effect</font>")
return
maint_access = !maint_access
+2 -1
View File
@@ -455,7 +455,8 @@ default behaviour is:
fire_stacks = 0
/mob/living/proc/rejuvenate()
reagents.clear_reagents()
if(!isnull(reagents))
reagents.clear_reagents()
// shut down various types of badness
setToxLoss(0)
@@ -614,7 +614,7 @@ var/global/list/robot_modules = list(
"Kent" = "toiletbot",
"Bro" = "brobot",
"Rich" = "maximillion",
"Basic" = "robotServ",
"Basic" = "robotserv",
"Drone - Service" = "drone-service",
"Drone - Hydro" = "drone-hydro",
"Classic" = "service2",
+9
View File
@@ -0,0 +1,9 @@
author: PoZe
delete-after: True
changes:
- bugfix: "Mechs that were shot with ION guns and got into maintenance mode while having it forbidden to switch the mode can now be unlocked by their DNA owners. By being able to allow maintenance mode."
- bugfix: "Cyborgs, AI, simple animals rejuvinate proc no longer crashes, making healing process to be complete."
- rscadd: "Microwave now has a verb to eject its content even whe it is not powered on"
- bugfix: "Fixed service cyborg basic sprite eyes overlay"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 321 KiB

After

Width:  |  Height:  |  Size: 321 KiB

+2 -2
View File
@@ -12861,7 +12861,7 @@
/area/crew_quarters/sleep/cryo)
"xJ" = (
/obj/machinery/door/airlock/glass{
name = "Holodeck"
name = "Recreation Center"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/dark,
@@ -13206,7 +13206,7 @@
/area/crew_quarters/sleep/cryo)
"yw" = (
/obj/machinery/door/airlock/glass{
name = "Holodeck"
name = "Recreation Center"
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{