Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync * sync part 1 - underscore folders in code * controllers folder * datums folder * game folder * cmon, work * modules - admin to awaymissions * cargo to events * fields to lighting * mapping > ruins * rest of the code folder * rest of the folders in the root directory * DME * fixes compiling errors. it compiles so it works * readds map changes * fixes dogborg module select * fixes typo in moduleselect_alternate_icon filepath
This commit is contained in:
@@ -315,6 +315,9 @@ obj/machinery/chem_dispenser/proc/work_animation()
|
||||
return cell
|
||||
|
||||
/obj/machinery/chem_dispenser/emp_act(severity)
|
||||
. = ..()
|
||||
if(. & EMP_PROTECT_SELF)
|
||||
return
|
||||
var/list/datum/reagents/R = list()
|
||||
var/total = min(rand(7,15), FLOOR(cell.charge*powerefficiency, 1))
|
||||
var/datum/reagents/Q = new(total*10)
|
||||
@@ -330,7 +333,6 @@ obj/machinery/chem_dispenser/proc/work_animation()
|
||||
cell.emp_act(severity)
|
||||
work_animation()
|
||||
visible_message("<span class='danger'>[src] malfunctions, spraying chemicals everywhere!</span>")
|
||||
..()
|
||||
|
||||
|
||||
/obj/machinery/chem_dispenser/RefreshParts()
|
||||
|
||||
Reference in New Issue
Block a user