clean up

2017-08-28 10:34:31 -05:00
parent f3721ff2f0
commit 6c76ae2395
236 changed files with 0 additions and 3648 deletions
@@ -1,10 +0,0 @@
-diff a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm	(rejected hunks)
-@@ -151,7 +151,7 @@
- /obj/item/borg/charger
- 	name = "power connector"
- 	icon_state = "charger_draw"
-	flags = NOBLUDGEON
-+	flags_1 = NOBLUDGEON_1
- 	var/mode = "draw"
- 	var/static/list/charge_machines = typecacheof(list(/obj/machinery/cell_charger, /obj/machinery/recharger, /obj/machinery/recharge_station, /obj/machinery/mech_bay_recharge_port))
- 	var/static/list/charge_items = typecacheof(list(/obj/item/stock_parts/cell, /obj/item/gun/energy))
@@ -1,19 +0,0 @@
-diff a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm	(rejected hunks)
-@@ -9,7 +9,7 @@
- 	desc = "Wrap packages with this festive paper to make gifts."
- 	icon = 'icons/obj/items_and_weapons.dmi'
- 	icon_state = "wrap_paper"
-	flags = NOBLUDGEON
-+	flags_1 = NOBLUDGEON_1
- 	amount = 25
- 	max_amount = 25
- 	resistance_flags = FLAMMABLE
-@@ -30,7 +30,7 @@
- 	desc = "You can use this to wrap items in."
- 	icon = 'icons/obj/items_and_weapons.dmi'
- 	icon_state = "deliveryPaper"
-	flags = NOBLUDGEON
-+	flags_1 = NOBLUDGEON_1
- 	amount = 25
- 	max_amount = 25
- 	resistance_flags = FLAMMABLE
@@ -1,12 +0,0 @@
-diff a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm	(rejected hunks)
-@@ -244,8 +244,8 @@
- // Copied from /obj/item/melee/transforming/energy/sword/attackby
- /obj/item/toy/sword/attackby(obj/item/W, mob/living/user, params)
- 	if(istype(W, /obj/item/toy/sword))
-		if((W.flags & NODROP) || (flags & NODROP))
-			to_chat(user, "<span class='warning'>\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!</span>")
-+		if((W.flags_1 & NODROP_1) || (flags_1 & NODROP_1))
-+			to_chat(user, "<span class='warning'>\the [flags_1 & NODROP_1 ? src : W] is stuck to your hand, you can't attach it to \the [flags_1 & NODROP_1 ? W : src]!</span>")
- 			return
- 		else
- 			to_chat(user, "<span class='notice'>You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.</span>")