mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 19:52:40 +00:00
Adds watering can, fixes point blank stunning, adds new gaming kit sprite.
This commit is contained in:
@@ -1871,6 +1871,20 @@
|
|||||||
del(D)
|
del(D)
|
||||||
del(src)
|
del(src)
|
||||||
|
|
||||||
|
/obj/item/weapon/reagent_containers/glass/watercan
|
||||||
|
name = "watering can"
|
||||||
|
desc = "A watering can, for all your watering needs."
|
||||||
|
icon = 'hydroponics.dmi'
|
||||||
|
icon_state = "watercan"
|
||||||
|
item_state = "bucket"
|
||||||
|
m_amt = 200
|
||||||
|
g_amt = 0
|
||||||
|
w_class = 3.0
|
||||||
|
amount_per_transfer_from_this = 20
|
||||||
|
possible_transfer_amounts = list(10,20,30,50,70)
|
||||||
|
volume = 70
|
||||||
|
flags = FPRINT | OPENCONTAINER
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/glass/cantister
|
/obj/item/weapon/reagent_containers/glass/cantister
|
||||||
desc = "It's a canister. Mainly used for transporting fuel."
|
desc = "It's a canister. Mainly used for transporting fuel."
|
||||||
name = "canister"
|
name = "canister"
|
||||||
|
|||||||
@@ -107,6 +107,11 @@
|
|||||||
update_icon()
|
update_icon()
|
||||||
return
|
return
|
||||||
else if(user.a_intent != "hurt" && load_into_chamber() && istype(in_chamber,/obj/item/projectile/energy/electrode)) //Point blank tasering.
|
else if(user.a_intent != "hurt" && load_into_chamber() && istype(in_chamber,/obj/item/projectile/energy/electrode)) //Point blank tasering.
|
||||||
|
if (M.canstun == 0 || M.canweaken == 0)
|
||||||
|
user.visible_message("\red <B>[M] has been stunned with the taser gun by [user] to no effect!</B>")
|
||||||
|
del(in_chamber)
|
||||||
|
update_icon()
|
||||||
|
return
|
||||||
if (prob(50))
|
if (prob(50))
|
||||||
if (M.paralysis < 60 && (!(M.mutations & 8)) )
|
if (M.paralysis < 60 && (!(M.mutations & 8)) )
|
||||||
M.paralysis = 60
|
M.paralysis = 60
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 121 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 53 KiB |
14487
maps/tgstation.2.0.8.dmm
14487
maps/tgstation.2.0.8.dmm
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user