cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-24 13:16:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Things Moveable Final"

Browse Source 
This reverts commit 723a35a058.
This commit is contained in:
skull132
2014-08-19 23:24:37 +03:00
parent 723a35a058
commit 689c13cfcb
6 changed files with 28 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/aurora/banner.dm
+6 -2
View File
@@ -36,9 +36,13 @@
if(0)
anchored = 1
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] secures [src.name] to the floor.", "You secure [src.name] to the floor.", "You hear a ratchet")
user.visible_message("[user.name] secures [src.name] to the floor.", \
"You secure [src.name] to the floor.", \
"You hear a ratchet")
if(1)
anchored = 0
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] unsecures [src.name] reinforcing bolts from the floor.", "You unsecure [src.name] from the floor.", "You hear a ratchet")
user.visible_message("[user.name] unsecures [src.name] reinforcing bolts from the floor.", \
"You unsecure [src.name] from the floor.", \
"You hear a ratchet")
return
code/modules/reagents/Chemistry-Machinery.dm
+3 -31
View File
@@ -181,7 +181,7 @@
add_fingerprint(usr)
return 1 // update UIs attached to this object
/obj/machinery/chem_dispenser/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob)
/obj/machinery/chem_dispenser/attackby(var/obj/item/weapon/reagent_containers/B as obj, var/mob/user as mob)
if(isrobot(user))
return
@@ -209,20 +209,6 @@
user << "You set [B] on the machine."
nanomanager.update_uis(src) // update all UIs attached to src
return
if(istype(B, /obj/item/weapon/wrench))
if(moveable == 1)
switch(anchored)
if(0)
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
spawn(10)
user.visible_message("[user.name] secures [src.name] to the floor.", "You secure [src.name] to the floor.", "You hear a ratchet")
anchored = 1
if(1)
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
spawn(10)
user.visible_message("[user.name] unsecures [src.name] reinforcing bolts from the floor.", "You unsecure [src.name] from the floor.", "You hear a ratchet")
anchored = 0
return
/obj/machinery/chem_dispenser/attack_ai(mob/user as mob)
return src.attack_hand(user)
@@ -341,21 +327,6 @@
/obj/machinery/chem_master/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob)
if(istype(B, /obj/item/weapon/wrench))
if(moveable == 1)
switch(anchored)
if(0)
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
spawn(10)
user.visible_message("[user.name] secures [src.name] to the floor.", "You secure [src.name] to the floor.", "You hear a ratchet")
anchored = 1
if(1)
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
spawn(10)
user.visible_message("[user.name] unsecures [src.name] reinforcing bolts from the floor.", "You unsecure [src.name] from the floor.", "You hear a ratchet")
anchored = 0
return
if(istype(B, /obj/item/weapon/reagent_containers/glass))
if(src.beaker)
@@ -367,7 +338,8 @@
user << "You add the beaker to the machine!"
src.updateUsrDialog()
icon_state = "mixer1"
if(istype(B, /obj/item/weapon/storage/pill_bottle))
else if(istype(B, /obj/item/weapon/storage/pill_bottle))
if(src.loaded_pill_bottle)
user << "A pill bottle is already loaded into the machine."