360))
+ extinguish()
+ user << "You put out the fire on [src]."
+ else
+ user << "You burn your hand on [src]!"
+ var/obj/item/organ/limb/affecting = H.get_organ("[user.hand ? "l" : "r" ]_arm")
+ if(affecting.take_damage( 0, 5 )) // 5 burn damage
+ H.update_damage_overlays(0)
+ H.updatehealth()
+ return
+ else
+ extinguish()
+
if (istype(src.loc, /obj/item/weapon/storage))
//If the item is in a storage item, take it out
var/obj/item/weapon/storage/S = src.loc
@@ -415,27 +434,34 @@
throw_at(S,14,3)
else ..()
-/obj/item/acid_act(var/acidpwr, var/toxpwr, var/acid_volume)
+/obj/item/acid_act(var/acidpwr, var/acid_volume)
. = 1
if(unacidable)
return
+ var/meltingpwr = acid_volume*acidpwr
+ var/melting_threshold = 100
+ if(meltingpwr <= melting_threshold) // so a single unit can't melt items. You need 5.1+ unit for fluoro and 10.1+ for sulphuric
+ return
+
for(var/V in armor)
if(armor[V] > 0)
.-- //it survives the acid...
break
- if(.)
+ if(. && prob(min(meltingpwr/10,90))) //chance to melt depends on acid power and volume.
var/turf/T = get_turf(src)
if(T)
- T.visible_message("[src] melts away!")
var/obj/effect/decal/cleanable/molten_item/I = new (T)
I.pixel_x = rand(-16,16)
I.pixel_y = rand(-16,16)
I.desc = "Looks like this was \an [src] some time ago."
+ if(istype(src,/obj/item/weapon/storage))
+ var/obj/item/weapon/storage/S = src
+ S.do_quick_empty() //melted storage item drops its content.
qdel(src)
else
for(var/armour_value in armor) //but is weakened
- armor[armour_value] = max(armor[armour_value]-acidpwr,0)
+ armor[armour_value] = max(armor[armour_value]-min(acidpwr,meltingpwr/10),0)
if(!findtext(desc, "it looks slightly melted...")) //it looks slightly melted... it looks slightly melted... it looks slightly melted... etc.
desc += " it looks slightly melted..." //needs a space at the start, formatting
diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm
index 5d63211a30d..276d614a9ad 100644
--- a/code/game/objects/items/candle.dm
+++ b/code/game/objects/items/candle.dm
@@ -6,7 +6,6 @@
icon_state = "candle1"
item_state = "candle1"
w_class = 1
-
var/wax = 200
var/lit = 0
proc
@@ -46,6 +45,10 @@
if(M.lit)
light()
+/obj/item/candle/fire_act()
+ if(!src.lit)
+ light() //honk
+ return
/obj/item/candle/light(var/flavor_text = "[usr] lights the [name].")
if(!src.lit)
diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm
index 6ecc1a86125..dcfaceeffc3 100644
--- a/code/game/objects/items/devices/instruments.dm
+++ b/code/game/objects/items/devices/instruments.dm
@@ -1,6 +1,8 @@
//copy pasta of the space piano, don't hurt me -Pete
/obj/item/device/instrument
name = "generic instrument"
+ burn_state = 0 //Burnable
+ burntime = 20
var/datum/song/handheld/song
var/instrumentId = "generic"
var/instrumentExt = "ogg"
diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm
index 6a1cdcd1151..a77f96f1e9b 100644
--- a/code/game/objects/items/devices/pizza_bomb.dm
+++ b/code/game/objects/items/devices/pizza_bomb.dm
@@ -3,6 +3,7 @@
desc = "A box suited for pizzas."
icon = 'icons/obj/food/containers.dmi'
icon_state = "pizzabox1"
+ burn_state = 0 //Burnable
var/timer = 10 //Adjustable timer
var/timer_set = 0
var/primed = 0
@@ -54,6 +55,10 @@
sleep(timer)
return go_boom()
+/obj/item/device/pizza_bomb/burn() //Instead of burning to ashes, it will just explode
+ go_boom()
+ return
+
/obj/item/device/pizza_bomb/proc/go_boom()
if(disarmed)
visible_message("\icon[src] Sparks briefly jump out of the [correct_wire] wire on \the [src], but it's disarmed!")
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 206e6f64739..60e0ba98c3a 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -56,6 +56,9 @@
mytape = null
update_icon()
+/obj/item/device/taperecorder/fire_act()
+ mytape.ruin() //Fires destroy the tape
+ return()
/obj/item/device/taperecorder/attack_hand(mob/user)
if(loc == user)
@@ -264,6 +267,8 @@
var/list/timestamp = list()
var/ruined = 0
+/obj/item/device/tape/fire_act()
+ ruin()
/obj/item/device/tape/attack_self(mob/user)
if(!ruined)
diff --git a/code/game/objects/items/stacks/cash.dm b/code/game/objects/items/stacks/cash.dm
index 6c391dcc3e6..eff17423b61 100644
--- a/code/game/objects/items/stacks/cash.dm
+++ b/code/game/objects/items/stacks/cash.dm
@@ -10,6 +10,7 @@
throw_speed = 2
throw_range = 2
w_class = 1.0
+ burn_state = 0 //Burnable
/obj/item/stack/spacecash/c10
icon_state = "spacecash10"
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 55493399fad..33c7ad85fed 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -7,6 +7,8 @@
w_class = 1
throw_speed = 3
throw_range = 7
+ burn_state = 0 //Burnable
+ burntime = 5
var/heal_brute = 0
var/heal_burn = 0
var/stop_bleeding = 0
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 34c8445a8d5..28794e5bd7a 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -108,6 +108,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
icon = 'icons/obj/items.dmi'
origin_tech = "materials=1;biotech=1"
sheettype = "wood"
+ burn_state = 0 //Burnable
/obj/item/stack/sheet/mineral/wood/New(var/loc, var/amount=null)
recipes = wood_recipes
@@ -122,6 +123,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
singular_name = "cloth roll"
icon_state = "sheet-cloth"
origin_tech = "materials=2"
+ burn_state = 0 //Burnable
/*
* Cardboard
@@ -143,6 +145,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
singular_name = "cardboard sheet"
icon_state = "sheet-card"
origin_tech = "materials=1"
+ burn_state = 0 //Burnable
/obj/item/stack/sheet/cardboard/New(var/loc, var/amount=null)
recipes = cardboard_recipes
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 6d81c36bb2c..e498bc3ebce 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -84,6 +84,7 @@
max_amount = 60
origin_tech = "biotech=1"
turf_type = /turf/simulated/floor/fancy/grass
+ burn_state = 0 //Burnable
/*
* Wood
@@ -101,6 +102,7 @@
max_amount = 60
origin_tech = "biotech=1"
turf_type = /turf/simulated/floor/wood
+ burn_state = 0 //Burnable
/*
* Carpets
@@ -117,6 +119,7 @@
throw_range = 7
max_amount = 60
turf_type = /turf/simulated/floor/fancy/carpet
+ burn_state = 0 //Burnable
/*
* High-traction
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 515176b16a2..5bc5733aa4b 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -271,6 +271,7 @@
item_state = "arm_blade"
attack_verb = list("pricked", "absorbed", "gored")
w_class = 2
+ burn_state = 0 //Burnable
/*
@@ -527,6 +528,10 @@
icon_state = "snappop"
w_class = 1
+/obj/item/toy/snappop/fire_act()
+ throw_impact()
+ return
+
/obj/item/toy/snappop/throw_impact(atom/hit_atom)
..()
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
@@ -710,6 +715,8 @@
/obj/item/toy/cards
+ burn_state = 0 //Burnable
+ burntime = 5
var/parentdeck = null
var/deckstyle = "nanotrasen"
var/card_hitsound = null
@@ -949,7 +956,8 @@
newobj.card_throw_speed = sourceobj.card_throw_speed
newobj.card_throw_range = sourceobj.card_throw_range
newobj.card_attack_verb = sourceobj.card_attack_verb
-
+ if(sourceobj.burn_state == -1)
+ newobj.burn_state = -1
/obj/item/toy/cards/singlecard
name = "card"
@@ -1065,6 +1073,7 @@
card_throw_speed = 3
card_throw_range = 7
card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
+ burn_state = -1 //Not Burnable
/*
* Fake nuke
@@ -1123,6 +1132,7 @@
icon_state = "carpplushie"
w_class = 2.0
attack_verb = list("bitten", "eaten", "fin slapped")
+ burn_state = 0 //Burnable
var/bitesound = 'sound/weapons/bite.ogg'
// Attack mob
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index 2e22500c790..12e705d193b 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -3,6 +3,7 @@
icon = 'icons/obj/janitor.dmi'
desc = "This is rubbish."
w_class = 1.0
+ burn_state = 0 //Burnable
/obj/item/trash/raisins
name = "\improper 4no raisins"
@@ -51,6 +52,7 @@
/obj/item/trash/tray
name = "tray"
icon_state = "tray"
+ burn_state = -1 //Not Burnable
/obj/item/trash/candle
name = "candle"
@@ -60,6 +62,7 @@
/obj/item/trash/can
name = "crushed can"
icon_state = "cola"
+ burn_state = -1 //Not Burnable
/obj/item/trash/attack(mob/M, mob/living/user)
return
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 5d728df3a9d..921ca4479a1 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -201,14 +201,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/proc/handle_reagents()
- if(iscarbon(loc))
- var/mob/living/carbon/C = loc
- if (src == C.wear_mask) // if it's in the human/monkey mouth, transfer reagents to the mob
- if(prob(15)) // so it's not an instarape in case of acid
- reagents.reaction(C, INGEST)
- reagents.trans_to(C, REAGENTS_METABOLISM)
- return
- reagents.remove_any(REAGENTS_METABOLISM)
+ if(reagents.total_volume)
+ if(iscarbon(loc))
+ var/mob/living/carbon/C = loc
+ if (src == C.wear_mask) // if it's in the human/monkey mouth, transfer reagents to the mob
+ if(prob(15)) // so it's not an instarape in case of acid
+ var/fraction = min(REAGENTS_METABOLISM/reagents.total_volume, 1)
+ reagents.reaction(C, INGEST, fraction)
+ reagents.trans_to(C, REAGENTS_METABOLISM)
+ return
+ reagents.remove_any(REAGENTS_METABOLISM)
/obj/item/clothing/mask/cigarette/process()
diff --git a/code/game/objects/items/weapons/courtroom.dm b/code/game/objects/items/weapons/courtroom.dm
index c3f62193260..408cbe25a01 100644
--- a/code/game/objects/items/weapons/courtroom.dm
+++ b/code/game/objects/items/weapons/courtroom.dm
@@ -11,6 +11,7 @@
throwforce = 6.0
w_class = 2.0
attack_verb = list("bashed", "battered", "judged", "whacked")
+ burn_state = 0 //Burnable
/obj/item/weapon/gavelhammer/suicide_act(mob/user)
user.visible_message("[user] has sentenced \himself to death with the [src.name]! It looks like \he's trying to commit suicide.")
@@ -25,6 +26,7 @@
force = 2.0
throwforce = 2.0
w_class = 1.0
+ burn_state = 0 //Burnable
/obj/item/weapon/gavelblock/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/gavelhammer))
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 2dfa4b44c66..19e57dbb30b 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -151,6 +151,9 @@
if(isliving(atm)) //For extinguishing mobs on fire
var/mob/living/M = atm
M.ExtinguishMob()
+ if(istype(atm,/obj/item))
+ var/obj/item/Item = atm
+ Item.extinguish()
if(W.loc == my_target) break
sleep(2)
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index 242abdf81f6..9f1ba40f4c1 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -13,7 +13,7 @@
icon = 'icons/obj/storage.dmi'
icon_state = "giftcrate3"
item_state = "gift1"
-
+ burn_state = 0 //Burnable
/obj/item/weapon/a_gift/New()
..()
@@ -86,6 +86,7 @@
flags = NOBLUDGEON
amount = 25
max_amount = 25
+ burn_state = 0 //Burnable
/obj/item/stack/wrapping_paper/attack_self(mob/user)
user << "You need to use it on a package that has already been wrapped!"
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 2823aa83d0f..2ab9f5a64dd 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -182,31 +182,29 @@
mix_reagents()
- if(reagents.total_volume) //The possible reactions didnt use up all reagents.
+ if(reagents.total_volume) //The possible reactions didnt use up all reagents, so we spread it around.
var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread()
steam.set_up(10, 0, get_turf(src))
steam.attach(src)
steam.start()
- var/list/viewable = view(affected_area, loc)
- var/list/accessible = can_flood_from(loc, affected_area)
- var/list/reactable = accessible
- var/mycontents = GetAllContents()
- for(var/turf/T in accessible)
- for(var/atom/A in T.GetAllContents())
- if(A in mycontents) continue
- if(!(A in viewable)) continue
- reactable |= A
- if(!reactable.len) //Nothing to react with. Probably means we're in nullspace.
- qdel(src)
- return
- var/fraction = 1/reactable.len
- for(var/atom/A in reactable)
- reagents.reaction(A, TOUCH, fraction)
+ var/list/viewable = view(affected_area, loc)
+ var/list/accessible = can_flood_from(loc, affected_area)
+ var/list/reactable = accessible
+ var/mycontents = GetAllContents()
+ for(var/turf/T in accessible)
+ for(var/atom/A in T.GetAllContents())
+ if(A in mycontents) continue
+ if(!(A in viewable)) continue
+ reactable |= A
+ if(!reactable.len) //Nothing to react with. Probably means we're in nullspace.
+ qdel(src)
+ return
+ var/fraction = 1/reactable.len
+ for(var/atom/A in reactable)
+ reagents.reaction(A, TOUCH, fraction)
- invisibility = INVISIBILITY_MAXIMUM //Why am i doing this?
- spawn(50) //To make sure all reagents can work
- qdel(src) //correctly before deleting the grenade.
+ qdel(src)
/obj/item/weapon/grenade/chem_grenade/proc/mix_reagents()
var/total_temp
@@ -354,13 +352,14 @@
/obj/item/weapon/grenade/chem_grenade/teargas/New()
..()
- var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
- var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
+ var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src)
+ var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)
- B1.reagents.add_reagent("condensedcapsaicin", 25)
- B1.reagents.add_reagent("potassium", 25)
- B2.reagents.add_reagent("phosphorus", 25)
- B2.reagents.add_reagent("sugar", 25)
+ B1.reagents.add_reagent("condensedcapsaicin", 70)
+ B1.reagents.add_reagent("potassium", 30)
+ B2.reagents.add_reagent("phosphorus", 30)
+ B2.reagents.add_reagent("sugar", 30)
+ B1.reagents.add_reagent("condensedcapsaicin", 40)
beakers += B1
beakers += B2
@@ -373,17 +372,19 @@
/obj/item/weapon/grenade/chem_grenade/facid/New()
..()
- var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
- var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
+ var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src)
+ var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src)
- B1.reagents.add_reagent("facid", 25)
- B1.reagents.add_reagent("potassium", 25)
- B2.reagents.add_reagent("phosphorus", 25)
- B2.reagents.add_reagent("sugar", 25)
+ B1.reagents.add_reagent("facid", 290)
+ B1.reagents.add_reagent("potassium", 10)
+ B2.reagents.add_reagent("phosphorus", 10)
+ B2.reagents.add_reagent("sugar", 10)
+ B2.reagents.add_reagent("facid", 280)
beakers += B1
beakers += B2
+
/obj/item/weapon/grenade/chem_grenade/colorful
name = "colorful grenade"
desc = "Used for wide scale painting projects."
@@ -402,6 +403,7 @@
beakers += B1
beakers += B2
+
/obj/item/weapon/grenade/chem_grenade/clf3
name = "clf3 grenade"
desc = "BURN!-brand foaming clf3. In a special applicator for rapid purging of wide areas."
@@ -412,10 +414,10 @@
var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src)
- B1.reagents.add_reagent("fluorosurfactant", 290)
- B1.reagents.add_reagent("clf3", 10)
- B2.reagents.add_reagent("water", 290)
- B2.reagents.add_reagent("clf3", 10)
+ B1.reagents.add_reagent("fluorosurfactant", 250)
+ B1.reagents.add_reagent("clf3", 50)
+ B2.reagents.add_reagent("water", 250)
+ B2.reagents.add_reagent("clf3", 50)
beakers += B1
beakers += B2
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 85375327940..51272bbd0a7 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -9,10 +9,15 @@
throw_range = 7
flags = CONDUCT
slot_flags = SLOT_BELT
+ burn_state = 0 //Burnable
+ burntime = 5
var/active = 0
var/det_time = 50
var/display_timer = 1
+/obj/item/weapon/grenade/burn()
+ prime()
+
/obj/item/weapon/grenade/proc/clown_check(var/mob/living/carbon/human/user)
if(user.disabilities & CLUMSY && prob(50))
user << "Huh? How does this thing work?"
diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm
index 5ba0e73fa7d..059fb02ae5c 100644
--- a/code/game/objects/items/weapons/grenades/smokebomb.dm
+++ b/code/game/objects/items/weapons/grenades/smokebomb.dm
@@ -5,11 +5,11 @@
det_time = 20
item_state = "flashbang"
slot_flags = SLOT_BELT
- var/datum/effect/effect/system/bad_smoke_spread/smoke
+ var/datum/effect/effect/system/smoke_spread/bad/smoke
/obj/item/weapon/grenade/smokebomb/New()
..()
- src.smoke = new /datum/effect/effect/system/bad_smoke_spread
+ src.smoke = new /datum/effect/effect/system/smoke_spread/bad
src.smoke.attach(src)
/obj/item/weapon/grenade/smokebomb/Destroy()
@@ -24,10 +24,6 @@
src.smoke.start()
sleep(10)
src.smoke.start()
- sleep(10)
- src.smoke.start()
- sleep(10)
- src.smoke.start()
for(var/obj/effect/blob/B in view(8,src))
var/damage = round(30/(get_dist(B,src)+1))
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index be83f60bf9d..7031edd688f 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -82,6 +82,10 @@
name = "microbomb implant"
desc = "And boom goes the weasel."
icon_state = "explosive"
+ var/weak = 1.6
+ var/medium = 0.8
+ var/heavy = 0.4
+ var/delay = 7
/obj/item/weapon/implant/explosive/get_data()
var/dat = {"Implant Specifications:
@@ -103,33 +107,69 @@
if(!cause || !imp_in) return 0
if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your microbomb implant? This will cause you to explode!", "Microbomb Implant Confirmation", "Yes", "No") != "Yes")
return 0
- var/light = 1
- var/medium = 0.5
- var/heavy = 0.25
for(var/obj/item/weapon/implant/explosive/E in imp_in)
- heavy += 0.25
- medium += 0.5
- light += 1
+ heavy += 0.4
+ medium += 0.8
+ weak += 1.6
+ delay += 7
if(E != src)
qdel(E)
heavy = round(heavy)
medium = round(medium)
- light = round(light)
+ weak = round(weak)
+ imp_in << "You activate your microbomb implant."
+//If the delay is short, just blow up already jeez
+ if(delay <= 7)
+ imp_in.gib()
+ explosion(src,heavy,medium,weak,weak, flame_range = weak)
+ qdel(src)
+ imp_in.visible_message("[imp_in] starts beeping ominously!")
+ playsound(loc, 'sound/items/timer.ogg', 30, 0)
+ sleep(delay/4)
+ if(imp_in.stat)
+ imp_in.visible_message("[imp_in] doubles over in pain!")
+ imp_in.Weaken(7)
+ playsound(loc, 'sound/items/timer.ogg', 30, 0)
+ sleep(delay/4)
+ playsound(loc, 'sound/items/timer.ogg', 30, 0)
+ sleep(delay/4)
+ playsound(loc, 'sound/items/timer.ogg', 30, 0)
+ sleep(delay/4)
imp_in.gib()
- explosion(src,heavy,medium,light,light, flame_range = light)
+ explosion(src,heavy,medium,weak,weak, flame_range = weak)
qdel(src)
/obj/item/weapon/implant/explosive/macro
name = "macrobomb implant"
desc = "And boom goes the weasel. And everything else nearby."
icon_state = "explosive"
+ weak = 16
+ medium = 8
+ heavy = 4
+ delay = 70
/obj/item/weapon/implant/explosive/macro/activate(var/cause)
if(!cause || !imp_in) return 0
if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your macrobomb implant? This will cause you to explode and gib!", "Macrobomb Implant Confirmation", "Yes", "No") != "Yes")
return 0
+ for(var/obj/item/weapon/implant/explosive/macro/E in imp_in)
+ if(E != src)
+ qdel(E)
+ imp_in << "You activate your macrobomb implant."
+ imp_in.visible_message("[imp_in] starts beeping ominously!")
+ playsound(loc, 'sound/items/timer.ogg', 30, 0)
+ sleep(delay/4)
+ if(imp_in.stat)
+ imp_in.visible_message("[imp_in] doubles over in pain!")
+ imp_in.Weaken(7)
+ playsound(loc, 'sound/items/timer.ogg', 30, 0)
+ sleep(delay/4)
+ playsound(loc, 'sound/items/timer.ogg', 30, 0)
+ sleep(delay/4)
+ playsound(loc, 'sound/items/timer.ogg', 30, 0)
+ sleep(delay/4)
imp_in.gib()
- explosion(src,5,10,20,20, flame_range = 20)
+ explosion(src,heavy,medium,weak,weak, flame_range = weak)
qdel(src)
/obj/item/weapon/implant/chem
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index ff0a719e4bb..60b08e58e64 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -11,6 +11,7 @@
throw_range = 7
w_class = 3.0
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
+ burn_state = 0 //Burnable
var/mopping = 0
var/mopcount = 0
var/mopcap = 5
diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm
index 48809459247..14ddda46e57 100644
--- a/code/game/objects/items/weapons/paint.dm
+++ b/code/game/objects/items/weapons/paint.dm
@@ -10,6 +10,8 @@
item_color = "FFFFFF"
item_state = "paintcan"
w_class = 3.0
+ burn_state = 0 //Burnable
+ burntime = 5
var/paintleft = 10
/obj/item/weapon/paint/red
diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm
index 521f5ab64e7..535aca43cd0 100644
--- a/code/game/objects/items/weapons/scrolls.dm
+++ b/code/game/objects/items/weapons/scrolls.dm
@@ -9,6 +9,7 @@
throw_speed = 3
throw_range = 7
origin_tech = "bluespace=4"
+ burn_state = 0 //Burnable
/obj/item/weapon/teleportation_scroll/apprentice
name = "lesser scroll of teleportation"
@@ -57,7 +58,7 @@
if(!((user == loc || (in_range(src, user) && istype(src.loc, /turf)))))
return
- var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+ var/datum/effect/effect/system/smoke_spread/smoke = new
smoke.set_up(5, 0, user.loc)
smoke.attach(user)
smoke.start()
diff --git a/code/game/objects/items/weapons/signs.dm b/code/game/objects/items/weapons/signs.dm
index 15451d602a8..67467ce35c1 100644
--- a/code/game/objects/items/weapons/signs.dm
+++ b/code/game/objects/items/weapons/signs.dm
@@ -5,6 +5,7 @@
force = 5
w_class = 4.0
attack_verb = list("bashed","smacked")
+ burn_state = 0 //Burnable
var/label = ""
var/last_wave = 0
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index d8aed9fdd9d..3cf9da86528 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -18,6 +18,8 @@
slot_flags = SLOT_BACK //ERROOOOO
max_w_class = 3
max_combined_w_class = 21
+ burn_state = 0 //Burnable
+ burntime = 20
/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
playsound(src.loc, "rustle", 50, 1, -5)
@@ -34,6 +36,9 @@
icon_state = "holdingpack"
max_w_class = 5
max_combined_w_class = 35
+ burn_state = -1 // NotBurnable
+ var/pshoom = 'sound/items/PSHOOM.ogg'
+ var/alt_sound = 'sound/items/PSHOOM_2.ogg'
/obj/item/weapon/storage/backpack/holding/suicide_act(mob/user)
user.visible_message("[user] is jumping into [src]! It looks like \he's trying to commit suicide.")
@@ -50,6 +55,20 @@
return
return ..()
+/obj/item/weapon/storage/backpack/holding/content_can_dump(atom/dest_object, mob/user)
+ if(Adjacent(user))
+ if(get_dist(user, dest_object) < 8)
+ if(dest_object.storage_contents_dump_act(src, user))
+ if(alt_sound && prob(1))
+ playsound(src, alt_sound, 40, 1)
+ else
+ playsound(src, pshoom, 40, 1)
+ user.Beam(dest_object,icon_state="rped_upgrade",icon='icons/effects/effects.dmi',time=5)
+ return 1
+ user << "The [src.name] buzzes."
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ return 0
+
/obj/item/weapon/storage/backpack/holding/handle_item_insertion(obj/item/W, prevent_warning = 0, mob/user)
if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail)
var/safety = alert(user, "You feel this may not be the best idea.", "Put in [name]?", "Proceed", "Abort")
@@ -129,12 +148,14 @@
desc = "It's a special backpack made exclusively for Nanotrasen officers."
icon_state = "captainpack"
item_state = "captainpack"
+ burn_state = -1 //Not Burnable
/obj/item/weapon/storage/backpack/industrial
name = "industrial backpack"
desc = "It's a tough backpack for the daily grind of station life."
icon_state = "engiepack"
item_state = "engiepack"
+ burn_state = -1 //Not Burnable
/obj/item/weapon/storage/backpack/botany
name = "botany backpack"
@@ -159,6 +180,7 @@
desc = "A specially designed backpack. It's fire resistant and smells vaguely of plasma."
icon_state = "toxpack"
item_state = "toxpack"
+ burn_state = -1 //Not Burnable
/obj/item/weapon/storage/backpack/virology
name = "virology backpack"
@@ -175,6 +197,7 @@
name = "leather satchel"
desc = "It's a very fancy satchel made with fine leather."
icon_state = "satchel"
+ burn_state = -1 //Not Burnable
/obj/item/weapon/storage/backpack/satchel/withwallet/New()
..()
@@ -190,6 +213,7 @@
desc = "A tough satchel with extra pockets."
icon_state = "satchel-eng"
item_state = "engiepack"
+ burn_state = -1 //Not Burnable
/obj/item/weapon/storage/backpack/satchel_med
name = "medical satchel"
@@ -220,6 +244,7 @@
desc = "Useful for holding research materials."
icon_state = "satchel-tox"
item_state = "satchel-tox"
+ burn_state = -1 //Not Burnable
/obj/item/weapon/storage/backpack/satchel_hyd
name = "botanist satchel"
@@ -238,6 +263,7 @@
desc = "An exclusive satchel for Nanotrasen officers."
icon_state = "satchel-cap"
item_state = "captainpack"
+ burn_state = -1 //Not Burnable
/obj/item/weapon/storage/backpack/satchel_flat
name = "smuggler's satchel"
@@ -310,6 +336,7 @@
desc = "A large dufflebag for holding extra captainly goods."
icon_state = "duffle-captain"
item_state = "duffle-captain"
+ burn_state = -1 //Not Burnable
/obj/item/weapon/storage/backpack/dufflebag/med
name = "medical dufflebag"
@@ -324,10 +351,11 @@
item_state = "duffle-sec"
/obj/item/weapon/storage/backpack/dufflebag/engineering
- name = "engineering dufflebag"
+ name = "industrial dufflebag"
desc = "A large dufflebag for holding extra tools and supplies."
icon_state = "duffle-eng"
item_state = "duffle-eng"
+ burn_state = -1 //Not Burnable
/obj/item/weapon/storage/backpack/dufflebag/clown
name = "clown's dufflebag"
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 7519804b005..9790b77e206 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -103,6 +103,7 @@
max_w_class = 3
w_class = 1
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/weapon/grown)
+ burn_state = 0 //Burnable
////////
@@ -280,6 +281,7 @@
max_w_class = 3
w_class = 4 //Bigger than a book because physics
can_hold = list(/obj/item/weapon/book, /obj/item/weapon/storage/book, /obj/item/weapon/spellbook)
+ burn_state = 0 //Burnable
/*
* Trays - Agouri
@@ -349,3 +351,4 @@
w_class = 1
preposition = "in"
can_hold = list(/obj/item/weapon/reagent_containers/pill, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle)
+ burn_state = 0 //Burnable
diff --git a/code/game/objects/items/weapons/storage/book.dm b/code/game/objects/items/weapons/storage/book.dm
index 1efe547141c..dcb45f1fe5d 100644
--- a/code/game/objects/items/weapons/storage/book.dm
+++ b/code/game/objects/items/weapons/storage/book.dm
@@ -6,6 +6,7 @@
throw_speed = 2
throw_range = 5
w_class = 3.0
+ burn_state = 0 //Burnable
var/title = "book"
/obj/item/weapon/storage/book/attack_self(mob/user)
user << "The pages of [title] have been cut out!"
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 936f6e72425..d8ea59ab5f4 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -24,6 +24,7 @@
desc = "It's just an ordinary box."
icon_state = "box"
item_state = "syringe_kit"
+ burn_state = 0 //Burnable
var/foldable = /obj/item/stack/sheet/cardboard
diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm
index 93a6fdc2679..b37091113a6 100644
--- a/code/game/objects/items/weapons/storage/briefcase.dm
+++ b/code/game/objects/items/weapons/storage/briefcase.dm
@@ -11,6 +11,8 @@
max_w_class = 3
max_combined_w_class = 21
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+ burn_state = 0 //Burnable
+ burntime = 20
/obj/item/weapon/storage/briefcase/New()
..()
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index c7f35dc05a0..5fd3462135d 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -17,6 +17,7 @@
icon = 'icons/obj/food/containers.dmi'
icon_state = "donutbox6"
name = "donut box"
+ burn_state = 0 //Burnable
var/icon_type = "donut"
var/spawn_type = null
diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm
index 5f2e841eff0..a1b73157d55 100644
--- a/code/game/objects/items/weapons/storage/wallets.dm
+++ b/code/game/objects/items/weapons/storage/wallets.dm
@@ -4,6 +4,7 @@
storage_slots = 4
icon_state = "wallet"
w_class = 2
+ burn_state = 0 //Burnable
can_hold = list(
/obj/item/stack/spacecash,
/obj/item/weapon/card,
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index d634d9a832c..08808afdc04 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -309,7 +309,9 @@
pass_flags = PASSTABLE
/obj/effect/nanofrost_container/proc/Smoke()
- PoolOrNew(/obj/effect/effect/freezing_smoke, list(loc, 6, 1))
+ var/datum/effect/effect/system/smoke_spread/freezing/S = new
+ S.set_up(6, 0, loc, null, 1)
+ S.start()
var/obj/effect/decal/cleanable/flour/F = new /obj/effect/decal/cleanable/flour(src.loc)
F.color = "#B2FFFF"
F.name = "nanofrost residue"
@@ -317,33 +319,16 @@
playsound(src,'sound/effects/bamf.ogg',100,1)
qdel(src)
-/obj/effect/effect/freezing_smoke
+/obj/effect/effect/smoke/freezing
name = "nanofrost smoke"
- icon_state = "smoke"
opacity = 0
- anchored = 0.0
- mouse_opacity = 0
- icon = 'icons/effects/96x96.dmi'
- pixel_x = -32
- pixel_y = -32
color = "#B2FFFF"
- var/amount = 0
-/obj/effect/effect/freezing_smoke/New(loc, var/amt, var/blast)
- ..()
- spawn(100+rand(10,30))
- qdel(src)
- amount = amt
- if(amount)
- var/datum/effect/effect/system/freezing_smoke_spread/F = new /datum/effect/effect/system/freezing_smoke_spread
- F.set_up(amount, 0, src.loc)
- F.start()
- if(blast)
- for(var/turf/T in trange(2, src.loc))
- Chilled(T)
- return
+/datum/effect/effect/system/smoke_spread/freezing
+ smoke_type = /obj/effect/effect/smoke/freezing
+ var/blast = 0
-/obj/effect/effect/freezing_smoke/proc/Chilled(atom/A)
+/datum/effect/effect/system/smoke_spread/freezing/proc/Chilled(atom/A)
if(istype(A, /turf/simulated))
var/turf/simulated/T = A
if(T.air)
@@ -362,31 +347,20 @@
V.visible_message("[V] was frozen shut!")
for(var/mob/living/L in T)
L.ExtinguishMob()
+ for(var/obj/item/Item in T)
+ Item.extinguish()
return
-/datum/effect/effect/system/freezing_smoke_spread
+/datum/effect/effect/system/smoke_spread/freezing/set_up(n = 5, c = 0, loca, direct, blasting = 0)
+ ..()
+ blast = blasting
-/datum/effect/effect/system/freezing_smoke_spread/set_up(n = 6, c = 0, loca)
- number = n
- if(istype(loca, /turf/))
- location = loca
- else
- location = get_turf(loca)
+/datum/effect/effect/system/smoke_spread/freezing/start()
+ if(blast)
+ for(var/turf/T in trange(2, location))
+ Chilled(T)
+ ..()
-/datum/effect/effect/system/freezing_smoke_spread/start()
- var/i = 0
- for(i=0, iThe [src] warps in!")
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index a5494427e55..23be1ce7c31 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -242,6 +242,8 @@
hardness = 1
openSound = 'sound/effects/doorcreaky.ogg'
closeSound = 'sound/effects/doorcreaky.ogg'
+ burn_state = 0 //Burnable
+ burntime = 30
/obj/structure/mineral_door/wood/Dismantle(devastated = 0)
if(!devastated)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index af9c059a8f7..1682c22403b 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -13,6 +13,8 @@
icon_state = "bed"
can_buckle = 1
buckle_lying = 1
+ burn_state = 0 //Burnable
+ burntime = 30
/obj/structure/stool/bed/alien
name = "resting contraption"
@@ -59,6 +61,7 @@
icon = 'icons/obj/rollerbed.dmi'
icon_state = "down"
anchored = 0
+ burn_state = -1 //Not Burnable
/obj/structure/stool/bed/roller/post_buckle_mob(mob/living/M)
if(M == buckled_mob)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index 915f56b9ac0..1dea5a15dde 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -3,6 +3,7 @@
desc = "You sit in this. Either by will or force."
icon_state = "chair"
buckle_lying = 0 //you sit in a chair, not lay
+ burn_state = -1 //Not Burnable
/obj/structure/stool/bed/chair/New()
..()
@@ -73,6 +74,10 @@
// Chair types
+/obj/structure/stool/bed/chair/wood
+ burn_state = 0 //Burnable
+ burntime = 20
+
/obj/structure/stool/bed/chair/wood/normal
icon_state = "wooden_chair"
name = "wooden chair"
@@ -96,6 +101,8 @@
desc = "It looks comfy."
icon_state = "comfychair"
color = rgb(255,255,255)
+ burn_state = 0 //Burnable
+ burntime = 30
var/image/armrest = null
/obj/structure/stool/bed/chair/comfy/New()
diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm
index 5196a37fa9d..18288c5f670 100644
--- a/code/game/objects/structures/table_frames.dm
+++ b/code/game/objects/structures/table_frames.dm
@@ -75,6 +75,7 @@
icon_state = "wood_frame"
framestack = /obj/item/stack/sheet/mineral/wood
framestackamount = 2
+ burn_state = 0 //Burnable
/obj/structure/table_frame/wood/attackby(var/obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/wrench))
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index cf8b9476c2f..7258982885d 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -432,6 +432,8 @@
frame = /obj/structure/table_frame/wood
framestack = /obj/item/stack/sheet/mineral/wood
buildstack = /obj/item/stack/sheet/mineral/wood
+ burn_state = 0 //Burnable
+ burntime = 20
/obj/structure/table/wood/poker //No specialties, Just a mapping object.
name = "gambling table"
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index d62a69d769f..de1e9952612 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -229,6 +229,7 @@
//Yes, showers are super powerful as far as washing goes.
/obj/machinery/shower/proc/wash(atom/movable/O)
if(!on) return
+
if(ismob(O))
mobpresent += 1
check_heat(O)
@@ -284,9 +285,13 @@
if(H.shoes && washshoes)
if(H.shoes.clean_blood())
H.update_inv_shoes(0)
- if(H.wear_mask && washmask)
- if(H.wear_mask.clean_blood())
- H.update_inv_wear_mask(0)
+ if(H.wear_mask)
+ if(washmask)
+ if(H.wear_mask.clean_blood())
+ H.update_inv_wear_mask(0)
+ else
+ H.lip_style = null
+ H.update_body()
if(H.glasses && washglasses)
if(H.glasses.clean_blood())
H.update_inv_glasses(0)
@@ -303,6 +308,13 @@
else
O.clean_blood()
+ else
+ O.clean_blood()
+
+ if(istype(O,/obj/item))
+ var/obj/item/Item = O
+ Item.extinguish()
+
if(isturf(loc))
var/turf/tile = loc
loc.clean_blood()
@@ -310,7 +322,6 @@
if(is_cleanable(E))
qdel(E)
-
/obj/machinery/shower/process()
if(!on || !mobpresent) return
for(var/mob/living/carbon/C in loc)
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index d6ca52c46a3..14a287c31cf 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -1,38 +1,7 @@
-/client/var/adminhelptimerid = 0
+/proc/keywords_lookup(var/msg)
-/client/proc/giveadminhelpverb()
- src.verbs |= /client/verb/adminhelp
- adminhelptimerid = 0
-
-//This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
-var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as")
-
-
-
-/client/verb/adminhelp(msg as text)
- set category = "Admin"
- set name = "Adminhelp"
-
- if(say_disabled) //This is here to try to identify lag problems
- usr << "Speech is currently admin-disabled."
- return
-
- //handle muting and automuting
- if(prefs.muted & MUTE_ADMINHELP)
- src << "Error: Admin-PM: You cannot send adminhelps (Muted)."
- return
- if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))
- return
-
- //clean the input msg
- if(!msg) return
- msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
- if(!msg) return
- var/original_msg = msg
-
- //remove out adminhelp verb temporarily to prevent spamming of admins.
- src.verbs -= /client/verb/adminhelp
- adminhelptimerid = addtimer(src,"giveadminhelpverb",1200) //2 minute cooldown of admin helps
+ //This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
+ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as", "i")
//explode the input msg into a list
var/list/msglist = text2list(msg, " ")
@@ -83,15 +52,50 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
mobs_found += found
if(!ai_found && isAI(found))
ai_found = 1
- msg += "[original_word] (?) (FLW) "
+ msg += "[original_word](?|F) "
continue
msg += "[original_word] "
+ return msg
+
+
+/client/var/adminhelptimerid = 0
+
+/client/proc/giveadminhelpverb()
+ src.verbs |= /client/verb/adminhelp
+ adminhelptimerid = 0
+
+/client/verb/adminhelp(msg as text)
+ set category = "Admin"
+ set name = "Adminhelp"
+
+ if(say_disabled) //This is here to try to identify lag problems
+ usr << "Speech is currently admin-disabled."
+ return
+
+ //handle muting and automuting
+ if(prefs.muted & MUTE_ADMINHELP)
+ src << "Error: Admin-PM: You cannot send adminhelps (Muted)."
+ return
+ if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))
+ return
+
+ //clean the input msg
+ if(!msg) return
+ msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
+ if(!msg) return
+ var/original_msg = msg
+
+ //remove our adminhelp verb temporarily to prevent spamming of admins.
+ src.verbs -= /client/verb/adminhelp
+ adminhelptimerid = addtimer(src,"giveadminhelpverb",1200) //2 minute cooldown of admin helps
+
+ msg = keywords_lookup(msg)
if(!mob) return //this doesn't happen
var/ref_mob = "\ref[mob]"
var/ref_client = "\ref[src]"
- msg = "HELP: [key_name_admin(src)] (?) (PP) (VV) (SM) (FLW) (TP)[ai_found ? " (CL)" : ""] (REJT): [msg]"
+ msg = "HELP: [key_name(src)] (?) (PP) (VV) (SM) (FLW) (TP) (REJT): [msg]"
//send this msg to all admins
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 944677f2350..e79649e7dc4 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -32,6 +32,26 @@
cmd_admin_pm(targets[target],null)
feedback_add_details("admin_verb","APM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+/client/proc/cmd_ahelp_reply(whom)
+ if(prefs.muted & MUTE_ADMINHELP)
+ src << "Error: Admin-PM: You are unable to use admin PM-s (muted)."
+ return
+ var/client/C
+ if(istext(whom))
+ if(cmptext(copytext(whom,1,2),"@"))
+ whom = findStealthKey(whom)
+ C = directory[whom]
+ else if(istype(whom,/client))
+ C = whom
+ if(!C)
+ if(holder) src << "Error: Admin-PM: Client not found."
+ return
+ message_admins("[key_name_admin(src)] has started replying to [key_name(C, 0, 0)]'s admin help.")
+ var/msg = input(src,"Message:", "Private message to [key_name(C, 0, 0)]") as text|null
+ if (!msg)
+ message_admins("[key_name_admin(src)] has cancelled their reply to [key_name(C, 0, 0)]'s admin help.")
+ return
+ cmd_admin_pm(whom, msg)
//takes input from cmd_admin_pm_context, cmd_admin_pm_panel or /client/Topic and sends them a PM.
//Fetching a message if needed. src is the sender and C is the target client
@@ -71,14 +91,15 @@
if(!msg) return
msg = emoji_parse(msg)
+ var/keywordparsedmsg = keywords_lookup(msg)
if(C.holder)
if(holder) //both are admins
- C << "Admin PM from-[key_name(src, C, 1)]: [msg]"
- src << "Admin PM to-[key_name(C, src, 1)]: [msg]"
+ C << "Admin PM from-[key_name(src, C, 1)]: [keywordparsedmsg]"
+ src << "Admin PM to-[key_name(C, src, 1)]: [keywordparsedmsg]"
else //recipient is an admin but sender is not
- C << "Reply PM from-[key_name(src, C, 1)]: [msg]"
+ C << "Reply PM from-[key_name(src, C, 1)]: [keywordparsedmsg]"
src << "PM to-Admins: [msg]"
//play the recieving admin the adminhelp sound (if they have them enabled)
@@ -117,4 +138,4 @@
//we don't use message_admins here because the sender/receiver might get it too
for(var/client/X in admins)
if(X.key!=key && X.key!=C.key) //check client/X is an admin and isn't the sender or recipient
- X << "PM: [key_name(src, X, 0)]->[key_name(C, X, 0)]: \blue [msg]" //inform X
+ X << "PM: [key_name(src, X, 0)]->[key_name(C, X, 0)]: \blue [keywordparsedmsg]" //inform X
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 1e077bd66e9..ff1e0cf97a3 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -8,7 +8,7 @@
if(!msg) return
log_admin("[key_name(src)] : [msg]")
-
+ msg = keywords_lookup(msg)
if(check_rights(R_ADMIN,0))
msg = "ADMIN: [key_name(usr, 1)] (FLW): [msg]"
admins << msg
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index a7cc46fec17..f1024432765 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -31,6 +31,9 @@
//Admin PM
if(href_list["priv_msg"])
+ if (href_list["ahelp_reply"])
+ cmd_ahelp_reply(href_list["priv_msg"])
+ return
cmd_admin_pm(href_list["priv_msg"],null)
return
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index c655ee34d45..e410f6dde59 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -1,5 +1,6 @@
/obj/item/clothing
name = "clothing"
+ burn_state = 0 //Burnable
var/flash_protect = 0 //Malk: What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS
var/tint = 0 //Malk: Sets the item's level of visual impairment tint, normally set to the same as flash_protect
var/up = 0 // but seperated to allow items to protect but not impair vision, like space helmets
@@ -23,6 +24,7 @@
w_class = 1.0
throwforce = 0
slot_flags = SLOT_EARS
+ burn_state = -1 //Not Burnable
/obj/item/clothing/ears/earmuffs
name = "earmuffs"
@@ -32,7 +34,7 @@
flags = EARBANGPROTECT
strip_delay = 15
put_on_delay = 25
-
+ burn_state = 0 //Burnable
//Glasses
/obj/item/clothing/glasses
@@ -48,7 +50,7 @@
var/list/icon/current = list() //the current hud icons
strip_delay = 20
put_on_delay = 25
-
+ burn_state = -1 //Not Burnable
/*
SEE_SELF // can see self, no matter what
SEE_MOBS // can see all mobs, no matter what
@@ -180,6 +182,7 @@ BLIND // can't see anything
strip_delay = 50
put_on_delay = 50
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+ burn_state = -1 //Not Burnable
/obj/item/clothing/suit/space
name = "space suit"
@@ -201,6 +204,7 @@ BLIND // can't see anything
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
strip_delay = 80
put_on_delay = 80
+ burn_state = -1 //Not Burnable
//Under clothing
/obj/item/clothing/under
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 9d7bf51d33c..18f5c7937f4 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -6,6 +6,7 @@
siemens_coefficient = 0
permeability_coefficient = 0.05
item_color="yellow"
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/gloves/color/yellow/fake
desc = "These gloves will protect the wearer from electric shock. They don't feel like rubber..."
@@ -19,6 +20,7 @@
siemens_coefficient = 1 //Set to a default of 1, gets overridden in New()
permeability_coefficient = 0.05
item_color="yellow"
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/gloves/color/fyellow/New()
siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5)
@@ -33,7 +35,7 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
-
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/gloves/color/black/hos
item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way.
@@ -148,6 +150,7 @@
permeability_coefficient = 0.01
item_color="white"
transfer_prints = TRUE
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/gloves/color/latex/nitrile
name = "nitrile gloves"
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 317ae88ac81..257394e13ce 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -21,6 +21,7 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+ burn_state = -1 //Not Burnable
/obj/item/clothing/gloves/combat
name = "combat gloves"
@@ -33,4 +34,5 @@
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
- max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
\ No newline at end of file
+ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+ burn_state = -1 //Won't burn in fires
\ No newline at end of file
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 4ada082a0fa..7dad46544c3 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -58,6 +58,7 @@
desc = "A collectable welding helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this helmet is done so at the owner's own risk!"
icon_state = "welding"
item_state = "welding"
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/head/collectable/slime
name = "collectable slime hat"
@@ -110,9 +111,11 @@
desc = "Go Red! I mean Green! I mean Red! No Green!"
icon_state = "thunderdome"
item_state = "thunderdome"
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/head/collectable/swat
name = "collectable SWAT helmet"
desc = "That's not real blood. That's red paint." //Reference to the actual description
icon_state = "swat"
- item_state = "swat"
\ No newline at end of file
+ item_state = "swat"
+ burn_state = -1 //Won't burn in fires
\ No newline at end of file
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index cf491f337dd..16d33da43c8 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -9,6 +9,7 @@
armor = list(melee = 15, bullet = 5, laser = 20,energy = 10, bomb = 20, bio = 10, rad = 20)
flags_inv = 0
action_button_name = "Toggle Helmet Light"
+ burn_state = -1 //Won't burn in fires
attack_self(mob/user)
if(!isturf(user.loc))
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 8f5cc495877..945860157ea 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -11,6 +11,7 @@
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
strip_delay = 60
+ burn_state = -1 //Won't burn in fires
var/obj/machinery/camera/portable/helmetCam = null
var/spawnWithHelmetCam = 0
var/canAttachCam = 0
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index e7fc2072172..28f5f5c3b0e 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -57,13 +57,6 @@
flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
-/obj/item/clothing/head/that
- name = "sturdy top-hat"
- desc = "It's an amish looking armored top hat."
- icon_state = "tophat"
- item_state = "that"
- flags_inv = 0
-
/obj/item/clothing/head/cardborg
name = "cardborg helmet"
desc = "A helmet made out of a box."
@@ -215,6 +208,7 @@
throw_range = 5
w_class = 2.0
attack_verb = list("warned", "cautioned", "smashed")
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/head/santa
name = "santa hat"
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index fa58e31116a..080c4a50100 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -27,6 +27,7 @@
action_button_name = "Toggle Welding Helmet"
visor_flags = HEADCOVERSEYES | HEADCOVERSMOUTH
visor_flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/head/welding/attack_self()
toggle()
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index a3b54c55779..ae6dd7f7d6f 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -12,6 +12,7 @@
action_button_name = "Adjust Breath Mask"
ignore_maskadjust = 0
flags_cover = MASKCOVERSMOUTH
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/mask/breath/attack_self(var/mob/user)
adjustmask(user)
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index f1d415357bf..59566b96179 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -9,6 +9,7 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
+ burn_state = -1 //Won't burn in fires
// **** Welding gas mask ****
@@ -224,10 +225,11 @@
/obj/item/clothing/mask/gas/clown_hat
name = "clown wig and mask"
desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask."
- flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+ flags = MASKINTERNALS
icon_state = "clown"
item_state = "clown_hat"
flags_cover = MASKCOVERSEYES
+ burn_state = 0 //Burnable
/obj/item/clothing/mask/gas/clown_hat/attack_self(mob/user)
@@ -248,34 +250,38 @@
/obj/item/clothing/mask/gas/sexyclown
name = "sexy-clown wig and mask"
desc = "A feminine clown mask for the dabbling crossdressers or female entertainers."
- flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+ flags = MASKINTERNALS
icon_state = "sexyclown"
item_state = "sexyclown"
flags_cover = MASKCOVERSEYES
+ burn_state = 0 //Burnable
/obj/item/clothing/mask/gas/mime
name = "mime mask"
desc = "The traditional mime's mask. It has an eerie facial posture."
- flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+ flags = MASKINTERNALS
icon_state = "mime"
item_state = "mime"
flags_cover = MASKCOVERSEYES
+ burn_state = 0 //Burnable
/obj/item/clothing/mask/gas/monkeymask
name = "monkey mask"
desc = "A mask used when acting as a monkey."
- flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+ flags = MASKINTERNALS
icon_state = "monkeymask"
item_state = "monkeymask"
flags_cover = MASKCOVERSEYES
+ burn_state = 0 //Burnable
/obj/item/clothing/mask/gas/sexymime
name = "sexy mime mask"
desc = "A traditional female mime's mask."
- flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+ flags = MASKINTERNALS
icon_state = "sexymime"
item_state = "sexymime"
flags_cover = MASKCOVERSEYES
+ burn_state = 0 //Burnable
/obj/item/clothing/mask/gas/death_commando
name = "Death Commando Mask"
@@ -286,10 +292,12 @@
name = "cyborg visor"
desc = "Beep boop."
icon_state = "death"
+ burn_state = 0 //Burnable
/obj/item/clothing/mask/gas/owl_mask
name = "owl mask"
desc = "Twoooo!"
- flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
icon_state = "owl"
- flags_cover = MASKCOVERSEYES
\ No newline at end of file
+ flags = MASKINTERNALS
+ flags_cover = MASKCOVERSEYES
+ burn_state = 0 //Burnable
diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm
index f1da928afff..f574c6a88cc 100644
--- a/code/modules/clothing/shoes/bananashoes.dm
+++ b/code/modules/clothing/shoes/bananashoes.dm
@@ -5,57 +5,63 @@
desc = "Lost prototype of advanced clown tech. Powered by bananium, these shoes leave a trail of chaos in their wake."
icon_state = "clown_prototype_off"
var/on = 0
- var/bananium = 0
+ var/datum/mineral_container/bananium
action_button_name = "Toggle Shoes"
+/obj/item/clothing/shoes/clown_shoes/banana_shoes/New()
+ ..()
+ bananium = new/datum/mineral_container(src,/obj/item/stack/sheet/mineral/bananium,200000)
+
/obj/item/clothing/shoes/clown_shoes/banana_shoes/step_action()
if(on)
- if(footstep > 1)//honks when activated
+ if(footstep > 1)//honks when its on
playsound(src, "sound/items/bikehorn.ogg", 75, 1)
footstep = 0
else
footstep++
new/obj/item/weapon/grown/bananapeel/specialpeel(get_step(src,turn(usr.dir, 180)), 5) //honk
- bananium -= 100
- if(bananium < 100)
+ bananium.use_amount(100)
+ if(bananium.amount < 100)
on = !on
update_icon()
- usr << "You ran out of bananium!"
+ loc << "You ran out of bananium!"
else
..()
/obj/item/clothing/shoes/clown_shoes/banana_shoes/attack_self(mob/user)
- if(bananium > 0)
- var/sheet_amount = round(bananium / 2000)
- if(sheet_amount > 0)
- var/obj/item/stack/sheet/mineral/bananium/M = new/obj/item/stack/sheet/mineral/bananium(get_turf(loc))
- M.amount = sheet_amount
- bananium -= sheet_amount * 2000
- user << "You retrieve [sheet_amount] sheets of bananium."
+ var/sheet_amount = bananium.retrieve_all()
+ if(sheet_amount)
+ user << "You retrieve [sheet_amount] sheets of bananium from the prototype shoes."
+ else
+ user << "You cannot retrieve any bananium from the prototype shoes."
/obj/item/clothing/shoes/clown_shoes/banana_shoes/attackby(obj/item/O, mob/user, params)
- if(istype(O,/obj/item/stack/sheet/mineral/bananium))
- var/obj/item/stack/sheet/mineral/bananium/M = O
- bananium += 2000 * M.amount
- user << "You insert [M.amount] bananium sheets into the prototype shoes."
- M.use(M.amount)
+ var/sheet_amount = bananium.insert_sheet(O)
+ if(sheet_amount > 0)
+ user << "You insert [sheet_amount] bananium sheets into the prototype shoes."
+ var/obj/item/stack/sheet/S = O
+ S.use(sheet_amount)
+ else if(sheet_amount < 0)
+ user << "You can only fit bananium sheets into these shoes!"
+ else
+ user << "You cannot insert more bananium into the prototype shoes."
/obj/item/clothing/shoes/clown_shoes/banana_shoes/examine(mob/user)
..()
- user << "The shoes are [on ? "enabled" : "disabled"]. There is [bananium] bananium left."
+ user << "The shoes are [on ? "enabled" : "disabled"]. There is [bananium.amount] bananium left."
/obj/item/clothing/shoes/clown_shoes/banana_shoes/ui_action_click()
- if(bananium > 0)
+ if(bananium.amount)
on = !on
update_icon()
- usr << "You [on ? "activate" : "deactivate"] the prototype shoes."
+ loc << "You [on ? "activate" : "deactivate"] the prototype shoes."
else
- usr << "You need bananium to turn the prototype shoes on!"
+ loc << "You need bananium to turn the prototype shoes on!"
/obj/item/clothing/shoes/clown_shoes/banana_shoes/update_icon()
if(on)
icon_state = "clown_prototype_on"
else
icon_state = "clown_prototype_off"
- usr.update_inv_shoes()
\ No newline at end of file
+ usr.update_inv_shoes()
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index 8d742f983db..843f69e25c5 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -8,7 +8,7 @@
action_button_name = "Toggle Magboots"
strip_delay = 70
put_on_delay = 70
-
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/shoes/magboots/verb/toggle()
set name = "Toggle Magboots"
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 1a0a0a4f98c..0bebe7a3ee0 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -15,6 +15,7 @@
permeability_coefficient = 0.05
flags = NOSLIP
origin_tech = "syndicate=3"
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/shoes/sneakers/mime
name = "mime shoes"
@@ -35,6 +36,7 @@
permeability_coefficient = 0.01
flags = NOSLIP
armor = list(melee = 40, bullet = 30, laser = 25, energy = 25, bomb = 50, bio = 30, rad = 30)
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/shoes/sandal
desc = "A pair of rather plain, wooden sandals."
@@ -58,6 +60,7 @@
slowdown = SHOES_SLOWDOWN+1
strip_delay = 50
put_on_delay = 50
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/shoes/clown_shoes
desc = "The prankster's standard-issue clowning shoes. Damn, they're huge!"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 817244af5c5..d3b65c48e3a 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -7,6 +7,7 @@
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
strip_delay = 60
put_on_delay = 40
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/suit/armor/vest
name = "armor"
@@ -45,6 +46,7 @@
cold_protection = CHEST|GROIN|ARMS|HANDS
heat_protection = CHEST|GROIN|ARMS|HANDS
strip_delay = 70
+ burn_state = 0 //Burnable
/obj/item/clothing/suit/armor/vest/warden/alt
name = "warden's armored jacket"
@@ -112,7 +114,7 @@
desc = "An armored vest with a detective's badge on it."
icon_state = "detective-armor"
allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
-
+ burn_state = 0 //Burnable
//Reactive armor
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 1cf684ab76d..093b14d0a1f 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -8,6 +8,7 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
unacidable = 1
+ burn_state = -1 //Not Burnable
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
/obj/item/clothing/suit/bio_suit
@@ -27,6 +28,7 @@
strip_delay = 70
put_on_delay = 70
unacidable = 1
+ burn_state = -1 //Not Burnable
//Standard biosuit, orange stripe
/obj/item/clothing/head/bio_hood/general
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 7bad9b13400..1ae33b0de80 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -100,6 +100,7 @@
item_state = "hazard"
blood_overlay_type = "armor"
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/device/t_scanner,)
+ burn_state = -1 //Won't burn in fires
//Lawyer
/obj/item/clothing/suit/toggle/lawyer
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 08d0b4047d8..015e70defc7 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -16,6 +16,7 @@
blood_overlay_type = "armor"
body_parts_covered = CHEST
allowed = list (/obj/item/weapon/gun/energy/laser/bluetag)
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/suit/redtag
name = "red laser tag armor"
@@ -25,6 +26,7 @@
blood_overlay_type = "armor"
body_parts_covered = CHEST
allowed = list (/obj/item/weapon/gun/energy/laser/redtag)
+ burn_state = -1 //Won't burn in fires
/*
* Costume
@@ -88,7 +90,7 @@
w_class = 3
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/toy)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/suit/hastur
name = "\improper Hastur's robe"
@@ -236,7 +238,8 @@
desc = "Pompadour not included."
icon_state = "leatherjacket"
item_state = "hostrench"
-
+ burn_state = -1 //Not Burnable
+ max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
/obj/item/clothing/suit/jacket/leather/overcoat
name = "leather overcoat"
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index a4d69048234..2236cf7f230 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -28,6 +28,7 @@
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
strip_delay = 60
put_on_delay = 60
+ burn_state = -1 //Not Burnable
/obj/item/clothing/suit/fire/firefighter
icon_state = "firesuit"
@@ -65,7 +66,7 @@
strip_delay = 70
put_on_delay = 70
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
-
+ burn_state = -1 //Not Burnable
/obj/item/clothing/suit/bomb_suit
name = "bomb suit"
@@ -86,7 +87,7 @@
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
strip_delay = 70
put_on_delay = 70
-
+ burn_state = -1 //Not Burnable
/obj/item/clothing/head/bomb_hood/security
@@ -111,7 +112,7 @@
strip_delay = 60
put_on_delay = 60
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
-
+ burn_state = -1 //Not Burnable
/obj/item/clothing/suit/radiation
name = "radiation suit"
@@ -129,3 +130,4 @@
strip_delay = 60
put_on_delay = 60
flags_inv = HIDEJUMPSUIT
+ burn_state = -1 //Not Burnable
\ No newline at end of file
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index dd22a1e9f5c..299daf63152 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -8,6 +8,7 @@
strip_delay = 50
put_on_delay = 50
unacidable = 1
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/head/wizard/red
name = "red wizard hat"
@@ -63,7 +64,7 @@
strip_delay = 50
put_on_delay = 50
unacidable = 1
-
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/suit/wizrobe/red
name = "red wizard robe"
@@ -117,6 +118,7 @@
permeability_coefficient = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
unacidable = 0
+ burn_state = 0 //Burnable
/obj/item/clothing/head/wizard/marisa/fake
name = "witch hat"
@@ -126,6 +128,7 @@
permeability_coefficient = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
unacidable = 0
+ burn_state = 0 //Burnable
/obj/item/clothing/suit/wizrobe/marisa/fake
name = "witch robe"
@@ -136,3 +139,4 @@
permeability_coefficient = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
unacidable = 0
+ burn_state = 0 //Burnable
\ No newline at end of file
diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm
index 20acefb09d6..f550d51edd5 100644
--- a/code/modules/clothing/under/chameleon.dm
+++ b/code/modules/clothing/under/chameleon.dm
@@ -9,6 +9,7 @@
origin_tech = "syndicate=3"
var/list/clothing_choices = list()
var/malfunctioning = 0
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/under/chameleon/New()
..()
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 84355443233..c5bc98a2cc1 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -16,6 +16,7 @@
icon_state = "black"
item_state = "bl_suit"
item_color = "black"
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/under/color/grey
name = "grey jumpsuit"
diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm
index bdd52e6ba23..57709b5bdfe 100644
--- a/code/modules/clothing/under/jobs/engineering.dm
+++ b/code/modules/clothing/under/jobs/engineering.dm
@@ -6,6 +6,7 @@
item_state = "gy_suit"
item_color = "chief"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/under/rank/atmospheric_technician
desc = "It's a jumpsuit worn by atmospheric technicians."
@@ -13,6 +14,7 @@
icon_state = "atmos"
item_state = "atmos_suit"
item_color = "atmos"
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/under/rank/engineer
desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 42dae95f077..6d19ef1244f 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -37,6 +37,7 @@
item_state = "armor"
can_adjust = 0
strip_delay = 100
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/under/waiter
name = "waiter's outfit"
@@ -115,6 +116,7 @@
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
can_adjust = 0
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/under/acj
name = "administrative cybernetic jumpsuit"
@@ -131,6 +133,7 @@
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
can_adjust = 0
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/under/owl
name = "owl uniform"
@@ -338,6 +341,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = NO_FEMALE_UNIFORM
can_adjust = 0
+ burn_state = -1 //Won't burn in fires
/obj/item/clothing/under/sundress
name = "sundress"
diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm
index 1dda5f2ebd2..e828b3fe049 100644
--- a/code/modules/clothing/under/ties.dm
+++ b/code/modules/clothing/under/ties.dm
@@ -84,6 +84,7 @@
desc = "A bronze medal."
icon_state = "bronze"
item_color = "bronze"
+ burn_state = -1 //Won't burn in fires
//Pinning medals on people
/obj/item/clothing/tie/medal/attack(mob/living/carbon/human/M, mob/living/user)
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index 7703be7fc73..6a9fcf140e5 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -33,7 +33,7 @@
R.my_atom = vent
R.add_reagent(pick(gunk), 50)
- var/datum/effect/effect/system/chem_smoke_spread/smoke = new
+ var/datum/effect/effect/system/smoke_spread/chem/smoke = new
smoke.set_up(R, rand(1, 2), 0, vent, 0, silent = 1)
playsound(vent.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start()
diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm
index c057de5b96e..e38777f8ee7 100644
--- a/code/modules/events/wizard/curseditems.dm
+++ b/code/modules/events/wizard/curseditems.dm
@@ -43,6 +43,6 @@
I.name = "cursed " + I.name
for(var/mob/living/carbon/human/H in living_mob_list)
- var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+ var/datum/effect/effect/system/smoke_spread/smoke = new
smoke.set_up(max(1,1), 0, H.loc)
smoke.start()
\ No newline at end of file
diff --git a/code/modules/events/wizard/imposter.dm b/code/modules/events/wizard/imposter.dm
index 5d3567a9d47..cda6dc2d41f 100644
--- a/code/modules/events/wizard/imposter.dm
+++ b/code/modules/events/wizard/imposter.dm
@@ -14,7 +14,7 @@
if(!candidates) return //Sad Trombone
var/client/C = pick(candidates)
- PoolOrNew(/obj/effect/effect/harmless_smoke, W.loc)
+ PoolOrNew(/obj/effect/effect/smoke, W.loc)
var/mob/living/carbon/human/I = new /mob/living/carbon/human(W.loc)
I.real_name = W.real_name
diff --git a/code/modules/events/wizard/shuffle.dm b/code/modules/events/wizard/shuffle.dm
index 4315f3a4261..df271b96ef1 100644
--- a/code/modules/events/wizard/shuffle.dm
+++ b/code/modules/events/wizard/shuffle.dm
@@ -28,7 +28,7 @@
moblocs.len -= 1
for(var/mob/living/carbon/human/H in living_mob_list)
- var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+ var/datum/effect/effect/system/smoke_spread/smoke = new
smoke.set_up(max(1,1), 0, H.loc)
smoke.start()
@@ -60,7 +60,7 @@
mobnames.len -= 1
for(var/mob/living/carbon/human/H in living_mob_list)
- var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+ var/datum/effect/effect/system/smoke_spread/smoke = new
smoke.set_up(max(1,1), 0, H.loc)
smoke.start()
@@ -92,6 +92,6 @@
mobs -= mobs[mobs.len]
for(var/mob/living/carbon/human/H in living_mob_list)
- var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+ var/datum/effect/effect/system/smoke_spread/smoke = new
smoke.set_up(max(1,1), 0, H.loc)
smoke.start()
diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm
index 1f07766a523..e510ce8ac5e 100644
--- a/code/modules/food&drinks/drinks/drinks.dm
+++ b/code/modules/food&drinks/drinks/drinks.dm
@@ -10,6 +10,7 @@
var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
possible_transfer_amounts = list(5,10,25)
volume = 50
+ burn_state = -1
/obj/item/weapon/reagent_containers/food/drinks/New()
..()
@@ -34,24 +35,19 @@
if(M == user)
M << "You swallow a gulp of [src]."
- if(reagents.total_volume)
- reagents.reaction(M, INGEST)
- spawn(5)
- reagents.trans_to(M, gulp_size)
+ else
- playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
- return 1
-
- user.visible_message("[user] attempts to feed [src] to [M].", "You attempt to feed [src] to [M].")
- if(!do_mob(user, M)) return
- if(!reagents.total_volume) return // The drink might be empty after the delay, such as by spam-feeding
- user.visible_message("[user] feeds [src] to [M].", "You feed [src] to [M].")
- add_logs(user, M, "fed", object="[reagentlist(src)]")
- if(reagents.total_volume)
- reagents.reaction(M, INGEST)
- spawn(5)
- reagents.trans_to(M, gulp_size)
+ user.visible_message("[user] attempts to feed [src] to [M].", "You attempt to feed [src] to [M].")
+ if(!do_mob(user, M))
+ return
+ if(!reagents || !reagents.total_volume)
+ return // The drink might be empty after the delay, such as by spam-feeding
+ user.visible_message("[user] feeds [src] to [M].", "You feed [src] to [M].")
+ add_logs(user, M, "fed", object="[reagentlist(src)]")
+ var/fraction = min(gulp_size/reagents.total_volume, 1)
+ reagents.reaction(M, INGEST, fraction)
+ reagents.trans_to(M, gulp_size)
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
return 1
diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
index 911362474c1..d145ef39fb3 100644
--- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
@@ -6,6 +6,20 @@
icon_state = "glass_empty"
amount_per_transfer_from_this = 10
volume = 50
+ burn_state = 0 //Burnable
+ burntime = 5
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fire_act()
+ if(!reagents.total_volume)
+ return
+ ..()
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/burn()
+ reagents.total_volume = 0 //Burns away all the alcohol :(
+ reagents.reagent_list.Cut()
+ on_reagent_change()
+ extinguish()
+ return
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/on_reagent_change()
overlays.Cut()
diff --git a/code/modules/food&drinks/food.dm b/code/modules/food&drinks/food.dm
index 20f54c684eb..5a7dbde5102 100644
--- a/code/modules/food&drinks/food.dm
+++ b/code/modules/food&drinks/food.dm
@@ -4,6 +4,7 @@
/obj/item/weapon/reagent_containers/food
possible_transfer_amounts = null
volume = 50 //Sets the default container amount for all food items.
+ burn_state = 0 //Burnable
/obj/item/weapon/reagent_containers/food/New()
..()
diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/food&drinks/food/condiment.dm
index bff39b0e262..a20b7e078cd 100644
--- a/code/modules/food&drinks/food/condiment.dm
+++ b/code/modules/food&drinks/food/condiment.dm
@@ -30,9 +30,8 @@
return
/obj/item/weapon/reagent_containers/food/condiment/attack(mob/M as mob, mob/user as mob, def_zone)
- var/datum/reagents/R = src.reagents
- if(!R || !R.total_volume)
+ if(!reagents || !reagents.total_volume)
user << "None of [src] left, oh no!"
return 0
@@ -41,28 +40,20 @@
if(M == user)
M << "You swallow some of contents of \the [src]."
- if(reagents.total_volume)
- reagents.reaction(M, INGEST)
- spawn(5)
- reagents.trans_to(M, 10)
- playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
- return 1
-
else
user.visible_message("[user] attempts to feed [M] from [src].")
- if(!do_mob(user, M)) return
+ if(!do_mob(user, M))
+ return
+ if(!reagents || !reagents.total_volume)
+ return // The condiment might be empty after the delay.
user.visible_message("[user] feeds [M] from [src].")
-
add_logs(user, M, "fed", object="[reagentlist(src)]")
- if(reagents.total_volume)
- reagents.reaction(M, INGEST)
- spawn(5)
- reagents.trans_to(M, 10)
-
- playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
- return 1
- return 0
+ var/fraction = min(10/reagents.total_volume, 1)
+ reagents.reaction(M, INGEST, fraction)
+ reagents.trans_to(M, 10)
+ playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
+ return 1
/obj/item/weapon/reagent_containers/food/condiment/afterattack(obj/target, mob/user , proximity)
if(!proximity) return
diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm
index 919e6e0a62b..7f8d06dd703 100644
--- a/code/modules/food&drinks/food/snacks.dm
+++ b/code/modules/food&drinks/food/snacks.dm
@@ -105,14 +105,11 @@
M.satiety -= junkiness
playsound(M.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
if(reagents.total_volume)
- reagents.reaction(M, INGEST)
- spawn(5)
- if(reagents.total_volume > bitesize) //pretty sure this is unnecessary
- reagents.trans_to(M, bitesize)
- else
- reagents.trans_to(M, reagents.total_volume)
- bitecount++
- On_Consume()
+ var/fraction = min(bitesize/reagents.total_volume, 1)
+ reagents.reaction(M, INGEST, fraction)
+ reagents.trans_to(M, bitesize)
+ bitecount++
+ On_Consume()
return 1
return 0
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index ba32bb2c6ff..bec34b1c197 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -169,6 +169,7 @@
dat += "Shoulder holster: Make ([400/efficiency])
"
dat += "Leather Satchel: Make ([400/efficiency])
"
dat += "Leather Jacket: Make ([500/efficiency])
"
+ dat += "Leather Overcoat: Make ([1000/efficiency])
"
dat += ""
else
dat += "No container inside, please insert container.
"
@@ -301,6 +302,9 @@
if("jacket")
if (check_cost(500/efficiency)) return 0
else new/obj/item/clothing/suit/jacket/leather(src.loc)
+ if("overcoat")
+ if (check_cost(1000/efficiency)) return 0
+ else new/obj/item/clothing/suit/jacket/leather/overcoat(src.loc)
//if("monkey")
// if (check_cost(500)) return 0
// else new/mob/living/carbon/monkey(src.loc)
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 38c9be4e471..8fe33dc7e58 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -20,6 +20,7 @@
icon = 'icons/obj/hydroponics/harvest.dmi'
potency = -1
dried_type = -1 //bit different. saves us from having to define each stupid grown's dried_type as itself. If you don't want a plant to be driable (watermelons) set this to null in the time definition.
+ burn_state = 0 //Burnable
/obj/item/weapon/reagent_containers/food/snacks/grown/New(newloc, new_potency = 50)
..()
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index 07ee7c17a2e..f0ca0943691 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -5,6 +5,7 @@
/obj/item/weapon/grown // Grown weapons
name = "grown_weapon"
icon = 'icons/obj/hydroponics/harvest.dmi'
+ burn_state = 0 //Burnable
var/seed = null
var/plantname = ""
var/product //a type path
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 0e491e575bf..662f76cb686 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -7,6 +7,7 @@
icon = 'icons/obj/hydroponics/seeds.dmi'
icon_state = "seed" //Unknown plant seed - these shouldn't exist in-game.
w_class = 1 //Pocketable.
+ burn_state = 0 //Burnable
var/plantname = "Plants" //Name of plant when planted.
var/product //A type path. The thing that is created when the plant is harvested.
var/species = "" //Used to update icons. Should match the name in the sprites.
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index c3e1af939be..96dc3f1b9a1 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -17,6 +17,8 @@
anchored = 0
density = 1
opacity = 0
+ burn_state = 0 //Burnable
+ burntime = 30
var/state = 0
var/list/allowed_books = list(/obj/item/weapon/book, /obj/item/weapon/spellbook, /obj/item/weapon/storage/book) //Things allowed in the bookcase
@@ -165,6 +167,7 @@
throw_range = 5
w_class = 3 //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
attack_verb = list("bashed", "whacked", "educated")
+ burn_state = 0 //Burnable
var/dat //Actual page content
var/due_date = 0 //Game time in 1/10th seconds
var/author //Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 3ba4b0cdea6..80fb5aa07b9 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -9,6 +9,26 @@
/**********************Miner Lockers**************************/
+/obj/structure/closet/wardrobe/miner
+ name = "mining wardrobe"
+ icon_door = "mixed"
+
+/obj/structure/closet/wardrobe/miner/New()
+ ..()
+ contents = list()
+ new /obj/item/weapon/storage/backpack/dufflebag/engineering(src)
+ new /obj/item/weapon/storage/backpack/industrial(src)
+ new /obj/item/weapon/storage/backpack/satchel_eng(src)
+ new /obj/item/clothing/under/rank/miner(src)
+ new /obj/item/clothing/under/rank/miner(src)
+ new /obj/item/clothing/under/rank/miner(src)
+ new /obj/item/clothing/shoes/sneakers/black(src)
+ new /obj/item/clothing/shoes/sneakers/black(src)
+ new /obj/item/clothing/shoes/sneakers/black(src)
+ new /obj/item/clothing/gloves/fingerless(src)
+ new /obj/item/clothing/gloves/fingerless(src)
+ new /obj/item/clothing/gloves/fingerless(src)
+
/obj/structure/closet/secure_closet/miner
name = "miner's equipment"
icon_state = "mining"
@@ -16,14 +36,7 @@
/obj/structure/closet/secure_closet/miner/New()
..()
- if(prob(50))
- new /obj/item/weapon/storage/backpack/industrial(src)
- else
- new /obj/item/weapon/storage/backpack/satchel_eng(src)
new /obj/item/device/radio/headset/headset_cargo(src)
- new /obj/item/clothing/under/rank/miner(src)
- new /obj/item/clothing/gloves/fingerless(src)
- new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/device/mining_scanner(src)
new /obj/item/weapon/storage/bag/ore(src)
new /obj/item/weapon/shovel(src)
diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm
index e9befa30d43..a8eefeb5bfc 100644
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -8,6 +8,8 @@
force = 10.0
throwforce = 0
w_class = 4.0
+ burn_state = 0 //Burnable
+ burntime = 20
/obj/item/weapon/moneybag/attack_hand(user as mob)
var/amt_gold = 0
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 02b856d2356..558604dad94 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -146,3 +146,6 @@
/mob/living/carbon/alien/humanoid/check_ear_prot()
return 1
+
+/mob/living/carbon/alien/carbon/alien/humanoid/get_permeability_protection()
+ return 0.8
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index ca9468d1986..b99a78d7e9e 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -116,17 +116,17 @@
gib()
return
else
+ shred_clothing(1,150)
var/atom/target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src)))
throw_at(target, 200, 4)
- //return
-// var/atom/target = get_edge_target_turf(user, get_dir(src, get_step_away(user, src)))
- //user.throw_at(target, 200, 4)
if (2.0)
b_loss += 60
f_loss += 60
+ shred_clothing(1,50)
+
if (prob(getarmor(null, "bomb")))
b_loss = b_loss/1.5
f_loss = f_loss/1.5
@@ -140,6 +140,8 @@
b_loss += 30
if (prob(getarmor(null, "bomb")))
b_loss = b_loss/2
+ else
+ shred_clothing(1,10)
if (!istype(ears, /obj/item/clothing/ears/earmuffs))
adjustEarDamage(15,60)
if (prob(50))
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index b6cb6f5181b..df2c627615c 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -10,9 +10,10 @@
total_brute += O.brute_dam
total_burn += O.burn_dam
health = maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute
- //TODO: fix husking
if( ((maxHealth - total_burn) < config.health_threshold_dead) && stat == DEAD )
ChangeToHusk()
+ if(bodytemperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST)
+ shred_clothing()
med_hud_set_health()
med_hud_set_status()
return
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index b46faf97501..c51953a96ec 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -239,6 +239,9 @@ emp_act
/mob/living/carbon/human/acid_act(var/acidpwr, var/toxpwr, var/acid_volume)
var/list/damaged = list()
var/list/inventory_items_to_kill = list()
+ var/acidity = min(acidpwr*acid_volume/200, toxpwr)
+ var/acid_volume_left = acid_volume
+ var/acid_decay = 100/acidpwr // how much volume we lose per item we try to melt. 5 for fluoro, 10 for sulphuric
//HEAD//
var/obj/item/clothing/head_clothes = null
@@ -250,7 +253,8 @@ emp_act
head_clothes = head
if(head_clothes)
if(!head_clothes.unacidable)
- head_clothes.acid_act(acidpwr)
+ head_clothes.acid_act(acidpwr, acid_volume_left)
+ acid_volume_left = max(acid_volume_left - acid_decay, 0) //We remove some of the acid volume.
update_inv_glasses()
update_inv_wear_mask()
update_inv_head()
@@ -271,7 +275,8 @@ emp_act
chest_clothes = wear_suit
if(chest_clothes)
if(!chest_clothes.unacidable)
- chest_clothes.acid_act(acidpwr)
+ chest_clothes.acid_act(acidpwr, acid_volume_left)
+ acid_volume_left = max(acid_volume_left - acid_decay, 0)
update_inv_w_uniform()
update_inv_wear_suit()
else
@@ -300,7 +305,8 @@ emp_act
arm_clothes = wear_suit
if(arm_clothes)
if(!arm_clothes.unacidable)
- arm_clothes.acid_act(acidpwr)
+ arm_clothes.acid_act(acidpwr, acid_volume_left)
+ acid_volume_left = max(acid_volume_left - acid_decay, 0)
update_inv_gloves()
update_inv_w_uniform()
update_inv_wear_suit()
@@ -325,7 +331,8 @@ emp_act
leg_clothes = wear_suit
if(leg_clothes)
if(!leg_clothes.unacidable)
- leg_clothes.acid_act(acidpwr)
+ leg_clothes.acid_act(acidpwr, acid_volume_left)
+ acid_volume_left = max(acid_volume_left - acid_decay, 0)
update_inv_shoes()
update_inv_w_uniform()
update_inv_wear_suit()
@@ -342,11 +349,11 @@ emp_act
//DAMAGE//
for(var/obj/item/organ/limb/affecting in damaged)
- affecting.take_damage(2*toxpwr, toxpwr)
+ affecting.take_damage(acidity, 2*acidity)
if(affecting.name == "head")
- affecting.take_damage(2*toxpwr, toxpwr)
- if(prob(2*acidpwr)) //Applies disfigurement
+ if(prob(min(acidpwr*acid_volume/10, 90))) //Applies disfigurement
+ affecting.take_damage(acidity, 2*acidity)
emote("scream")
facial_hair_style = "Shaved"
hair_style = "Bald"
@@ -367,7 +374,8 @@ emp_act
inventory_items_to_kill += l_hand
for(var/obj/item/I in inventory_items_to_kill)
- I.acid_act(acidpwr)
+ I.acid_act(acidpwr, acid_volume_left)
+ acid_volume_left = max(acid_volume_left - acid_decay, 0)
/mob/living/carbon/human/grabbedby(mob/living/user)
if(w_uniform)
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index 8d08b29ecb2..e163fb158e0 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -139,10 +139,30 @@
/mob/living/carbon/human/can_track(mob/living/user)
if(wear_id && istype(wear_id.GetID(), /obj/item/weapon/card/id/syndicate))
- return 0
+ return 0
if(istype(head, /obj/item/clothing/head))
var/obj/item/clothing/head/hat = head
if(hat.blockTracking)
return 0
-
+
return ..()
+
+/mob/living/carbon/human/get_permeability_protection()
+ var/list/prot = list("hands"=0, "chest"=0, "groin"=0, "legs"=0, "feet"=0, "arms"=0, "head"=0)
+ for(var/obj/item/I in get_equipped_items())
+ if(I.body_parts_covered & HANDS)
+ prot["hands"] = max(1 - I.permeability_coefficient, prot["hands"])
+ if(I.body_parts_covered & CHEST)
+ prot["chest"] = max(1 - I.permeability_coefficient, prot["chest"])
+ if(I.body_parts_covered & GROIN)
+ prot["groin"] = max(1 - I.permeability_coefficient, prot["groin"])
+ if(I.body_parts_covered & LEGS)
+ prot["legs"] = max(1 - I.permeability_coefficient, prot["legs"])
+ if(I.body_parts_covered & FEET)
+ prot["feet"] = max(1 - I.permeability_coefficient, prot["feet"])
+ if(I.body_parts_covered & ARMS)
+ prot["arms"] = max(1 - I.permeability_coefficient, prot["arms"])
+ if(I.body_parts_covered & HEAD)
+ prot["head"] = max(1 - I.permeability_coefficient, prot["head"])
+ var/protection = (prot["head"] + prot["arms"] + prot["feet"] + prot["legs"] + prot["groin"] + prot["chest"] + prot["hands"])/7
+ return protection
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 1a4cd41351c..a4c1a29a2aa 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -390,3 +390,83 @@
src << "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!"
return
+//Cycles through all clothing slots and tests them for destruction
+/mob/living/carbon/human/proc/shred_clothing(var/bomb,var/shock)
+ var/covered_parts //The body parts that are protected by exterior clothing/armor
+ var/head_absorbed = 0 //How much of the shock the headgear absorbs when it is shredded. -1=it survives
+ var/suit_absorbed = 0 //How much of the shock the exosuit absorbs when it is shredded. -1=it survives
+
+ //Backpacks can never be protected but are annoying as fuck to lose, so they get a lower chance to be shredded
+ if(back)
+ back.shred(bomb,shock-30,src)
+
+ if(head)
+ covered_parts |= head.flags_inv
+ head_absorbed = head.shred(bomb,shock,src)
+ if(wear_mask)
+ var/absorbed = ((covered_parts & HIDEMASK) ? head_absorbed : 0) //Check if clothing covering this part absorbed any of the shock
+ if(!(absorbed < 0))
+ //Masks can be used to shield other parts, but are simplified to simply add their absorbsion to the head armor if it covers the face
+ var/mask_absorbed = wear_mask.shred(bomb,shock-absorbed,src)
+ if(wear_mask.flags_inv & HIDEFACE)
+ covered_parts |= wear_mask.flags_inv
+ if(mask_absorbed < 0) //If the mask didn't get shredded, everything else on the head is protected
+ head_absorbed = -1
+ else
+ head_absorbed += mask_absorbed
+ if(ears)
+ var/absorbed = ((covered_parts & HIDEEARS) ? head_absorbed : 0)
+ if(!(absorbed < 0))
+ ears.shred(bomb,shock-absorbed,src)
+ if(glasses)
+ var/absorbed = ((covered_parts & HIDEEYES) ? head_absorbed : 0)
+ if(!(absorbed < 0))
+ glasses.shred(bomb,shock-absorbed,src)
+
+ if(wear_suit)
+ covered_parts |= wear_suit.flags_inv
+ suit_absorbed = wear_suit.shred(bomb,shock,src)
+ if(gloves)
+ var/absorbed = ((covered_parts & HIDEGLOVES) ? suit_absorbed : 0)
+ if(!(absorbed < 0))
+ gloves.shred(bomb,shock-absorbed,src)
+ if(shoes)
+ var/absorbed = ((covered_parts & HIDESHOES) ? suit_absorbed : 0)
+ if(!(absorbed < 0))
+ shoes.shred(bomb,shock-absorbed,src)
+ if(w_uniform)
+ var/absorbed = ((covered_parts & HIDEJUMPSUIT) ? suit_absorbed : 0)
+ if(!(absorbed < 0))
+ w_uniform.shred(bomb,shock-absorbed,src)
+
+/obj/item/proc/shred(var/bomb,var/shock,var/mob/living/carbon/human/Human)
+ var/shredded
+
+ if(!bomb)
+ if(burn_state != -1)
+ shredded = 1 //No heat protection, it burns
+ else
+ shredded = -1 //Heat protection = Fireproof
+
+ else if(shock > 0)
+ if(prob(min(90,max(10,shock))))
+ shredded = armor["bomb"] + 10 //It gets shredded, but it also absorbs the shock the clothes underneath would recieve by this amount
+ else
+ shredded = -1 //It survives explosion
+
+ if(shredded > 0)
+ if(Human) //Unequip if equipped
+ Human.unEquip(src)
+
+ if(bomb)
+ for(var/obj/item/Item in contents) //Empty out the contents
+ Item.loc = src.loc
+ spawn(1) //so the shreds aren't instantly deleted by the explosion
+ var/obj/effect/decal/cleanable/shreds/Shreds = new(loc)
+ Shreds.name = "shredded [src.name]"
+ Shreds.desc = "The sad remains of what used to be a glorious [src.name]."
+ qdel(src)
+ else
+ burn()
+
+ return shredded
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 67caa33abac..df7579f5190 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -738,7 +738,7 @@
if(P.allow_thrust(0.01, H))
hasjetpack = 1
- mspeed = 1 - hasjetpack
+ mspeed = -1 - hasjetpack
if(grav || !hasjetpack)
var/health_deficiency = (100 - H.health + H.staminaloss)
@@ -763,11 +763,12 @@
mspeed += speedmod
- if(H.status_flags & GOTTAGOFAST)
- mspeed -= 1
+ if(grav)
+ if(H.status_flags & GOTTAGOFAST)
+ mspeed -= 1
- if(H.status_flags & GOTTAGOREALLYFAST)
- mspeed -= 2
+ if(H.status_flags & GOTTAGOREALLYFAST)
+ mspeed -= 2
return mspeed
@@ -1101,13 +1102,13 @@
// Handle chem smoke effect -- Doohl
if(!H.has_smoke_protection())
- for(var/obj/effect/effect/chem_smoke/smoke in view(1, H))
- if(smoke.reagents.total_volume)
- smoke.reagents.reaction(H, INGEST)
- spawn(5)
- if(smoke)
- smoke.reagents.copy_to(H, 10) // I dunno, maybe the reagents enter the blood stream through the lungs?
- break // If they breathe in the nasty stuff once, no need to continue checking
+ for(var/obj/effect/effect/smoke/chem/S in range(1, H))
+ if(S.reagents.total_volume && S.lifetime)
+ var/fraction = 1/S.max_lifetime
+ S.reagents.reaction(H,INGEST, fraction)
+ var/amount = round(S.reagents.total_volume*fraction,0.1)
+ S.reagents.copy_to(H, amount)
+ S.lifetime--
else //Still give containing object the chance to interact
if(istype(H.loc, /obj/))
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 9ac7837148a..b019a52ab44 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -71,13 +71,13 @@
//Harmful gasses
if(!has_smoke_protection())
- for(var/obj/effect/effect/chem_smoke/smoke in view(1,src))
- if(smoke.reagents.total_volume)
- smoke.reagents.reaction(src,INGEST)
- spawn(5)
- if(smoke)
- smoke.reagents.copy_to(src, 10)
- break
+ for(var/obj/effect/effect/smoke/chem/S in range(1, src))
+ if(S.reagents.total_volume && S.lifetime)
+ var/fraction = 1/S.max_lifetime
+ S.reagents.reaction(src,INGEST, fraction)
+ var/amount = round(S.reagents.total_volume*fraction,0.1)
+ S.reagents.copy_to(src, amount)
+ S.lifetime--
else //Breathe from loc as obj again
if(istype(loc, /obj/))
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index a7c821c9493..394a92d9437 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -255,7 +255,7 @@
src << "Your mask protects you from the acid."
return
- take_organ_damage(min(6*toxpwr, acid_volume * toxpwr))
+ take_organ_damage(min(6*toxpwr, acid_volume * acidpwr/10))
/mob/living/carbon/monkey/help_shake_act(mob/living/carbon/M)
if(health < 0 && ishuman(M))
@@ -263,3 +263,12 @@
H.do_cpr(src)
else
..()
+
+/mob/living/carbon/monkey/get_permeability_protection()
+ var/protection = 0
+ if(head)
+ protection = 1 - head.permeability_coefficient
+ if(wear_mask)
+ protection = max(1 - wear_mask.permeability_coefficient, protection)
+ protection = protection/7 //the rest of the body isn't covered.
+ return protection
\ No newline at end of file
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index bc689b62098..3ab80a622bb 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -861,3 +861,7 @@ Sorry Giacom. Please don't be mad :(
return 0
return 1
+
+//used in datum/reagents/reaction() proc
+/mob/living/proc/get_permeability_protection()
+ return 0
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 6509db4ac67..b48f2f21e14 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -43,4 +43,6 @@
var/list/datum/action/actions = list()
var/list/pipes_shown = list()
- var/last_played_vent
\ No newline at end of file
+ var/last_played_vent
+
+ var/smoke_delay = 0 //used to prevent spam with smoke reagent reaction on mob.
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 8cace44236d..59e6475286e 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -101,8 +101,6 @@
emag.reagents.add_reagent("facid", 250)
emag.name = "Fluacid spray"
- var/obj/item/weapon/reagent_containers/spray/S = emag
- S.banned_reagents = list()
var/datum/robot_energy_storage/gauze/gauzestore = new /datum/robot_energy_storage/gauze(src)
diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm
index e2b541d9c53..a2da3fb63d6 100644
--- a/code/modules/mob/living/simple_animal/slime/powers.dm
+++ b/code/modules/mob/living/simple_animal/slime/powers.dm
@@ -182,7 +182,9 @@
var/new_powerlevel = round(powerlevel / 4)
for(var/i=1,i<=4,i++)
var/mob/living/simple_animal/slime/M = new /mob/living/simple_animal/slime/(loc)
- if(prob(mutation_chance))
+ if(mutation_chance >= 100)
+ M.colour = "rainbow"
+ else if(prob(mutation_chance))
M.colour = slime_mutation[rand(1,4)]
else
M.colour = colour
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index c9883f02afe..265a428ba71 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -100,8 +100,6 @@
var/in_throw_mode = 0
- var/coughedtime = null
-
var/music_lastplayed = "null"
var/job = null//Living
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm
index d6dc568105f..94740bd0e1e 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm
@@ -18,7 +18,7 @@
spawn(30)//Slight delay so the enemy does not immedietly know the ability was used. Due to lag, this often came before waking up.
H.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"))
spawn(70)
- reagents.reaction(H, 2)
+ reagents.reaction(H, INGEST)
reagents.trans_id_to(H, "radium", a_transfer)
H << "You are beginning to feel the after-effect of the injection."
a_boost--
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm
index aef3d012dd8..c89a3b11f92 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm
@@ -9,7 +9,7 @@
if(!ninjacost(0,N_SMOKE_BOMB))
var/mob/living/carbon/human/H = affecting
- var/datum/effect/effect/system/bad_smoke_spread/smoke = new /datum/effect/effect/system/bad_smoke_spread()
+ var/datum/effect/effect/system/smoke_spread/bad/smoke = new
smoke.set_up(10, 0, H.loc)
smoke.start()
playsound(H.loc, 'sound/effects/bamf.ogg', 50, 2)
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index 8ae11c8f83c..46ddcd420fd 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -10,7 +10,7 @@
var/obj/item/weapon/pen/haspen //The stored pen.
var/obj/item/weapon/paper/toppaper //The topmost piece of paper.
slot_flags = SLOT_BELT
-
+ burn_state = 0 //Burnable
/obj/item/weapon/clipboard/New()
update_icon()
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 6f725e04187..1e632fa976a 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -5,6 +5,7 @@
icon_state = "folder"
w_class = 2
pressure_resistance = 2
+ burn_state = 0 //Burnable
/obj/item/weapon/folder/blue
desc = "A blue folder."
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index df5d9101500..411f5de8522 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -18,6 +18,8 @@
pressure_resistance = 0
slot_flags = SLOT_HEAD
body_parts_covered = HEAD
+ burn_state = 0 //Burnable
+ burntime = 5
var/info //What's actually written on the paper.
var/info_links //A different version of the paper which includes html links at fields and EOF
@@ -26,7 +28,6 @@
var/list/stamped
var/rigged = 0
var/spam_flag = 0
- var/burning = 0 //Whether or not the paper is on fire
/obj/item/weapon/paper/New()
@@ -39,6 +40,9 @@
/obj/item/weapon/paper/update_icon()
+ if(burn_state == 1)
+ icon_state = "paper_onfire"
+ return
if(info)
icon_state = "paper_words"
return
@@ -89,15 +93,6 @@
spam_flag = 0
-/obj/item/weapon/paper/attack_hand()
- var/mob/living/carbon/M = usr
- if(burning)
- M << "Picking up a burning paper seems awfully stupid."
- return //Doesn't make any sense to pick up a burning paper
- else //Probably isn't necessary but it's safer
- ..()
-
-
/obj/item/weapon/paper/attack_ai(mob/living/silicon/ai/user)
var/dist
if(istype(user) && user.current) //is AI
@@ -278,7 +273,7 @@
/obj/item/weapon/paper/attackby(obj/item/weapon/P, mob/living/carbon/human/user, params)
..()
- if(burning)
+ if(burn_state == 1)
return
if(is_blind(user))
@@ -325,27 +320,21 @@
user.unEquip(src)
user.visible_message("[user] lights [src] ablaze with [P]!", "You light [src] on fire!")
- burn(0, 100)
+ fire_act()
add_fingerprint(user)
/obj/item/weapon/paper/fire_act()
- burn(1, 50)
-
-/obj/item/weapon/paper/proc/burn(var/showmsg, var/burntime)
- if (burning)
- return
- if(showmsg)
- src.visible_message("[src] catches on fire.")
- burning = 1
+ ..(0)
icon_state = "paper_onfire"
info = "[stars(info)]"
- spawn(burntime) //7 seconds
- src.visible_message("[src] burns away, leaving behind a pile of ashes.")
- new /obj/effect/decal/cleanable/ash(src.loc)
- qdel(src)
+
+
+/obj/item/weapon/paper/extinguish()
+ ..()
+ update_icon()
/*
* Premade paper
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index dd672a6d11c..568680b5d45 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -8,9 +8,20 @@
throw_speed = 3
throw_range = 7
pressure_resistance = 8
+ burn_state = 0 //Burnable
var/amount = 30 //How much paper is in the bin.
var/list/papers = new/list() //List of papers put in the bin for reference.
+/obj/item/weapon/paper_bin/fire_act()
+ if(!amount)
+ return
+ ..()
+
+/obj/item/weapon/paper_bin/burn()
+ amount = 0
+ extinguish()
+ update_icon()
+ return
/obj/item/weapon/paper_bin/MouseDrop(atom/over_object)
var/mob/M = usr
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 0832ab226f3..d8312036260 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -17,7 +17,7 @@
icon_state = "film"
item_state = "electropack"
w_class = 1.0
-
+ burn_state = 0 //Burnable
/*
* Photo
@@ -28,6 +28,8 @@
icon_state = "photo"
item_state = "paper"
w_class = 1.0
+ burn_state = 0 //Burnable
+ burntime = 5
var/icon/img //Big photo image
var/scribble //Scribble on the back.
var/blueprints = 0 //Does it include the blueprints?
@@ -92,7 +94,7 @@
icon_state = "album"
item_state = "briefcase"
can_hold = list(/obj/item/weapon/photo)
-
+ burn_state = 0 //Burnable
/*
* Camera
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 51f6b311a84..a23baaa84f0 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -937,11 +937,11 @@
cell.corrupt()
src.malfhack = 1
update_icon()
- var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+ var/datum/effect/effect/system/smoke_spread/smoke = new
smoke.set_up(3, 0, src.loc)
smoke.attach(src)
smoke.start()
- var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ var/datum/effect/effect/system/spark_spread/s = new
s.set_up(3, 1, src)
s.start()
visible_message("The [src.name] suddenly lets out a blast of smoke and some sparks!", \
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 96a08d99e4d..607be1ba324 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -42,7 +42,7 @@
user << "Your soul is too far away."
return
makeNewConstruct(/mob/living/simple_animal/construct/harvester, user, null, 1)
- PoolOrNew(/obj/effect/effect/sleep_smoke, user.loc)
+ PoolOrNew(/obj/effect/effect/smoke/sleeping, user.loc)
/obj/singularity/narsie/process()
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index 461af979728..55f9ff2849f 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -123,7 +123,7 @@
/obj/item/weapon/gun/magic/wand/teleport/zap_self(mob/living/user as mob)
do_teleport(user, user, 10)
- var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+ var/datum/effect/effect/system/smoke_spread/smoke = new
smoke.set_up(10, 0, user.loc)
smoke.start()
charges--
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index efc20cedfd7..ec2bbcdae6c 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -83,7 +83,7 @@
if(!stuff.anchored && stuff.loc)
teleammount++
do_teleport(stuff, stuff, 10)
- var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+ var/datum/effect/effect/system/smoke_spread/smoke = new
smoke.set_up(max(round(10 - teleammount),1), 0, stuff.loc) //Smoke drops off if a lot of stuff is moved for the sake of sanity
smoke.start()
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index 94e40614ab8..0978a34f58f 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -124,7 +124,7 @@ var/const/INGEST = 2
var/current_reagent_transfer = current_reagent.volume * part
if(preserve_data)
trans_data = copy_data(current_reagent)
- R.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data, src.chem_temp)
+ R.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data, src.chem_temp, no_react = 1) //we only handle reaction after every reagent has been transfered.
src.remove_reagent(current_reagent.id, current_reagent_transfer)
src.update_total()
@@ -426,17 +426,21 @@ var/const/INGEST = 2
return 0
/datum/reagents/proc/reaction(var/atom/A, var/method=TOUCH, var/volume_modifier=1,var/show_message=1)
- for(var/datum/reagent/R in reagent_list)
- if(ismob(A))
- R.reaction_mob(A, method, R.volume*volume_modifier, show_message)
- if(isturf(A))
+ if(isliving(A))
+ var/mob/living/L = A
+ var/touch_protection = 0
+ if(method == TOUCH)
+ touch_protection = L.get_permeability_protection()
+ for(var/datum/reagent/R in reagent_list)
+ R.reaction_mob(L, method, R.volume*volume_modifier, show_message, touch_protection)
+ else if(isturf(A))
+ for(var/datum/reagent/R in reagent_list)
R.reaction_turf(A, R.volume*volume_modifier, show_message)
- if(isobj(A))
+ else if(isobj(A))
+ for(var/datum/reagent/R in reagent_list)
R.reaction_obj(A, R.volume*volume_modifier, show_message)
- return
-
-/datum/reagents/proc/add_reagent(var/reagent, var/amount, var/list/data=null, var/reagtemp = 300)
+/datum/reagents/proc/add_reagent(var/reagent, var/amount, var/list/data=null, var/reagtemp = 300, var/no_react = 0)
if(!isnum(amount) || !amount)
return 1
update_total()
@@ -451,7 +455,8 @@ var/const/INGEST = 2
update_total()
my_atom.on_reagent_change()
R.on_merge(data)
- handle_reactions()
+ if(!no_react)
+ handle_reactions()
return 0
var/datum/reagent/D = chemical_reagents_list[reagent]
@@ -465,19 +470,16 @@ var/const/INGEST = 2
R.data = data
R.on_new(data)
- //debug
- //world << "Adding data"
- //for(var/D in R.data)
- // world << "Container data: [D] = [R.data[D]]"
- //debug
update_total()
my_atom.on_reagent_change()
- handle_reactions()
+ if(!no_react)
+ handle_reactions()
return 0
else
WARNING("[my_atom] attempted to add a reagent called ' [reagent] ' which doesn't exist. ([usr])")
- handle_reactions()
+ if(!no_react)
+ handle_reactions()
return 1
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 2934c57a3c0..5fe6dc7e8fa 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -34,43 +34,22 @@
..()
holder = null
-/datum/reagent/proc/reaction_mob(var/mob/M, var/method=TOUCH, var/volume, var/show_message = 1) //By default we have a chance to transfer some
- if(!istype(M, /mob/living))
+/datum/reagent/proc/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume, var/show_message = 1, var/touch_protection = 0)
+ if(!istype(M))
return 0
var/datum/reagent/self = src
- src = null //of the reagent to the mob on TOUCHING it.
+ src = null
- if(!istype(self.holder.my_atom, /obj/effect/effect/chem_smoke))
- // If the chemicals are in a smoke cloud, do not try to let the chemicals "penetrate" into the mob's system (balance station 13) -- Doohl
-
- if(method == TOUCH)
-
- var/chance = 1
- var/block = 0
-
- for(var/obj/item/clothing/C in M.get_equipped_items())
- if(C.permeability_coefficient < chance) chance = C.permeability_coefficient
- if(istype(C, /obj/item/clothing/suit/bio_suit))
- // bio suits are just about completely fool-proof - Doohl
- // kind of a hacky way of making bio suits more resistant to chemicals but w/e
- if(prob(75))
- block = 1
-
- if(istype(C, /obj/item/clothing/head/bio_hood))
- if(prob(75))
- block = 1
-
- chance = chance * 100
-
- if(prob(chance) && !block)
- if(M.reagents)
- M.reagents.add_reagent(self.id,self.volume/2)
+ if(method == TOUCH)
+ if(M.reagents)
+ var/modifier = Clamp((1 - touch_protection) + rand(-5,5)/100, 0, 1)
+ var/amount = round(volume*modifier, 0.1)
+ if(amount >= 1)
+ M.reagents.add_reagent(self.id, amount)
return 1
-/datum/reagent/proc/reaction_obj(var/obj/O, var/volume) //By default we transfer a small part of the reagent to the object
- src = null //if it can hold reagents. nope!
- //if(O.reagents)
- // O.reagents.add_reagent(id,volume/3)
+/datum/reagent/proc/reaction_obj(var/obj/O, var/volume)
+ src = null
return
/datum/reagent/proc/reaction_turf(var/turf/T, var/volume)
diff --git a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
index f3706a7e76b..163c1e5176e 100644
--- a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
@@ -11,13 +11,12 @@
color = "#B68D00"
message = "The blob splashes you with burning oil"
-/datum/reagent/blob/boiling_oil/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+/datum/reagent/blob/boiling_oil/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume)
if(method == TOUCH)
- M.apply_damage(15, BURN)
- M.adjust_fire_stacks(2)
+ var/ratio = volume/25
+ M.apply_damage(15*ratio, BURN)
+ M.adjust_fire_stacks(2*ratio)
M.IgniteMob()
- if(show_message)
- send_message(M)
if(isliving(M))
M.emote("scream")
@@ -28,11 +27,10 @@
color = "#008000"
message_living = ", and you feel sick and nauseated"
-/datum/reagent/blob/toxic_goop/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+/datum/reagent/blob/toxic_goop/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume)
if(method == TOUCH)
- M.apply_damage(20, TOX)
- if(show_message)
- send_message(M)
+ var/ratio = volume/25
+ M.apply_damage(20*ratio, TOX)
/datum/reagent/blob/skin_ripper
name = "Skin Ripper"
@@ -41,12 +39,11 @@
color = "#FF4C4C"
message_living = ", and you feel your skin ripping and tearing off"
-/datum/reagent/blob/skin_ripper/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+/datum/reagent/blob/skin_ripper/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume)
if(method == TOUCH)
- M.apply_damage(20, BRUTE)
- if(show_message)
- send_message(M)
- if(isliving(M))
+ var/ratio = volume/25
+ M.apply_damage(20*ratio, BRUTE)
+ if(iscarbon(M))
M.emote("scream")
// Combo Reagents
@@ -58,15 +55,14 @@
color = "#7F0000"
message_living = ", and you feel your skin char and melt"
-/datum/reagent/blob/skin_melter/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+/datum/reagent/blob/skin_melter/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume)
if(method == TOUCH)
- M.apply_damage(10, BRUTE)
- M.apply_damage(10, BURN)
- M.adjust_fire_stacks(2)
+ var/ratio = volume/25
+ M.apply_damage(10*ratio, BRUTE)
+ M.apply_damage(10*ratio, BURN)
+ M.adjust_fire_stacks(2*ratio)
M.IgniteMob()
- if(show_message)
- send_message(M)
- if(isliving(M))
+ if(iscarbon(M))
M.emote("scream")
/datum/reagent/blob/lung_destroying_toxin
@@ -76,13 +72,13 @@
color = "#00FFC5"
message_living = ", and your lungs feel heavy and weak"
-/datum/reagent/blob/lung_destroying_toxin/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume,var/show_message = 1)
+/datum/reagent/blob/lung_destroying_toxin/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume)
if(method == TOUCH)
- M.apply_damage(20, OXY)
- M.losebreath += 15
- M.apply_damage(20, TOX)
- if(show_message)
- send_message(M)
+ var/ratio = volume/25
+ M.apply_damage(20* ratio, OXY)
+ M.losebreath += 15*ratio
+ M.apply_damage(20*ratio, TOX)
+
// Special Reagents
/datum/reagent/blob/radioactive_liquid
@@ -92,19 +88,18 @@
color = "#00EE00"
message_living = ", and your skin feels papery and everything hurts"
-/datum/reagent/blob/radioactive_liquid/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume,var/show_message = 1)
+/datum/reagent/blob/radioactive_liquid/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume)
if(method == TOUCH)
+ var/ratio = volume/25
+ M.apply_damage(10*ratio, BRUTE)
if(istype(M, /mob/living/carbon/human))
- M.apply_damage(10, BRUTE)
- M.irradiate(40)
- if(prob(33))
+ M.irradiate(40*ratio)
+ if(prob(33*ratio))
randmuti(M)
if(prob(98))
randmutb(M)
domutcheck(M, null)
updateappearance(M)
- if(show_message)
- send_message(M)
/datum/reagent/blob/dark_matter
name = "Dark Matter"
@@ -113,12 +108,12 @@
color = "#61407E"
message = "You feel a thrum as the blob strikes you, and everything flies at you"
-/datum/reagent/blob/dark_matter/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+/datum/reagent/blob/dark_matter/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume)
if(method == TOUCH)
- M.apply_damage(15, BRUTE)
+ var/ratio = volume/25
+ M.apply_damage(15*ratio, BRUTE)
reagent_vortex(M, 0)
- if(show_message)
- send_message(M)
+
/datum/reagent/blob/b_sorium
name = "Sorium"
@@ -127,11 +122,10 @@
color = "#808000"
message = "The blob slams into you, and sends you flying"
-/datum/reagent/blob/b_sorium/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+/datum/reagent/blob/b_sorium/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume)
if(method == TOUCH)
- M.apply_damage(15, BRUTE)
- if(show_message)
- send_message(M)
+ var/ratio = volume/25
+ M.apply_damage(15*ratio, BRUTE)
reagent_vortex(M, 1)
@@ -142,11 +136,10 @@
color = "#FFA500"
message = "The blob strikes you, and its tendrils explode"
-/datum/reagent/blob/explosive/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+/datum/reagent/blob/explosive/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume)
if(method == TOUCH)
- if(prob(75))
- if(show_message)
- send_message(M)
+ var/ratio = volume/25
+ if(prob(75*ratio))
explosion(M.loc, 0, 0, 1, 0, 0)
/datum/reagent/blob/omnizine
@@ -157,11 +150,10 @@
message = "The blob squirts something at you"
message_living = ", and you feel great"
-/datum/reagent/blob/omnizine/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+/datum/reagent/blob/omnizine/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume)
if(method == TOUCH)
- if(show_message)
- send_message(M)
- M.reagents.add_reagent("omnizine", 11)
+ var/ratio = volume/25
+ M.reagents.add_reagent("omnizine", 11*ratio)
/datum/reagent/blob/spacedrugs
name = "Space drugs"
@@ -171,12 +163,11 @@
message = "The blob squirts something at you"
message_living = ", and you feel funny"
-/datum/reagent/blob/spacedrugs/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+/datum/reagent/blob/spacedrugs/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume)
if(method == TOUCH)
- if(show_message)
- send_message(M)
- M.reagents.add_reagent("space_drugs", 15)
- M.apply_damage(10, TOX)
+ var/ratio = volume/25
+ M.reagents.add_reagent("space_drugs", 15*ratio)
+ M.apply_damage(10*ratio, TOX)
/datum/reagent/blob/proc/reagent_vortex(var/mob/living/M as mob, var/setting_type)
@@ -197,4 +188,4 @@
if(message_living && !issilicon(M))
totalmessage += message_living
totalmessage += "!"
- M << "[totalmessage]"
+ M << "[totalmessage]"
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
index 270ddfdabb6..0db45f86c9e 100644
--- a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
@@ -144,6 +144,11 @@
/datum/reagent/water/reaction_obj(var/obj/O, var/volume)
src = null
+
+ if(istype(O,/obj/item))
+ var/obj/item/Item = O
+ Item.extinguish()
+
// Monkey cube
if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/monkeycube))
var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O
@@ -151,7 +156,7 @@
cube.Expand()
// Dehydrated carp
- if(istype(O,/obj/item/toy/carpplushie/dehy_carp))
+ else if(istype(O,/obj/item/toy/carpplushie/dehy_carp))
var/obj/item/toy/carpplushie/dehy_carp/dehy = O
dehy.Swell() // Makes a carp
@@ -628,7 +633,7 @@
/datum/reagent/nanites/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
src = null
- if( (prob(10) && method==TOUCH) || method==INGEST)
+ if( (prob(min(10, volume)) && method==TOUCH) || method==INGEST)
M.ForceContractDisease(new /datum/disease/transformation/robot(0))
/datum/reagent/xenomicrobes
@@ -639,7 +644,7 @@
/datum/reagent/xenomicrobes/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
src = null
- if( (prob(10) && method==TOUCH) || method==INGEST)
+ if( (prob(min(10, volume)) && method==TOUCH) || method==INGEST)
M.ContractDisease(new /datum/disease/transformation/xeno(0))
/datum/reagent/fluorosurfactant//foam precursor
diff --git a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
index 67c110b34bd..e8d4ebf6909 100644
--- a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
@@ -67,7 +67,7 @@
/datum/reagent/clf3/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
if(method == TOUCH && isliving(M))
- M.adjust_fire_stacks(5)
+ M.adjust_fire_stacks(min(volume/5, 10))
M.IgniteMob()
PoolOrNew(/obj/effect/hotspot, M.loc)
@@ -148,7 +148,7 @@
/datum/reagent/napalm/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
if(method == TOUCH && isliving(M))
- M.adjust_fire_stacks(7)
+ M.adjust_fire_stacks(min(volume/4, 20))
/datum/reagent/cryostylane
name = "Cryostylane"
diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
index bbb31522bbb..e9b09cac1df 100644
--- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
@@ -34,7 +34,7 @@
if(!istype(M) || !M.dna)
return //No robots, AIs, aliens, Ians or other mobs should be affected by this.
src = null
- if((method==TOUCH && prob(33)) || method==INGEST)
+ if((method==TOUCH && prob(min(33, volume))) || method==INGEST)
randmuti(M)
if(prob(98))
randmutb(M)
@@ -194,8 +194,8 @@
if(iscarbon(M))
var/mob/living/carbon/C = M
if(!C.wear_mask) // If not wearing a mask
- C.adjustToxLoss(2) // 4 toxic damage per application, doubled for some reason
-
+ var/damage = min(round(0.4*volume, 0.1),10)
+ C.adjustToxLoss(damage)
/datum/reagent/toxin/plantbgone/weedkiller
name = "Weed Killer"
id = "weedkiller"
@@ -215,7 +215,8 @@
if(iscarbon(M))
var/mob/living/carbon/C = M
if(!C.wear_mask) // If not wearing a mask
- C.adjustToxLoss(2) // 4 toxic damage per application, doubled for some reason
+ var/damage = min(round(0.4*volume, 0.1),10)
+ C.adjustToxLoss(damage)
/datum/reagent/toxin/spore
name = "Spore Toxin"
@@ -620,6 +621,7 @@
/datum/reagent/toxin/acid/reaction_mob(var/mob/living/carbon/C, var/method=TOUCH, var/volume)
if(!istype(C))
return
+ volume = round(volume,0.1)
if(method != TOUCH)
C.take_organ_damage(min(6*toxpwr, volume * toxpwr))
return
@@ -629,6 +631,7 @@
/datum/reagent/toxin/acid/reaction_obj(var/obj/O, var/volume)
if(istype(O.loc, /mob)) //handled in human acid_act()
return
+ volume = round(volume,0.1)
O.acid_act(acidpwr, toxpwr, volume)
/datum/reagent/toxin/acid/fluacid
diff --git a/code/modules/reagents/Chemistry-Recipes/Others.dm b/code/modules/reagents/Chemistry-Recipes/Others.dm
index 99866fd47eb..f03bec05038 100644
--- a/code/modules/reagents/Chemistry-Recipes/Others.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Others.dm
@@ -143,10 +143,8 @@
/datum/chemical_reaction/foam/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
-
for(var/mob/M in viewers(5, location))
M << "The solution spews out foam!"
-
var/datum/effect/effect/system/foam_spread/s = new()
s.set_up(created_volume, location, holder)
s.start()
diff --git a/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm
index 4b265fae1b9..ba20b7c7817 100644
--- a/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm
@@ -216,19 +216,16 @@
if(holder.has_reagent("stabilizing_agent"))
return
holder.remove_reagent("smoke_powder", created_volume)
+ var/smoke_amount = round(Clamp(created_volume/5, 1, 20),1)
var/location = get_turf(holder.my_atom)
- var/datum/effect/effect/system/chem_smoke_spread/S = new /datum/effect/effect/system/chem_smoke_spread
+ var/datum/effect/effect/system/smoke_spread/chem/S = new
S.attach(location)
playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
- spawn(0)
- if(S)
- S.set_up(holder, 10, 0, location)
- S.start()
- sleep(10)
- S.start()
- if(holder && holder.my_atom)
- holder.clear_reagents()
- return
+ if(S)
+ S.set_up(holder, smoke_amount, 0, location)
+ S.start()
+ if(holder && holder.my_atom)
+ holder.clear_reagents()
/datum/chemical_reaction/smoke_powder_smoke
name = "smoke_powder_smoke"
@@ -242,18 +239,16 @@
/datum/chemical_reaction/smoke_powder_smoke/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
- var/datum/effect/effect/system/chem_smoke_spread/S = new /datum/effect/effect/system/chem_smoke_spread
+ var/smoke_amount = round(Clamp(created_volume/5, 1, 20),1)
+ var/datum/effect/effect/system/smoke_spread/chem/S = new
S.attach(location)
playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
- spawn(0)
- if(S)
- S.set_up(holder, 10, 0, location)
- S.start()
- sleep(10)
- S.start()
- if(holder && holder.my_atom)
- holder.clear_reagents()
- return
+ if(S)
+ S.set_up(holder, smoke_amount, 0, location)
+ S.start()
+ if(holder && holder.my_atom)
+ holder.clear_reagents()
+
/datum/chemical_reaction/sonic_powder
@@ -318,6 +313,7 @@
var/turf/simulated/T = get_turf(holder.my_atom)
if(istype(T))
T.atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, created_volume)
+ holder.clear_reagents()
return
diff --git a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
index 996604a0822..98f34ef9f73 100644
--- a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
@@ -11,10 +11,9 @@
/datum/chemical_reaction/slimespawn/on_reaction(var/datum/reagents/holder)
feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!"), 1)
var/mob/living/simple_animal/slime/S = new /mob/living/simple_animal/slime
S.loc = get_turf(holder.my_atom)
+ S.visible_message("Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!")
/datum/chemical_reaction/slimeinaprov
name = "Slime epinephrine"
@@ -618,3 +617,20 @@
var/obj/P = new chosen
if(P)
P.loc = get_turf(holder.my_atom)
+
+//Rainbow :o)
+/datum/chemical_reaction/slimeRNG
+ name = "Random Core"
+ id = "slimerng"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_other = 1
+ required_container = /obj/item/slime_extract/rainbow
+
+/datum/chemical_reaction/slimeRNG/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/mob/living/simple_animal/slime/S = new /mob/living/simple_animal/slime
+ S.colour = pick("grey","orange", "metal", "blue", "purple", "dark purple", "dark blue", "green", "silver", "yellow", "gold", "yellow", "red", "silver", "pink", "cerulean", "sepia", "bluespace", "pyrite", "light pink", "oil", "adamantine", "black")
+ S.loc = get_turf(holder.my_atom)
+ S.visible_message("Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!")
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index a938b092061..c3108ddeb0c 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -7,7 +7,6 @@
var/amount_per_transfer_from_this = 5
var/possible_transfer_amounts = list(5,10,15,25,30)
var/volume = 30
- var/list/banned_reagents = list() //List of reagent IDs we reject.
var/list/list_reagents = null
var/spawned_disease = null
var/disease_amount = 20
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index d3c923f6e2c..eed51ff2a81 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -92,7 +92,8 @@ Borg Hypospray
if (R.total_volume && M.can_inject(user, 1))
M << "You feel a tiny prick!"
user << "You inject [M] with the injector."
- R.reaction(M, INGEST)
+ var/fraction = min(amount_per_transfer_from_this/R.total_volume, 1)
+ R.reaction(M, INGEST, fraction)
if(M.reagents)
var/trans = R.trans_to(M, amount_per_transfer_from_this)
user << "[trans] unit\s injected. [R.total_volume] unit\s remaining."
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index f67392fab7d..7e5a3d234fd 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -2,7 +2,7 @@
name = "dropper"
desc = "A dropper. Holds up to 5 units."
icon = 'icons/obj/chemical.dmi'
- icon_state = "dropper"
+ icon_state = "dropper0"
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(1, 2, 3, 4, 5)
volume = 5
@@ -21,6 +21,7 @@
return
var/trans = 0
+ var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
if(ismob(target))
if(istype(target , /mob/living/carbon/human))
@@ -40,12 +41,12 @@
if(safe_thing)
if(!safe_thing.reagents)
safe_thing.create_reagents(100)
+
+ reagents.reaction(safe_thing, TOUCH, fraction)
trans = reagents.trans_to(safe_thing, amount_per_transfer_from_this)
target.visible_message("[user] tries to squirt something into [target]'s eyes, but fails!", \
"[user] tries to squirt something into [target]'s eyes, but fails!")
- spawn(5)
- reagents.reaction(safe_thing, TOUCH)
user << "You transfer [trans] unit\s of the solution."
update_icon()
@@ -53,7 +54,8 @@
target.visible_message("[user] squirts something into [target]'s eyes!", \
"[user] squirts something into [target]'s eyes!")
- reagents.reaction(target, TOUCH)
+
+ reagents.reaction(target, TOUCH, fraction)
var/mob/M = target
var/R
if(reagents)
@@ -87,4 +89,4 @@
if(reagents.total_volume)
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "dropper")
filling.color = mix_color_from_reagents(reagents.reagent_list)
- overlays += filling
\ No newline at end of file
+ overlays += filling
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 2a21fe917d8..b8f188c3ba5 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -72,12 +72,6 @@
user << "[target] is full."
return
- if(istype(target, /obj/item/weapon/reagent_containers))
- var/obj/item/weapon/reagent_containers/RC = target
- for(var/bad_reg in RC.banned_reagents)
- if(reagents.has_reagent(bad_reg, 1)) //Message is a bit "Game-y" but I can't think up a better one.
- user << "A chemical in [src] is far too dangerous to transfer to [RC]!"
- return
var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
user << "You transfer [trans] unit\s of the solution to [target]."
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 708b8659a7a..1a86c6f9ed7 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -25,7 +25,8 @@
M << "You feel a tiny prick!"
user << "You inject [M] with [src]."
- reagents.reaction(M, INGEST)
+ var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
+ reagents.reaction(M, INGEST, fraction)
if(M.reagents)
var/list/injected = list()
for(var/datum/reagent/R in reagents.reagent_list)
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 4520bb48afb..b675f86913b 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -45,10 +45,9 @@
if(reagents.total_volume)
reagents.reaction(M, apply_type)
- spawn(5)
- reagents.trans_to(M, reagents.total_volume)
- qdel(src)
- return 1
+ reagents.trans_to(M, reagents.total_volume)
+ qdel(src)
+ return 1
else
qdel(src)
return 1
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index edfce7a4595..054b8113f2f 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -15,7 +15,6 @@
amount_per_transfer_from_this = 5
volume = 250
possible_transfer_amounts = null
- banned_reagents = list("facid","sacid")
/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob)
@@ -159,7 +158,6 @@
amount_per_transfer_from_this = 10
volume = 600
origin_tech = "combat=3;materials=3;engineering=3"
- banned_reagents = list()//the safeties are off, spray and pay!
/obj/item/weapon/reagent_containers/spray/chemsprayer/spray(var/atom/A)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index ad9c064c873..e41a0a2639c 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -151,7 +151,8 @@
var/contained = english_list(rinject)
var/mob/M = target
add_logs(user, M, "injected", object="[src.name]", addition="which had [contained]")
- reagents.reaction(target, INGEST)
+ var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
+ reagents.reaction(target, INGEST, fraction)
if(ismob(target) && target == user)
//Attack log entries are produced here due to failure to produce elsewhere. Remove them here if you have doubles from normal syringes.
var/list/rinject = list()
@@ -161,8 +162,8 @@
var/mob/M = target
log_attack("[user.name] ([user.ckey]) injected [M.name] ([M.ckey]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)])")
M.attack_log += text("\[[time_stamp()]\] Injected themselves ([contained]) with [src.name].")
-
- reagents.reaction(target, INGEST)
+ var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
+ reagents.reaction(target, INGEST, fraction)
spawn(5)
var/datum/reagent/blood/B
for(var/datum/reagent/blood/d in src.reagents.reagent_list)
@@ -180,7 +181,7 @@
/obj/item/weapon/reagent_containers/syringe/update_icon()
- var/rounded_vol = min(round(reagents.total_volume,5), 15)
+ var/rounded_vol = min(max(round(reagents.total_volume,5),5),15)
overlays.Cut()
if(ismob(loc))
var/injoverlay
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index eda94a40f33..5225e5a4d48 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -117,6 +117,7 @@
flags = NOBLUDGEON
amount = 25
max_amount = 25
+ burn_state = 0 //burnable
/obj/item/stack/packageWrap/afterattack(var/obj/target as obj, mob/user as mob, proximity)
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 1eeb4731c18..86e8b96252d 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -231,7 +231,7 @@
loaded_item = null
/obj/machinery/r_n_d/experimentor/proc/throwSmoke(var/turf/where)
- var/datum/effect/effect/system/harmless_smoke_spread/smoke = new
+ var/datum/effect/effect/system/smoke_spread/smoke = new
smoke.set_up(1,0, where, 0)
smoke.start()
@@ -323,7 +323,7 @@
R.my_atom = src
R.add_reagent(chosenchem , 50)
investigate_log("Experimentor has released [chosenchem] smoke.", "experimentor")
- var/datum/effect/effect/system/chem_smoke_spread/smoke = new
+ var/datum/effect/effect/system/smoke_spread/chem/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start()
@@ -335,7 +335,7 @@
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
R.add_reagent(chosenchem , 50)
- var/datum/effect/effect/system/chem_smoke_spread/smoke = new
+ var/datum/effect/effect/system/smoke_spread/chem/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start()
@@ -422,7 +422,7 @@
R.my_atom = src
R.add_reagent("frostoil" , 50)
investigate_log("Experimentor has released frostoil gas.", "experimentor")
- var/datum/effect/effect/system/chem_smoke_spread/smoke = new
+ var/datum/effect/effect/system/smoke_spread/chem/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start()
@@ -444,7 +444,7 @@
ejectItem(TRUE)
if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!")
- var/datum/effect/effect/system/harmless_smoke_spread/smoke = new
+ var/datum/effect/effect/system/smoke_spread/smoke = new
smoke.set_up(1,0, src.loc, 0)
smoke.start()
ejectItem()
@@ -652,7 +652,7 @@
//////////////// RELIC PROCS /////////////////////////////
/obj/item/weapon/relic/proc/throwSmoke(var/turf/where)
- var/datum/effect/effect/system/harmless_smoke_spread/smoke = new
+ var/datum/effect/effect/system/smoke_spread/smoke = new
smoke.set_up(1,0, where, 0)
smoke.start()
diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm
index 4f67a8aa16d..4ee8ea23b77 100644
--- a/code/modules/research/stock_parts.dm
+++ b/code/modules/research/stock_parts.dm
@@ -42,6 +42,16 @@
pshoom_or_beepboopblorpzingshadashwoosh = 'sound/items/PSHOOM.ogg'
alt_sound = 'sound/items/PSHOOM_2.ogg'
+/obj/item/weapon/storage/part_replacer/bluespace/content_can_dump(atom/dest_object, mob/user)
+ if(Adjacent(user))
+ if(get_dist(user, dest_object) < 8)
+ if(dest_object.storage_contents_dump_act(src, user))
+ play_rped_sound()
+ user.Beam(dest_object,icon_state="rped_upgrade",icon='icons/effects/effects.dmi',time=5)
+ return 1
+ user << "The [src.name] buzzes."
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ return 0
/obj/item/weapon/storage/part_replacer/proc/play_rped_sound()
//Plays the sound for RPED exhanging or installing parts.
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index 0450b8109c1..3e0a44925ea 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -1,7 +1,8 @@
/obj/machinery/computer/telescience
name = "\improper Telepad Control Console"
desc = "Used to teleport objects to and from the telescience telepad."
- icon_state = "teleport"
+ icon_screen = "teleport"
+ icon_keyboard = "teleport_key"
circuit = /obj/item/weapon/circuitboard/telesci_console
var/sending = 1
var/obj/machinery/telepad/telepad = null
diff --git a/config/admins.txt b/config/admins.txt
index 8a308e187ce..a029f2639e4 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -7,7 +7,8 @@
# NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn #
# NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. #
###############################################################################################
-MrStonedOne = Host
+Optimumtact = Host
+MrStonedOne = Game Master
microscopics = Game Master
Gun Hog = Game Master
KorPhaeron = Game Master
@@ -84,4 +85,4 @@ vekter = Game Master
Ahammer18 = Game Master
ACCount12 = Game Master
fayrik = Game Master
-shadowlight213 = Game Master
\ No newline at end of file
+shadowlight213 = Game Master
diff --git a/html/changelog.html b/html/changelog.html
index 929ed44f31f..e5f040be56e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,67 @@
-->
+
29 June 2015
+
Ikarrus updated:
+
+ - Clothing has been separated out of equipment lockers into wardrobes to reduce clutter.
+
+
Incoming5643 updated:
+
+ - The secrets of the rainbow slimes have finally been revealed. To attain this rare blob you must breed a slime with a 100% mutation chance!
+ - Rainbow slime cores will generate a randomly colored slime when injected with plasma. It's a good plan B if the slimes aren't cooperating in terms of colors. You can get any color slime this way, pray to the RNG!
+
+
Xhuis updated:
+
+ - The Sleeping Carp clan has made its presence known on Space Station 13. Some gangs will name themselves after this group and practice martial arts rather than using traditional gang weaponry. These shadowboxers are not to be taken lightly.
+
+
oranges updated:
+
+ - Thanks to a breakthrough in directed vector thrusting, all nanotrasen brand jetpacks have been greatly improved in speed and handling
+
+
+
28 June 2015
+
Ikarrus updated:
+
+ - Gang Lieutenants can buy gang tools now, but at a higher cost than the original boss
+ - Gang leaders can register additional gangtools to themselves for use as spares.
+ - Number of maximum lieutenants lowered to 2
+ - Pistol cost increased to 25 influence
+ - Uzi cost increased to 50 influence
+ - Uzi Ammo decreased to 20 influence
+ - Overcoats added to items the biogenerator can produce.
+ - Micro and Macro bomb implants are now restricted to the Nuclear game mode.
+
+
phil235 updated:
+
+ - Smoke (and foam) no longer distribute more reagents than they have. The amount of clouds in a smoke now depends on the amount of smoke created. Acid no longer melts items on a mob at low volume, and the chances to melt them increases with the amount applied on the mob. Sprays can now contain acid again.
+
+
+
27 June 2015
+
Ikarrus updated:
+
+ - Some objects can be burned now.
+ - Bombs will shred your clothes, with respect to their layering and armor values. Exterior clothing will shield clothing underneath. Storage items will drop their contents when bombed this way.
+
+
Laharl Montogmmery updated:
+
+ - Storage Content Transfer : Bluespace Boogaloo! You can now transfer the content of the BoH/BRPED into tiles/bins/bags out of your reach. Range is 7 tiles.
+
+
MrStonedOne updated:
+
+ - Admins will now receive a notification when one of them starts to reply to an adminhelp to cut down on multiple responses to adminhelps and let admins know when an adminhelp isn't getting replied to.
+ - The keyword finder in admin helps (adds a (?) link next to player names in the text of adminhelps) has been added for all player to admin pms, as well as admin say.
+
+
NullQuery updated:
+
+ - Introduces html_interface, a module to streamline the management of browser windows.
+ - Adds playing cards that utilize a new HTML window management system.
+
+
Vekter updated:
+
+ - Added a new military jacket to the Autodrobe and ClothesMate.
+
+
26 June 2015
Ikarrus updated:
@@ -121,7 +182,7 @@
- Admins can now flag ckeys to be alerted when they connect to the server.
- N3X15 updated:
+ MrStonedOne updated:
- Admins can now reject poor adminhelps. This will tell the player how to construct a useful adminhelp and give them back their adminhelp verb
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c9ad089f910..1763d0c5a1d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2918,7 +2918,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscdel: Removed bulletproof vests from gangtool menu.
Jordie0608:
- rscadd: Admins can now flag ckeys to be alerted when they connect to the server.
- N3X15:
+ MrStonedOne:
- rscadd: Admins can now reject poor adminhelps. This will tell the player how to
construct a useful adminhelp and give them back their adminhelp verb
RemieRichards:
@@ -2981,3 +2981,61 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
pudl:
- rscadd: You can now play games of mastermind to unlock abandoned crates found
throughout space.
+2015-06-27:
+ Ikarrus:
+ - rscadd: Some objects can be burned now.
+ - rscadd: Bombs will shred your clothes, with respect to their layering and armor
+ values. Exterior clothing will shield clothing underneath. Storage items will
+ drop their contents when bombed this way.
+ Laharl Montogmmery:
+ - rscadd: 'Storage Content Transfer : Bluespace Boogaloo! You can now transfer the
+ content of the BoH/BRPED into tiles/bins/bags out of your reach. Range is 7
+ tiles.'
+ MrStonedOne:
+ - tweak: Admins will now receive a notification when one of them starts to reply
+ to an adminhelp to cut down on multiple responses to adminhelps and let admins
+ know when an adminhelp isn't getting replied to.
+ - rscadd: The keyword finder in admin helps (adds a (?) link next to player names
+ in the text of adminhelps) has been added for all player to admin pms, as well
+ as admin say.
+ NullQuery:
+ - wip: Introduces html_interface, a module to streamline the management of browser
+ windows.
+ - rscadd: Adds playing cards that utilize a new HTML window management system.
+ Vekter:
+ - rscadd: Added a new military jacket to the Autodrobe and ClothesMate.
+2015-06-28:
+ Ikarrus:
+ - rscadd: Gang Lieutenants can buy gang tools now, but at a higher cost than the
+ original boss
+ - rscadd: Gang leaders can register additional gangtools to themselves for use as
+ spares.
+ - tweak: Number of maximum lieutenants lowered to 2
+ - tweak: Pistol cost increased to 25 influence
+ - tweak: Uzi cost increased to 50 influence
+ - tweak: Uzi Ammo decreased to 20 influence
+ - rscadd: Overcoats added to items the biogenerator can produce.
+ - rscdel: Micro and Macro bomb implants are now restricted to the Nuclear game mode.
+ phil235:
+ - tweak: Smoke (and foam) no longer distribute more reagents than they have. The
+ amount of clouds in a smoke now depends on the amount of smoke created. Acid
+ no longer melts items on a mob at low volume, and the chances to melt them increases
+ with the amount applied on the mob. Sprays can now contain acid again.
+2015-06-29:
+ Ikarrus:
+ - rscadd: Clothing has been separated out of equipment lockers into wardrobes to
+ reduce clutter.
+ Incoming5643:
+ - rscadd: The secrets of the rainbow slimes have finally been revealed. To attain
+ this rare blob you must breed a slime with a 100% mutation chance!
+ - rscadd: Rainbow slime cores will generate a randomly colored slime when injected
+ with plasma. It's a good plan B if the slimes aren't cooperating in terms of
+ colors. You can get any color slime this way, pray to the RNG!
+ Xhuis:
+ - rscadd: The Sleeping Carp clan has made its presence known on Space Station 13.
+ Some gangs will name themselves after this group and practice martial arts rather
+ than using traditional gang weaponry. These shadowboxers are not to be taken
+ lightly.
+ oranges:
+ - tweak: Thanks to a breakthrough in directed vector thrusting, all nanotrasen
+ brand jetpacks have been greatly improved in speed and handling
diff --git a/html/changelogs/NullQuery-Nullstation.yml b/html/changelogs/NullQuery-Nullstation.yml
deleted file mode 100644
index 981bb1c1d36..00000000000
--- a/html/changelogs/NullQuery-Nullstation.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: NullQuery
-delete-after: True
-
-changes:
- - wip: "Introduces html_interface, a module to streamline the management of browser windows."
- - rscadd: "Adds playing cards that utilize a new HTML window management system."
diff --git a/html/changelogs/vekter-10159.yml b/html/changelogs/vekter-10159.yml
deleted file mode 100644
index f99d832a38c..00000000000
--- a/html/changelogs/vekter-10159.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscadd (general adding of nice things)
-# rscdel (general deleting of nice things)
-# imageadd
-# imagedel
-# spellcheck (typo fixes)
-# experiment
-# tgs (TG-ported fixes?)
-#################################
-
-# Your name.
-author: Vekter
-
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
-# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes:
- - rscadd: "Added a new military jacket to the Autodrobe and ClothesMate."
diff --git a/icons/effects/crayondecal.dmi b/icons/effects/crayondecal.dmi
index 0225a6349b6..668743204d6 100644
Binary files a/icons/effects/crayondecal.dmi and b/icons/effects/crayondecal.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 62170e230e6..5102b40d59e 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 6db0ab5709a..79dba919f26 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 83986fd1ae8..d0e6e69563b 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index bd9e5cc7e60..47a2d13262c 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi
index 3624a9b4bff..c2f7bfcc202 100644
Binary files a/icons/obj/wizard.dmi and b/icons/obj/wizard.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index e12b699a33c..f12e17995b7 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -155,6 +155,7 @@
#include "code\datums\hud.dm"
#include "code\datums\martial.dm"
#include "code\datums\mind.dm"
+#include "code\datums\mineral_container.dm"
#include "code\datums\modules.dm"
#include "code\datums\mutations.dm"
#include "code\datums\recipe.dm"
diff --git a/tools/mapmerge/MapPatcher.jar b/tools/mapmerge/MapMerge.jar
similarity index 72%
rename from tools/mapmerge/MapPatcher.jar
rename to tools/mapmerge/MapMerge.jar
index 5cbaad488c1..aa4a779ca5d 100644
Binary files a/tools/mapmerge/MapPatcher.jar and b/tools/mapmerge/MapMerge.jar differ
diff --git a/tools/mapmerge/prepare_map.bat b/tools/mapmerge/Prepare Maps.bat
similarity index 73%
rename from tools/mapmerge/prepare_map.bat
rename to tools/mapmerge/Prepare Maps.bat
index bfe1e6560e9..89e5a233ed2 100644
--- a/tools/mapmerge/prepare_map.bat
+++ b/tools/mapmerge/Prepare Maps.bat
@@ -7,6 +7,6 @@ cls
echo All dmm files in map_files directories have been backed up
echo Now you can make your changes...
echo ---
-echo Remember to run clean_map.bat just before you commit your changes!
+echo Remember to run Run_Map_Merge.bat just before you commit your changes!
echo ---
pause
diff --git a/tools/mapmerge/Run Map Merge.bat b/tools/mapmerge/Run Map Merge.bat
new file mode 100644
index 00000000000..2793b28a6b5
--- /dev/null
+++ b/tools/mapmerge/Run Map Merge.bat
@@ -0,0 +1,5 @@
+@echo off
+
+java -jar ../../tools/mapmerge/MapMerge.jar
+
+pause
\ No newline at end of file
diff --git a/tools/mapmerge/Source/.classpath b/tools/mapmerge/Source/.classpath
new file mode 100644
index 00000000000..a0cb530fa9d
--- /dev/null
+++ b/tools/mapmerge/Source/.classpath
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/tools/mapmerge/Source/.project b/tools/mapmerge/Source/.project
new file mode 100644
index 00000000000..df472fbdf11
--- /dev/null
+++ b/tools/mapmerge/Source/.project
@@ -0,0 +1,17 @@
+
+
+ MapMerger
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/tools/mapmerge/Source/.settings/org.eclipse.jdt.core.prefs b/tools/mapmerge/Source/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..3a21537071b
--- /dev/null
+++ b/tools/mapmerge/Source/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/tools/mapmerge/Source/META-INF/MANIFEST.MF b/tools/mapmerge/Source/META-INF/MANIFEST.MF
deleted file mode 100644
index 5aa53c2fa28..00000000000
--- a/tools/mapmerge/Source/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Created-By: 1.6.0_31 (Sun Microsystems Inc.)
-Main-Class: MapPatcher
-
diff --git a/tools/mapmerge/Source/bin/FileFinder.class b/tools/mapmerge/Source/bin/FileFinder.class
new file mode 100644
index 00000000000..ab01a656c45
Binary files /dev/null and b/tools/mapmerge/Source/bin/FileFinder.class differ
diff --git a/tools/mapmerge/Source/bin/MapMergerMain.class b/tools/mapmerge/Source/bin/MapMergerMain.class
new file mode 100644
index 00000000000..c563253301f
Binary files /dev/null and b/tools/mapmerge/Source/bin/MapMergerMain.class differ
diff --git a/tools/mapmerge/Source/src/FileFinder.java b/tools/mapmerge/Source/src/FileFinder.java
new file mode 100644
index 00000000000..0677b777843
--- /dev/null
+++ b/tools/mapmerge/Source/src/FileFinder.java
@@ -0,0 +1,25 @@
+import java.io.IOException;
+import java.nio.file.FileSystems;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Path;
+import java.nio.file.PathMatcher;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+
+public class FileFinder extends SimpleFileVisitor {
+ private PathMatcher matcher;
+ public ArrayList foundPaths = new ArrayList<>();
+ public FileFinder(String pattern) {
+ matcher = FileSystems.getDefault().getPathMatcher("glob:" + pattern);
+ }
+
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+ Path name = file.getFileName();
+ if (matcher.matches(name)) {
+ foundPaths.add(file);
+ }
+ return FileVisitResult.CONTINUE;
+ }
+}
\ No newline at end of file
diff --git a/tools/mapmerge/Source/src/MapMergerMain.java b/tools/mapmerge/Source/src/MapMergerMain.java
new file mode 100644
index 00000000000..0f38cc91ea5
--- /dev/null
+++ b/tools/mapmerge/Source/src/MapMergerMain.java
@@ -0,0 +1,57 @@
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Scanner;
+
+public class MapMergerMain {
+
+ private static Scanner input = new Scanner(System.in);
+
+ public static void main(String[] args) throws IOException{
+
+ System.out.print("Path to _maps folder: ");
+ String pathTo_maps = input.nextLine();
+ Path fileDir = Paths.get(pathTo_maps);
+ FileFinder finder = new FileFinder("*.dmm");
+ Files.walkFileTree(fileDir, finder);
+ ArrayList foundFiles = finder.foundPaths;
+ if (foundFiles.size() > 0) {
+ for(int num = 0;num < foundFiles.size();num++){
+ System.out.println(num + ": " + foundFiles.get(num));
+ }
+ }else{
+ System.out.println("No files were found!");
+ }
+ System.out.print("File to use: ");
+ int selection;
+ inputCheck:while(true){
+ while(!input.hasNextInt()){
+ String temp = input.next();
+ System.out.println(temp + " is not a valid int.");
+ }
+ selection = input.nextInt();
+ if(selection < 0 || selection >= foundFiles.size()){
+ if(selection < 0){
+ System.out.println("Use a number greater than 0!");
+ }else{
+ System.out.println("Use a number less than " + foundFiles.size() +"!");
+ }
+ continue inputCheck;
+ }else{
+ break inputCheck;
+ }
+ }
+
+ String newMap = foundFiles.get(selection) + "";
+ String oldMap = foundFiles.get(selection) + ".backup";
+ String[] passInto = new String[4];
+ passInto[0] = "-clean";
+ passInto[1] = oldMap;
+ passInto[2] = newMap;
+ passInto[3] = newMap;
+ MapPatcher.main(passInto);
+ }
+
+}
\ No newline at end of file
diff --git a/tools/mapmerge/Source/Location.java b/tools/mapmerge/Source/src/MapPatcher/Location.java
similarity index 100%
rename from tools/mapmerge/Source/Location.java
rename to tools/mapmerge/Source/src/MapPatcher/Location.java
diff --git a/tools/mapmerge/Source/Map.java b/tools/mapmerge/Source/src/MapPatcher/Map.java
similarity index 100%
rename from tools/mapmerge/Source/Map.java
rename to tools/mapmerge/Source/src/MapPatcher/Map.java
diff --git a/tools/mapmerge/Source/MapPatcher.java b/tools/mapmerge/Source/src/MapPatcher/MapPatcher.java
similarity index 100%
rename from tools/mapmerge/Source/MapPatcher.java
rename to tools/mapmerge/Source/src/MapPatcher/MapPatcher.java
diff --git a/tools/mapmerge/Source/SavingThread.java b/tools/mapmerge/Source/src/MapPatcher/SavingThread.java
similarity index 100%
rename from tools/mapmerge/Source/SavingThread.java
rename to tools/mapmerge/Source/src/MapPatcher/SavingThread.java
diff --git a/tools/mapmerge/clean_map.bat b/tools/mapmerge/clean_map.bat
deleted file mode 100644
index 8e1c9273d53..00000000000
--- a/tools/mapmerge/clean_map.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-cd ../../_maps/map_files/
-set /P MAPFILE=Please enter mapfile (relative to map_files folder):
-
-java -jar ../../tools/mapmerge/MapPatcher.jar -clean "%MAPFILE%.backup" "%MAPFILE%" "%MAPFILE%"
-
-pause
\ No newline at end of file
diff --git a/tools/mapmerge/install.txt b/tools/mapmerge/install.txt
deleted file mode 100644
index c225e68d706..00000000000
--- a/tools/mapmerge/install.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-1. Install java(http://www.java.com/en/download/index.jsp)
-2. Make sure java is in your PATH. To test this, open git bash, and type "java". If it says unknown command, you need to add JAVA/bin to your PATH variable (A guide for this can be found at https://www.java.com/en/download/help/path.xml ).
-
-Committing
-1. Before starting to edit the map, double-click "prepare_map.bat" in the tools/mapmerge/ directory.
-2. After finishing your edit, and before your commit, double-click "clean_map.bat" in the tools/mapmerge/ directory.
-
-This will make sure in the new version of your map, no paths are needlessly changed, thus instead of 8000 lines changed you'll get 50 lines changed. This not only reduces size of your commit, it also makes it possible to get an overview of your map changes on the "files changed" page in your pull request.
-
-Merging
-The easiest way to do merging is to install the merge driver. For this, you can just double-click "install_driver.bat" in the tools/mapmerge/ directory.
-
-Alternatively, open -tg-station/.git/config in a text editor, and paste the following lines to the end of it:
-
-[merge "merge-dmm"]
- name = mapmerge driver
- driver = ./tools/mapmerge/mapmerge.sh %O %A %B
-
-After this, merging maps should happen automagically unless there are conflicts(a tile that both you and someone else changed). If there are conflicts, you will unfortunately still be stuck with opening both versions in a map editor, and manually resolving the issues.
diff --git a/tools/mapmerge/install_driver.bat b/tools/mapmerge/install_driver.bat
deleted file mode 100644
index fa04dddff55..00000000000
--- a/tools/mapmerge/install_driver.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-echo. >> ../../.git/config
-echo [merge "merge-dmm"] >> ../../.git/config
-echo name = mapmerge driver >> ../../.git/config
-echo driver = ./tools/mapmerge/mapmerge.sh %O %A %B >> ../../.git/config
-echo. >> ../../.git/config
-
diff --git a/tools/mapmerge/mapmerge.sh b/tools/mapmerge/mapmerge.sh
deleted file mode 100644
index 145537f7ca7..00000000000
--- a/tools/mapmerge/mapmerge.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-java -jar tools/mapmerge/MapPatcher.jar -merge $1 $2 $3 $2
-if [ "$?" -gt 0 ]
-then
- echo "Unable to automatically resolve map conflicts, please merge manually."
- exit 1
-fi
-java -jar tools/mapmerge/MapPatcher.jar -clean $1 $2 $2
-
-exit 0