cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #380 from Markolie/master

Browse Source 
Adds celsius to the freezer/heater, crafting update
This commit is contained in:
ZomgPonies
2015-02-22 08:30:11 -05:00
parent 1c1ebc3f3f 6d54e142eb
commit 1f5ef8d4dd
38 changed files with 745 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -265,7 +265,7 @@
return
if(W)
W.loc = src.loc
else if(istype(W, /obj/item/weapon/packageWrap))
else if(istype(W, /obj/item/stack/packageWrap))
return
else if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+1 -1
View File
@@ -94,7 +94,7 @@
else
for(var/mob/O in viewers(user, 3))
O.show_message("<span class='warning'>The locker has been broken by [user] with an electromagnetic card!</span>", 1, "You hear a faint electrical spark.", 2)
else if(istype(W,/obj/item/weapon/packageWrap) || istype(W,/obj/item/weapon/weldingtool))
else if(istype(W,/obj/item/stack/packageWrap) || istype(W,/obj/item/weapon/weldingtool))
return ..(W,user)
else
togglelock(user)
code/game/objects/structures/crates_lockers/crates.dm
+2 -2
View File
@@ -138,7 +138,7 @@
return
if(W)
W.loc = src.loc
else if(istype(W, /obj/item/weapon/packageWrap))
else if(istype(W, /obj/item/stack/packageWrap))
return
else if(istype(W, /obj/item/stack/cable_coil))
if(rigged)
@@ -247,7 +247,7 @@
src.toggle(user)
/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(is_type_in_list(W, list(/obj/item/weapon/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/wirecutters)))
if(is_type_in_list(W, list(/obj/item/stack/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/wirecutters)))
return ..()
if(locked && (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)))
overlays.Cut()
code/game/objects/structures/tables_racks.dm
-8
View File
@@ -24,7 +24,6 @@
var/parts = /obj/item/weapon/table_parts
var/flipped = 0
var/health = 100
var/list/table_contents = list()
var/busy = 0
/obj/structure/table/proc/update_adjacent()
@@ -41,8 +40,6 @@
update_icon()
update_adjacent()
craft_holder = new /datum/crafting_holder(src, "table")
/obj/structure/table/Destroy()
update_adjacent()
..()
@@ -52,11 +49,6 @@
density = 0
qdel(src)
/obj/structure/table/MouseDrop(atom/over)
if(usr.stat || usr.lying || !Adjacent(usr) || (over != usr))
return
craft_holder.interact(usr)
/obj/structure/table/update_icon()
if(flipped)
var/type = 0