[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)

* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
This commit is contained in:
CitadelStationBot
2017-08-02 04:56:44 -05:00
committed by Poojawa
parent 76f7fcef9a
commit 8a4ddbe8a8
74 changed files with 62713 additions and 61428 deletions
-35
View File
@@ -1,35 +0,0 @@
diff a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm (rejected hunks)
@@ -1,21 +1,29 @@
+#define IV_TAKING 0
+#define IV_INJECTING 1
+
/obj/machinery/iv_drip
name = "\improper IV drip"
icon = 'icons/obj/iv_drip.dmi'
icon_state = "iv_drip"
- anchored = 0
+ anchored = FALSE
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
var/mob/living/carbon/attached = null
- var/mode = 1 // 1 is injecting, 0 is taking blood.
+ var/mode = IV_INJECTING
var/obj/item/weapon/reagent_containers/beaker = null
var/list/drip_containers = list(/obj/item/weapon/reagent_containers/blood,
- /obj/item/weapon/reagent_containers/food,
- /obj/item/weapon/reagent_containers/glass)
+ /obj/item/weapon/reagent_containers/food,
+ /obj/item/weapon/reagent_containers/glass)
/obj/machinery/iv_drip/Initialize()
..()
update_icon()
drip_containers = typecacheof(drip_containers)
+/obj/machinery/iv_drip/Destroy()
+ attached = null
+ QDEL_NULL(beaker)
+ return ..()
+
/obj/machinery/iv_drip/update_icon()
if(attached)
if(mode)