cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Defining Part 1 - Code cleanup toward defines (#19262)

Browse Source 
* This is only the beginning

* Update stack.dm
This commit is contained in:
Vi3trice
2022-10-10 20:50:29 +02:00
committed by GitHub
parent 9235117b40
commit 9e90c81282
107 changed files with 161 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/sheet_types.dm
+1 -1
View File
@@ -375,7 +375,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list (
))
/obj/item/stack/sheet/cardboard/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/stamp/clown) && !istype(loc, /obj/item/storage))
if(istype(I, /obj/item/stamp/clown) && !isstorage(loc))
var/atom/droploc = drop_location()
if(use(1))
playsound(I, 'sound/items/bikehorn.ogg', 50, 1, -1)
code/game/objects/items/stacks/stack.dm
+4 -4
View File
@@ -207,10 +207,10 @@
to_chat(usr, "<span class='warning'>There is another [R.title] here!</span>")
return FALSE
if(R.on_floor && !istype(get_turf(src), /turf/simulated))
if(R.on_floor && !issimulatedturf(get_turf(src)))
to_chat(usr, "<span class='warning'>\The [R.title] must be constructed on the floor!</span>")
return FALSE
if(R.on_floor_or_lattice && !(istype(get_turf(src), /turf/simulated) || locate(/obj/structure/lattice) in get_turf(src)))
if(R.on_floor_or_lattice && !(issimulatedturf(get_turf(src)) || locate(/obj/structure/lattice) in get_turf(src)))
to_chat(usr, "<span class='warning'>\The [R.title] must be constructed on the floor or lattice!</span>")
return FALSE
@@ -252,12 +252,12 @@
src = null //dont kill proc after qdel()
usr.unEquip(oldsrc, 1)
qdel(oldsrc)
if(istype(O, /obj/item))
if(isitem(O))
usr.put_in_hands(O)
O.add_fingerprint(usr)
//BubbleWrap - so newly formed boxes are empty
if(istype(O, /obj/item/storage))
if(isstorage(O))
for(var/obj/item/I in O)
qdel(I)
//BubbleWrap END