mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 06:57:42 +01:00
RL in IRC Update:
- The soymilk + enzyme reaction to create tofu will now make multiple pieces of tofu depending on how much you are mixing together instead of just 1 no matter how much you mix together. - Deleted some garbage code that I'm no longer going to implement (at least not any time soon). - Candy Corn nutriment value reduced to something sensible rather then AUTO FAT - By popular admin request, Guest accounts are not allowed to be any head of staff, the AI, or any security position. Unfortunately, that means if your BYOND name begins with "Guest-", you can't be those positions either. However, that's your own problem. I'll enable the config.txt setup for it later. - Napalm actually works now. It's Aluminum + Plasma + Sulfuric Acid. It creates a relatively short but intense fire over an area and will spread like a normal toxin's fire. - Incendiary grenades redone into a normal chem grenade that makes napalm. Old style incendiary grenade code removed since it didn't work anyway. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@750 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -14,20 +14,6 @@
|
||||
flags = FPRINT | TABLEPASS | ONBELT | USEDELAY
|
||||
var/datum/effects/system/bad_smoke_spread/smoke
|
||||
|
||||
/obj/item/weapon/incendiarygrenade
|
||||
desc = "It is set to detonate in 3 seconds."
|
||||
name = "incendiary grenade"
|
||||
icon = 'grenade.dmi'
|
||||
icon_state = "flashbang"
|
||||
var/state = null
|
||||
var/firestrength = 100
|
||||
var/det_time = 20.0
|
||||
w_class = 2.0
|
||||
item_state = "flashbang"
|
||||
throw_speed = 4
|
||||
throw_range = 20
|
||||
flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
|
||||
|
||||
/obj/item/weapon/mustardbomb
|
||||
desc = "It is set to detonate in 4 seconds."
|
||||
name = "mustard gas bomb"
|
||||
@@ -67,19 +53,6 @@
|
||||
src.add_fingerprint(user)
|
||||
return
|
||||
|
||||
/obj/item/weapon/incendiarygrenade/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if (istype(W, /obj/item/weapon/screwdriver))
|
||||
if (src.det_time == 60)
|
||||
src.det_time = 30
|
||||
user.show_message("\blue You set the incendiary grenade for a 3 second detonation time.")
|
||||
src.desc = "It is set to detonate in 3 seconds."
|
||||
else
|
||||
src.det_time = 60
|
||||
user.show_message("\blue You set the incendiary grenade for a 6 second detonation time.")
|
||||
src.desc = "It is set to detonate in 6 seconds."
|
||||
src.add_fingerprint(user)
|
||||
return
|
||||
|
||||
/obj/item/weapon/smokebomb/afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
|
||||
if (user.equipped() == src)
|
||||
if (!( src.state ))
|
||||
@@ -97,31 +70,6 @@
|
||||
src.add_fingerprint(user)
|
||||
return
|
||||
|
||||
/obj/item/weapon/incendiarygrenade/afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
|
||||
if (user.equipped() == src)
|
||||
if (!( src.state ))
|
||||
user << "\red You prime the incendiary grenade! [det_time/10] seconds!"
|
||||
src.state = 1
|
||||
src.icon_state = "flashbang1"
|
||||
playsound(src.loc, 'armbomb.ogg', 75, 1, -3)
|
||||
spawn( src.det_time )
|
||||
prime()
|
||||
return
|
||||
user.dir = get_dir(user, target)
|
||||
user.drop_item()
|
||||
var/t = (isturf(target) ? target : target.loc)
|
||||
walk_towards(src, t, 3)
|
||||
src.add_fingerprint(user)
|
||||
return
|
||||
|
||||
/obj/item/weapon/incendiarygrenade/attack_paw(mob/user as mob)
|
||||
return src.attack_hand(user)
|
||||
|
||||
/obj/item/weapon/incendiarygrenade/attack_hand()
|
||||
walk(src, null, null)
|
||||
..()
|
||||
return
|
||||
|
||||
/obj/item/weapon/smokebomb/attack_paw(mob/user as mob)
|
||||
return src.attack_hand(user)
|
||||
|
||||
@@ -149,37 +97,6 @@
|
||||
del(src)
|
||||
return
|
||||
|
||||
/obj/item/weapon/incendiarygrenade/proc/prime()
|
||||
playsound(src.loc, 'bamf.ogg', 75, 1, -2)
|
||||
var/turf/T = src.loc
|
||||
var/turf/Tx1 = src.x + 1
|
||||
var/turf/Txm1 = src.x - 1
|
||||
var/turf/Ty1 = src.y + 1
|
||||
var/turf/Tym1 = src.y - 1
|
||||
for(var/turf/simulated/floor/target_tile in list(T,Tx1,Txm1,Ty1,Tym1))
|
||||
if(target_tile.parent && target_tile.parent.group_processing)
|
||||
target_tile.parent.suspend_group_processing()
|
||||
|
||||
var/datum/gas_mixture/napalm = new
|
||||
var/datum/gas/volatile_fuel/fuel = new
|
||||
|
||||
fuel.moles = 15
|
||||
napalm.trace_gases += fuel
|
||||
|
||||
target_tile.assume_air(napalm)
|
||||
|
||||
spawn target_tile.hotspot_expose(700, 400)
|
||||
|
||||
for(var/obj/blob/B in view(8,src))
|
||||
var/damage = round(30/(get_dist(B,src)+1))
|
||||
B.health -= damage
|
||||
B.update()
|
||||
|
||||
sleep(10)
|
||||
del(src)
|
||||
return
|
||||
|
||||
|
||||
/obj/item/weapon/smokebomb/attack_self(mob/user as mob)
|
||||
if (!src.state)
|
||||
user << "\red You prime the smoke bomb! [det_time/10] seconds!"
|
||||
@@ -191,18 +108,6 @@
|
||||
return
|
||||
return
|
||||
|
||||
/obj/item/weapon/incendiarygrenade/attack_self(mob/user as mob)
|
||||
if (!src.state)
|
||||
user << "\red You prime the incendiary grenade! [det_time/10] seconds!"
|
||||
src.state = 1
|
||||
src.icon_state = "flashbang1"
|
||||
add_fingerprint(user)
|
||||
spawn( src.det_time )
|
||||
prime()
|
||||
return
|
||||
return
|
||||
|
||||
|
||||
/obj/item/weapon/mustardbomb/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if (istype(W, /obj/item/weapon/screwdriver))
|
||||
if (src.det_time == 80)
|
||||
|
||||
Reference in New Issue
Block a user