Just deleted about 400 bot accounts and a bunch of spam. To mitigate this in the future, we've enabled reCaptcha on signup. Let me know if someone got caught in the crossfire.

Commit 4b87c943 authored by BarneyGumball's avatar BarneyGumball Committed by clusterfack
Browse files

Fixing bugs: Faster than you can merge edition (#12050)

* Fixes #9177

* Fixes #10974

* Fixes #11987

* Makes transfer() check if the target is an open container.
parent b9753d87
......@@ -109,7 +109,7 @@
src.icon_state = "mw"
src.broken = 0 // Fix it!
src.dirty = 0 // just to be sure
src.flags = OPENCONTAINER
src.flags |= OPENCONTAINER
else
to_chat(user, "<span class='warning'>It's broken!</span>")
return 1
......@@ -130,7 +130,7 @@
src.dirty = 0 // It's clean!
src.broken = 0 // just to be sure
src.icon_state = "mw"
src.flags = OPENCONTAINER
src.flags |= OPENCONTAINER
return 1
else //Otherwise bad luck!!
to_chat(user, "<span class='warning'>It's too dirty!</span>")
......@@ -397,7 +397,7 @@
playsound(get_turf(src), 'sound/machines/ding.ogg', 50, 1)
src.visible_message("<span class='warning'>The microwave gets covered in muck!</span>")
src.dirty = 100 // Make it dirty so it can't be used util cleaned
src.flags = 0 //So you can't add condiments
src.flags &= ~OPENCONTAINER //So you can't add condiments
src.icon_state = "mwbloody" // Make it look dirty too
src.operating = 0 // Turn it off again aferwards
src.updateUsrDialog()
......@@ -409,7 +409,7 @@
src.icon_state = "mwb" // Make it look all busted up and shit
src.visible_message("<span class='warning'>The microwave breaks!</span>") //Let them know they're stupid
src.broken = 2 // Make it broken so it can't be used util fixed
src.flags = 0 //So you can't add condiments
src.flags &= ~OPENCONTAINER //So you can't add condiments
src.operating = 0 // Turn it off again aferwards
src.updateUsrDialog()
......
......@@ -310,17 +310,15 @@
if(!O.up && tinted_weldhelh)
overlay_fullscreen("tint", /obj/screen/fullscreen/impaired, 2)
masked = 1
else
clear_fullscreen("tint")
else
clear_fullscreen("tint")
if(!masked && istype(glasses, /obj/item/clothing/glasses/welding) && !istype(glasses, /obj/item/clothing/glasses/welding/superior))
var/obj/item/clothing/glasses/welding/O = glasses
if(!O.up && tinted_weldhelh)
overlay_fullscreen("tint", /obj/screen/fullscreen/impaired, 2)
else
clear_fullscreen("tint")
masked = 1
if(!masked)
clear_fullscreen("tint")
if(machine)
if(!machine.check_eye(src))
......
......@@ -1146,7 +1146,7 @@
equipment = autoset(equipment, 1)
lighting = autoset(lighting, 1)
environ = autoset(environ, 1)
if(cell.percent() > 75 && !areaMaster.poweralm && !make_alerts)
if(cell.percent() > 75 && !areaMaster.poweralm && make_alerts)
areaMaster.poweralert(1, src)
// now trickle-charge the cell
......
......@@ -213,7 +213,8 @@ var/list/LOGGED_SPLASH_REAGENTS = list(FUEL, THERMITE)
if (!container.is_open_container() && istype(container,/obj/item/weapon/reagent_containers))
return -1
success = transfer_sub(src, target, amount_per_transfer_from_this, user, log_transfer = TRUE)
if(target.is_open_container())
success = transfer_sub(src, target, amount_per_transfer_from_this, user, log_transfer = TRUE)
if(success)
if (success > 0)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment