clean up

2017-08-28 10:34:31 -05:00
parent f3721ff2f0
commit 6c76ae2395
236 changed files with 0 additions and 3648 deletions
@@ -1,12 +0,0 @@
-diff a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm	(rejected hunks)
-@@ -445,8 +445,8 @@
- 	name = "turret controls"
- 	icon_state = "offhand"
- 	w_class = WEIGHT_CLASS_HUGE
-	flags = ABSTRACT | NODROP
-	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON
-+	flags_1 = ABSTRACT_1 | NODROP_1
-+	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON_1
- 	var/delay = 0
- 
- /obj/item/turret_control/afterattack(atom/targeted_atom, mob/user)
@@ -1,10 +0,0 @@
-diff a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm	(rejected hunks)
-@@ -17,7 +17,7 @@
- 	var/active = 0
- 	var/strength = 0
- 	var/powered = 0
-	mouse_opacity = 2
-+	mouse_opacity = MOUSE_OPACITY_OPAQUE
- 
- /obj/machinery/particle_accelerator/control_box/Initialize()
- 	. = ..()
@@ -1,10 +0,0 @@
-diff a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm	(rejected hunks)
-@@ -524,7 +524,7 @@
- 			R.receive_pulse(power * (1 + power_transmission_bonus)/10 * freon_transmit_modifier)
- 
- /obj/machinery/power/supermatter_shard/attackby(obj/item/W, mob/living/user, params)
-	if(!istype(W) || (W.flags & ABSTRACT) || !istype(user))
-+	if(!istype(W) || (W.flags_1 & ABSTRACT_1) || !istype(user))
- 		return
- 	if(istype(W, /obj/item/scalpel/supermatter))
- 		playsound(src, W.usesound, 100, 1)