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:
@@ -408,6 +408,9 @@
|
||||
|
||||
|
||||
/obj/machinery/power/smes/emp_act(severity)
|
||||
. = ..()
|
||||
if(. & EMP_PROTECT_SELF)
|
||||
return
|
||||
input_attempt = rand(0,1)
|
||||
inputting = input_attempt
|
||||
output_attempt = rand(0,1)
|
||||
@@ -419,7 +422,6 @@
|
||||
charge = 0
|
||||
update_icon()
|
||||
log_smes("an emp")
|
||||
..()
|
||||
|
||||
/obj/machinery/power/smes/engineering
|
||||
charge = 1.5e6 // Engineering starts with some charge for singulo
|
||||
|
||||
Reference in New Issue
Block a user