cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 18:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev

Browse Source
This commit is contained in:
Zuhayr
2015-05-17 12:58:09 +09:30
parent 13b26cff8e 4cd2a5a532
commit 2714e458b3
172 changed files with 2581 additions and 2633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/projectiles/guns/launcher/crossbow.dm
View File

@@ -41,7 +41,7 @@
/obj/item/weapon/arrow/rod/removed(mob/user)
if(throwforce == 15) // The rod has been superheated - we don't want it to be useable when removed from the bow.
user << "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow."
var/obj/item/weapon/shard/shrapnel/S = new()
var/obj/item/weapon/material/shard/shrapnel/S = new()
S.loc = get_turf(src)
qdel(src)
@@ -254,9 +254,9 @@
else
user << "<span class='notice'>You need at least five segments of cable coil to complete this task.</span>"
return
else if(istype(W,/obj/item/stack/sheet/mineral/plastic))
else if(istype(W,/obj/item/stack/material/plastic))
if(buildstate == 3)
var/obj/item/stack/sheet/mineral/plastic/P = W
var/obj/item/stack/material/plastic/P = W
if(P.use(3))
user << "<span class='notice'>You assemble and install a heavy plastic lath onto the crossbow.</span>"
buildstate++

4
code/modules/projectiles/guns/launcher/pneumatic.dm
View File

@@ -167,9 +167,9 @@
buildstate++
update_icon()
return
else if(istype(W,/obj/item/stack/sheet/metal))
else if(istype(W,/obj/item/stack/material/steel))
if(buildstate == 2)
var/obj/item/stack/sheet/metal/M = W
var/obj/item/stack/material/steel/M = W
if(M.use(5))
user << "<span class='notice'>You assemble a chassis around the cannon frame.</span>"
buildstate++