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

The various assemblies should be working now.

Browse Source 
Old style bombs and suicide vests temporarily removed.
Players can now be job banned from being a pAI.
Added null checks to explosion() due to runtime errors. 
Changelog updated


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1980 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-08-05 07:42:24 +00:00
parent 247ac0b197
commit e98a7893fa
40 changed files with 2440 additions and 2327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/assemblies.dm → code/game/objects/items/shock_kit.dm
+10
View File
@@ -1,3 +1,13 @@
/obj/item/assembly/shock_kit
name = "Shock Kit"
desc = "This appears to be made from both an Electric Pack and a Helmet."
icon_state = "shock_kit"
var/obj/item/clothing/head/helmet/part1 = null
var/obj/item/device/radio/electropack/part2 = null
var/status = 0.0
w_class = 5.0
flags = FPRINT | TABLEPASS| CONDUCT
/obj/item/assembly/shock_kit/Del()
//src.part1 = null
del(src.part1)
code/game/objects/items/weapons/flamethrower.dm
+36 -3
View File
@@ -4,6 +4,39 @@ GETLINEEEEEEEEEEEEEEEEEEEEE
(well not really but it should)
*/
/obj/item/assembly/weld_rod
desc = "A welding torch with metal rods attached to the flame tip."
name = "Welder/Rods Assembly"
icon_state = "welder-rods"
item_state = "welder"
var/obj/item/weapon/weldingtool/part1 = null
var/obj/item/stack/rods/part2 = null
var/status = null
flags = FPRINT | TABLEPASS| CONDUCT
force = 3.0
throwforce = 5.0
throw_speed = 1
throw_range = 5
w_class = 2.0
/obj/item/assembly/w_r_ignite
desc = "A welding torch and igniter connected by metal rods."
name = "Welder/Rods/Igniter Assembly"
icon_state = "welder-rods-igniter"
item_state = "welder"
var/obj/item/weapon/weldingtool/part1 = null
var/obj/item/stack/rods/part2 = null
var/obj/item/device/igniter/part3 = null
var/status = null
flags = FPRINT | TABLEPASS| CONDUCT
force = 3.0
throwforce = 5.0
throw_speed = 1
throw_range = 5
w_class = 2.0
//TODO:Change this over to a slightly better build system
/obj/item/weapon/flamethrower
name = "flamethrower"
icon_state = "flamethrower"
@@ -79,7 +112,7 @@ GETLINEEEEEEEEEEEEEEEEEEEEE
if (istype(W, /obj/item/device/igniter))
var/obj/item/device/igniter/I = W
if (!( I.status ))
if (!( I.secured ))
return
var/obj/item/assembly/weld_rod/S = src
var/obj/item/assembly/w_r_ignite/R = new /obj/item/assembly/w_r_ignite( user )
@@ -127,7 +160,7 @@ GETLINEEEEEEEEEEEEEEEEEEEEE
src.part3.loc = T
src.part1.master = null
src.part2.master = null
src.part3.master = null
src.part3.holder = null
src.part1 = null
src.part2 = null
src.part3 = null
@@ -221,7 +254,7 @@ GETLINEEEEEEEEEEEEEEEEEEEEE
S.part2.master = R
R.part3 = S.part3
S.part3.loc = R
S.part3.master = R
S.part3.holder = R
S.layer = initial(S.layer)
if (user.client)
user.client.screen -= S