Removes/Refactors /mob/unEquip (#22918)

* Part1

* IT COMPILES!!!!

* Fuck wait this was missing from that last

* Update handlabeler.dm

* Update handlabeler.dm

* Fixes n shit

* Fix this

* Fixes #23310

* Fucking @RemieRichards was right

* Fixes devil unEquip

* WTF ARE BITFLAGS?

* THERES THE FUCKING PROBLEM

* Fixes
This commit is contained in:
Cyberboss
2017-01-30 15:28:31 -05:00
committed by oranges
parent b7384ec99e
commit 3f7f5d4000
189 changed files with 643 additions and 810 deletions
@@ -17,13 +17,12 @@
if(!can_install_component(H, user))
return FALSE
if(user && !user.unEquip(H))
if(user && !user.transferItemToLoc(H, src))
return FALSE
all_components[H.device_type] = H
user << "<span class='notice'>You install \the [H] into \the [src].</span>"
H.forceMove(src)
H.holder = src
H.on_install(src, user)
@@ -32,13 +32,10 @@
if(stored_card)
user << "<span class='warning'>You try to insert \the [I] into \the [src], but the slot is occupied.</span>"
return FALSE
if(user && !user.unEquip(I))
if(user && !user.transferItemToLoc(I, src))
return FALSE
stored_card = I
I.forceMove(src)
user << "<span class='notice'>You insert \the [I] into \the [src].</span>"
return TRUE
@@ -28,11 +28,10 @@
user << "<span class='warning'>This power cell is too large for \the [holder]!</span>"
return FALSE
if(user && !user.unEquip(I))
if(user && !user.transferItemToLoc(I, src))
return FALSE
battery = I
I.forceMove(src)
user << "<span class='notice'>You connect \the [I] to \the [src].</span>"
return TRUE
@@ -46,14 +46,13 @@
if(stored_card && stored_card2)
user << "<span class='warning'>You try to insert \the [I] into \the [src], but its slots are occupied.</span>"
return FALSE
if(user && !user.unEquip(I))
if(user && !user.transferItemToLoc(I, src))
return FALSE
if(!stored_card)
stored_card = I
else
stored_card2 = I
I.forceMove(src)
user << "<span class='notice'>You insert \the [I] into \the [src].</span>"
return TRUE
@@ -40,13 +40,12 @@
/obj/item/weapon/computer_hardware/printer/try_insert(obj/item/I, mob/living/user = null)
if(istype(I, /obj/item/weapon/paper))
if(user && !user.unEquip(I))
return FALSE
if(stored_paper >= max_paper)
user << "<span class='warning'>You try to add \the [I] into [src], but its paper bin is full!</span>"
return FALSE
if(user && !user.temporarilyRemoveItemFromInventory(I))
return FALSE
user << "<span class='notice'>You insert \the [I] into [src]'s paper recycler.</span>"
qdel(I)
stored_paper++