cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

First commit of this big PR

Browse Source 
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
This commit is contained in:
phil235
2016-04-24 20:26:24 +02:00
parent d4c18082f8
commit 0caa59b21a
207 changed files with 672 additions and 758 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/table_frames.dm
+9 -13
View File
@@ -29,8 +29,7 @@
for(var/i = 1, i <= framestackamount, i++)
new framestack(get_turf(src))
qdel(src)
return
if(istype(I, /obj/item/stack/sheet/plasteel))
else if(istype(I, /obj/item/stack/sheet/plasteel))
var/obj/item/stack/sheet/plasteel/P = I
if(P.get_amount() < 1)
user << "<span class='warning'>You need one plasteel sheet to do this!</span>"
@@ -40,8 +39,7 @@
P.use(1)
new /obj/structure/table/reinforced(src.loc)
qdel(src)
return
if(istype(I, /obj/item/stack/sheet/metal))
else if(istype(I, /obj/item/stack/sheet/metal))
var/obj/item/stack/sheet/metal/M = I
if(M.get_amount() < 1)
user << "<span class='warning'>You need one metal sheet to do this!</span>"
@@ -51,8 +49,7 @@
M.use(1)
new /obj/structure/table(src.loc)
qdel(src)
return
if(istype(I, /obj/item/stack/sheet/glass))
else if(istype(I, /obj/item/stack/sheet/glass))
var/obj/item/stack/sheet/glass/G = I
if(G.get_amount() < 1)
user << "<span class='warning'>You need one glass sheet to do this!</span>"
@@ -63,8 +60,7 @@
new /obj/structure/table/glass(src.loc)
qdel(src)
return
if(istype(I, /obj/item/stack/sheet/mineral/silver))
else if(istype(I, /obj/item/stack/sheet/mineral/silver))
var/obj/item/stack/sheet/mineral/silver/S = I
if(S.get_amount() < 1)
user << "<span class='warning'>You need one silver sheet to do this!</span>"
@@ -74,7 +70,8 @@
S.use(1)
new /obj/structure/table/optable(src.loc)
qdel(src)
return
else
return ..()
/*
* Wooden Frames
@@ -89,8 +86,6 @@
burn_state = FLAMMABLE
/obj/structure/table_frame/wood/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/wrench))
..()
if(istype(I, /obj/item/stack/sheet/mineral/wood))
var/obj/item/stack/sheet/mineral/wood/W = I
if(W.get_amount() < 1)
@@ -102,7 +97,7 @@
new /obj/structure/table/wood(src.loc)
qdel(src)
return
if(istype(I, /obj/item/stack/tile/carpet))
else if(istype(I, /obj/item/stack/tile/carpet))
var/obj/item/stack/tile/carpet/C = I
if(C.get_amount() < 1)
user << "<span class='warning'>You need one carpet sheet to do this!</span>"
@@ -112,4 +107,5 @@
C.use(1)
new /obj/structure/table/wood/poker(src.loc)
qdel(src)
return
else
return ..()