cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull

Browse Source 
August2020UpstreamPull
This commit is contained in:
Razgriz
2020-08-09 02:58:18 -07:00
parent deecf5e4dc 9d3b96c8bd
commit f00fdebbb9
915 changed files with 253357 additions and 90809 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/material/ashtray.dm
+1 -1
View File
@@ -46,7 +46,7 @@ var/global/list/ashtray_cache = list()
/obj/item/weapon/material/ashtray/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (health <= 0)
return
if (istype(W,/obj/item/weapon/cigbutt) || istype(W,/obj/item/clothing/mask/smokable/cigarette) || istype(W, /obj/item/weapon/flame/match))
if (istype(W,/obj/item/trash/cigbutt) || istype(W,/obj/item/clothing/mask/smokable/cigarette) || istype(W, /obj/item/weapon/flame/match))
if (contents.len >= max_butts)
to_chat(user, "\The [src] is full.")
return
code/game/objects/items/weapons/material/chainsaw.dm
+2 -2
View File
@@ -12,13 +12,13 @@ obj/item/weapon/chainsaw
var/active_force = 55
var/inactive_force = 10
obj/item/weapon/chainsaw/New()
obj/item/weapon/chainsaw/Initialize() //YW edit - replaced New with Initialize so chainsaws can be mapped in
. = ..()
var/datum/reagents/R = new/datum/reagents(max_fuel)
reagents = R
R.my_atom = src
R.add_reagent("fuel", max_fuel)
START_PROCESSING(SSobj, src)
..()
obj/item/weapon/chainsaw/Destroy()
STOP_PROCESSING(SSobj, src)