"
- if(src.cargo.len)
- for(var/obj/O in src.cargo)
+ if(cargo.len)
+ for(var/obj/O in cargo)
output += "
Unload : [O]
"
else
output += "Nothing"
@@ -159,12 +153,12 @@
/obj/mecha/working/ripley/Destroy()
for(var/mob/M in src)
- if(M==src.occupant)
+ if(M == occupant)
continue
M.loc = get_turf(src)
M.loc.Entered(M)
step_rand(M)
- for(var/atom/movable/A in src.cargo)
+ for(var/atom/movable/A in cargo)
A.loc = get_turf(src)
var/turf/T = get_turf(A)
if(T)
@@ -179,9 +173,9 @@
if(pressure < 20)
step_in = 3
- for(var/obj/item/mecha_parts/mecha_equipment/tool/drill/drill in equipment)
+ for(var/obj/item/mecha_parts/mecha_equipment/drill/drill in equipment)
drill.equip_cooldown = initial(drill.equip_cooldown)/2
else
step_in = 5
- for(var/obj/item/mecha_parts/mecha_equipment/tool/drill/drill in equipment)
+ for(var/obj/item/mecha_parts/mecha_equipment/drill/drill in equipment)
drill.equip_cooldown = initial(drill.equip_cooldown)
\ No newline at end of file
diff --git a/code/game/mecha/working/working.dm b/code/game/mecha/working/working.dm
index 7a59b6190ed..ccbfe2ef21b 100644
--- a/code/game/mecha/working/working.dm
+++ b/code/game/mecha/working/working.dm
@@ -4,29 +4,3 @@
/obj/mecha/working/New()
..()
new /obj/item/mecha_parts/mecha_tracking(src)
- return
-
-/*
-/obj/mecha/working/melee_action(atom/target as obj|mob|turf)
- if(internal_damage&MECHA_INT_CONTROL_LOST)
- target = pick(oview(1,src))
- if(selected_tool)
- selected_tool.action(target)
- return
-*/
-
-/obj/mecha/working/range_action(atom/target as obj|mob|turf)
- return
-
-/*
-/obj/mecha/working/get_stats_part()
- var/output = ..()
- output += "
[src.name] Tools:"
- if(equipment.len)
- for(var/obj/item/mecha_parts/mecha_equipment/MT in equipment)
- output += "[selected==MT?"
":""][MT.get_equip_info()][selected==MT?"":""]
"
- else
- output += "None"
- output += "
"
- return output
-*/
\ No newline at end of file
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index cead6e33ffd..4c61393d9f7 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -29,6 +29,11 @@
. = ..()
unbuckle_mob()
+/atom/movable/proc/has_buckled_mobs()
+ if(buckled_mob)
+ return TRUE
+ return FALSE
+
//procs that handle the actual buckling and unbuckling
/atom/movable/proc/buckle_mob(mob/living/M)
if(!can_buckle || !istype(M) || (M.loc != loc) || M.buckled || M.buckled_mob || buckled_mob || (buckle_requires_restraints && !M.restrained()) || M == src)
diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm
index d50d595d3ea..8835d31c6c2 100644
--- a/code/game/objects/effects/decals/remains.dm
+++ b/code/game/objects/effects/decals/remains.dm
@@ -1,7 +1,9 @@
+/obj/effect/decal/remains
+ gender = PLURAL
+
/obj/effect/decal/remains/human
name = "remains"
desc = "They look like human remains. They have a strange aura about them."
- gender = PLURAL
icon = 'icons/effects/blood.dmi'
icon_state = "remains"
anchored = 1
@@ -9,7 +11,6 @@
/obj/effect/decal/remains/xeno
name = "remains"
desc = "They look like the remains of something... alien. They have a strange aura about them."
- gender = PLURAL
icon = 'icons/effects/blood.dmi'
icon_state = "remainsxeno"
anchored = 1
@@ -17,7 +18,29 @@
/obj/effect/decal/remains/robot
name = "remains"
desc = "They look like the remains of something mechanical. They have a strange aura about them."
- gender = PLURAL
icon = 'icons/mob/robots.dmi'
icon_state = "remainsrobot"
- anchored = 1
\ No newline at end of file
+ anchored = 1
+
+/obj/effect/decal/remains/robot/New()
+ ..()
+ var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+
+/obj/effect/decal/remains/slime
+ name = "You shouldn't see this"
+ desc = "Noooooooooooooooooooooo"
+ icon = 'icons/effects/blood.dmi'
+ icon_state = "remains"
+ anchored = 1
+
+/obj/effect/decal/remains/slime/New()
+ ..()
+ var/datum/reagents/R = new/datum/reagents(5)
+ var/obj/effect/effect/water/W = new(get_turf(src))
+ W.reagents = R
+ R.my_atom = W
+ R.add_reagent("water", 5)
+ R.reaction(get_turf(src))
+ qdel(src)
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index cb52b56edb8..47b6c1bf57b 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -1232,13 +1232,13 @@ steam.start() -- spawns the effect
var/amount = 6.0
anchored = 1.0
mouse_opacity = 0
+
/obj/effect/sparkles/New()
..()
var/icon/I = new(src.icon,src.icon_state)
var/r = rand(0,255)
var/g = rand(0,255)
var/b = rand(0,255)
- log_to_dd("Colour , [r],[g],[b]")
I.Blend(rgb(r,g,b),ICON_MULTIPLY)
src.icon = I
playsound(src.loc, "sparks", 100, 1)
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 3a567518e42..ecb8590c103 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -13,7 +13,7 @@
switch(name) //some of these are probably obsolete
if("shuttle")
- log_debug("Obsolete landmark '[name]' at ([x],[y],[z])")
+ log_runtime(EXCEPTION("Obsolete landmark '[name]' at ([x],[y],[z])"), src)
qdel(src)
if("airtunnel_stop")
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index 35ed65ad0df..62760324f76 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -64,6 +64,13 @@
duration = 8
randomdir = 0
+/obj/effect/overlay/temp/kinetic_blast
+ name = "kinetic explosion"
+ icon = 'icons/obj/projectiles.dmi'
+ icon_state = "kinetic_blast"
+ layer = 4.1
+ duration = 4
+
/obj/effect/overlay/palmtree_r
name = "Palm tree"
icon = 'icons/misc/beach2.dmi'
diff --git a/code/game/objects/effects/spawners/windowspawner.dm b/code/game/objects/effects/spawners/windowspawner.dm
index d3d2822423d..a2517d093f8 100644
--- a/code/game/objects/effects/spawners/windowspawner.dm
+++ b/code/game/objects/effects/spawners/windowspawner.dm
@@ -12,7 +12,7 @@
var/turf/T = get_turf(src)
for(var/obj/structure/grille/G in get_turf(src))
// Complain noisily
- log_debug("Extra grille on turf: ([T.x],[T.y],[T.z])")
+ log_runtime(EXCEPTION("Extra grille on turf: ([T.x],[T.y],[T.z])"), src)
qdel(G) //just in case mappers don't know what they are doing
if(!useFull)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 82412c8e883..a764cf54fc0 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -564,4 +564,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
clean_blood()
user.visible_message("
[user] washes [src] using [source].", \
"
You wash [src] using [source].")
- return 1
\ No newline at end of file
+ return 1
+
+/obj/item/proc/is_crutch() //Does an item prop up a human mob and allow them to stand if they are missing a leg/foot?
+ return 0
\ No newline at end of file
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 9f0388bc8cd..9c03d164bb2 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -12,7 +12,7 @@
attack_verb = list("attacked", "coloured")
var/colour = "#FF0000" //RGB
var/drawtype = "rune"
- var/list/graffiti = list("body","amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","up","down","left","right","heart","borgsrogue","voxpox","shitcurity","catbeast","hieroglyphs1","hieroglyphs2","hieroglyphs3","security","syndicate1","syndicate2","nanotrasen","lie","valid")
+ var/list/graffiti = list("body","amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","up","down","left","right","heart","borgsrogue","voxpox","shitcurity","catbeast","hieroglyphs1","hieroglyphs2","hieroglyphs3","security","syndicate1","syndicate2","nanotrasen","lie","valid","arrowleft","arrowright","arrowup","arrowdown","chicken","hailcrab","brokenheart","peace","scribble","scribble2","scribble3","skrek","squish","tunnelsnake","yip","youaredead")
var/list/letters = list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z")
var/uses = 30 //0 for unlimited uses
var/instant = 0
@@ -92,19 +92,19 @@
if(uses)
uses--
if(!uses)
- to_chat(user, "
You used up your [src.name]!")
+ to_chat(user, "
You used up your [name]!")
qdel(src)
return
/obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob)
var/huffable = istype(src,/obj/item/toy/crayon/spraycan)
if(M == user)
- to_chat(user, "You take a [huffable ? "huff" : "bite"] of the [src.name]. Delicious!")
+ to_chat(user, "You take a [huffable ? "huff" : "bite"] of the [name]. Delicious!")
user.nutrition += 5
if(uses)
uses -= 5
if(uses <= 0)
- to_chat(user, "
There is no more of [src.name] left!")
+ to_chat(user, "
There is no more of [name] left!")
qdel(src)
else
..()
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 9dec685efb8..664bd07f8ad 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -53,6 +53,8 @@
var/max_uses = 20
var/uses = 0
+ var/shards = 0
+ var/recycle = 3
var/emagged = 0
var/failmsg = ""
// How much to increase per each glass?
@@ -68,7 +70,7 @@
/obj/item/device/lightreplacer/examine(mob/user)
if(..(user, 2))
- to_chat(user, "It has [uses] lights remaining.")
+ to_chat(user, "It has [uses] lights and [shards] shards remaining.")
/obj/item/device/lightreplacer/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/stack/sheet/glass))
@@ -89,14 +91,46 @@
if(istype(W, /obj/item/weapon/light))
var/obj/item/weapon/light/L = W
if(L.status == 0) // LIGHT OKAY
+ if(!user.drop_item())
+ to_chat(user, "[L] is stuck to your hand!")
+ return
if(uses < max_uses)
AddUses(1)
to_chat(user, "You insert the [L.name] into the [src.name]. You have [uses] lights remaining.")
user.drop_item()
qdel(L)
return
- else
- to_chat(user, "You need a working light.")
+ else if(L.status == 2 || L.status == 3)
+ if(!user.drop_item())
+ to_chat(user, "[L] is stuck to your hand!")
+ return
+ else
+ AddShards(1)
+ to_chat(user, "You insert [L] into [src]. You have [shards] shards remaining.")
+ user.drop_item()
+ qdel(L)
+ return
+
+ if(istype(W, /obj/item/weapon/storage))
+ var/obj/item/weapon/storage/S = W
+ var/found_lightbulbs = 0
+
+ for(var/obj/item/I in S.contents)
+ if(istype(I,/obj/item/weapon/light))
+ var/obj/item/weapon/light/L = I
+ found_lightbulbs = 1
+ if(uses >= max_uses)
+ to_chat(user, "
[src] is full!")
+ break
+ if(L.status == 0)
+ AddUses(1)
+ qdel(L)
+ else if(L.status == 2 || L.status == 3)
+ AddShards(1)
+ qdel(L)
+ to_chat(user, "
You fill [src] with lights from [S].")
+ if(!found_lightbulbs)
+ to_chat(user, "[S] contains no bulbs.")
return
/obj/item/device/lightreplacer/emag_act(user as mob)
@@ -128,6 +162,14 @@
/obj/item/device/lightreplacer/proc/AddUses(var/amount = 1)
uses = min(max(uses + amount, 0), max_uses)
+/obj/item/device/lightreplacer/proc/AddShards(amount = 1)
+ shards += amount
+ var/recycled_lights = round(shards / recycle)
+ if(recycled_lights > 0)
+ AddUses(recycled_lights)
+ shards = shards % recycle
+ return recycled_lights
+
/obj/item/device/lightreplacer/proc/Charge(var/mob/user)
charge += 1
if(charge > 7)
@@ -206,4 +248,4 @@
#undef LIGHT_OK
#undef LIGHT_EMPTY
#undef LIGHT_BROKEN
-#undef LIGHT_BURNED
\ No newline at end of file
+#undef LIGHT_BURNED
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index b1fd67a43de..74a32ebfe19 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -277,7 +277,7 @@ var/global/list/default_medbay_channels = list(
..()
/mob/living/automatedannouncer/proc/autocleanup()
- log_debug("An announcer somehow managed to outlive the radio! Deleting! Area: [get_area(src)], Name: \"[name]\", Message: \"[message]\"")
+ log_runtime(EXCEPTION("An announcer somehow managed to outlive the radio! Deleting!"), src, list("Message: '[message]'"))
qdel(src)
// Interprets the message mode when talking into a radio, possibly returning a connection datum
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index bfbd0a4ccb6..f5b3650c5bb 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -129,3 +129,11 @@
turf_type = /turf/simulated/floor/silent
mineralType = "tranquillite"
materials = list(MAT_TRANQUILLITE=500)
+
+//Pod floor
+/obj/item/stack/tile/pod
+ name = "pod floor tile"
+ singular_name = "pod floor tile"
+ desc = "A grooved floor tile."
+ icon_state = "tile_pod"
+ turf_type = /turf/simulated/floor/pod
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index d14c48a761e..150cbf2ee4b 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -352,7 +352,7 @@
if(ghost && !ghost.client)
// In case the ghost's not getting deleted for some reason
H.key = ghost.key
- log_to_dd("Ghost of name [ghost.name] is bound to [H.real_name], but lacks a client. Deleting ghost.")
+ log_runtime(EXCEPTION("Ghost of name [ghost.name] is bound to [H.real_name], but lacks a client. Deleting ghost."), src)
qdel(ghost)
ghost = null
@@ -499,7 +499,7 @@
if(ghost && !ghost.client)
// In case the ghost's not getting deleted for some reason
H.key = ghost.key
- log_to_dd("Ghost of name [ghost.name] is bound to [H.real_name], but lacks a client. Deleting ghost.")
+ log_runtime(EXCEPTION("Ghost of name [ghost.name] is bound to [H.real_name], but lacks a client. Deleting ghost."), H)
qdel(ghost)
ghost = null
diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm
index 0b090581595..6399a11c291 100644
--- a/code/game/objects/items/weapons/dice.dm
+++ b/code/game/objects/items/weapons/dice.dm
@@ -1,16 +1,49 @@
-/obj/item/weapon/dice
- name = "d6"
+/obj/item/weapon/storage/pill_bottle/dice
+ name = "bag of dice"
+ desc = "Contains all the luck you'll ever need."
+ icon = 'icons/obj/dice.dmi'
+ icon_state = "dicebag"
+
+/obj/item/weapon/storage/pill_bottle/dice/New()
+ ..()
+ var/special_die = pick("1","2","fudge","00","100")
+ if(special_die == "1")
+ new /obj/item/weapon/dice/d1(src)
+ if(special_die == "2")
+ new /obj/item/weapon/dice/d2(src)
+ new /obj/item/weapon/dice/d4(src)
+ new /obj/item/weapon/dice/d6(src)
+ if(special_die == "fudge")
+ new /obj/item/weapon/dice/fudge(src)
+ new /obj/item/weapon/dice/d8(src)
+ new /obj/item/weapon/dice/d10(src)
+ if(special_die == "00")
+ new /obj/item/weapon/dice/d00(src)
+ new /obj/item/weapon/dice/d12(src)
+ new /obj/item/weapon/dice/d20(src)
+ if(special_die == "100")
+ new /obj/item/weapon/dice/d100(src)
+
+/obj/item/weapon/dice //depreciated d6, use /obj/item/weapon/dice/d6 if you actually want a d6
+ name = "die"
desc = "A die with six sides. Basic and servicable."
icon = 'icons/obj/dice.dmi'
icon_state = "d6"
w_class = 1
var/sides = 6
var/result = null
+ var/list/special_faces = list() //entries should match up to sides var if used
/obj/item/weapon/dice/New()
result = rand(1, sides)
update_icon()
+/obj/item/weapon/dice/d1
+ name = "d1"
+ desc = "A die with one side. Deterministic!"
+ icon_state = "d1"
+ sides = 1
+
/obj/item/weapon/dice/d2
name = "d2"
desc = "A die with two sides. Coins are undignified!"
@@ -23,6 +56,16 @@
icon_state = "d4"
sides = 4
+/obj/item/weapon/dice/d6
+ name = "d6"
+
+/obj/item/weapon/dice/fudge
+ name = "fudge die"
+ desc = "A die with six sides but only three results. Is this a plus or a minus? Your mind is drawing a blank..."
+ sides = 3 //shhh
+ icon_state = "fudge"
+ special_faces = list("minus","blank","plus")
+
/obj/item/weapon/dice/d8
name = "d8"
desc = "A die with eight sides. It feels... lucky."
@@ -53,6 +96,15 @@
icon_state = "d20"
sides = 20
+/obj/item/weapon/dice/d100
+ name = "d100"
+ desc = "A die with one hundred sides! Probably not fairly weighted..."
+ icon_state = "d100"
+ sides = 100
+
+/obj/item/weapon/dice/d100/update_icon()
+ return
+
/obj/item/weapon/dice/d20/e20
var/triggered = 0
@@ -64,8 +116,9 @@
return
diceroll(user)
-/obj/item/weapon/dice/proc/diceroll(mob/user as mob)
+/obj/item/weapon/dice/proc/diceroll(mob/user)
result = rand(1, sides)
+ var/fake_result = rand(1, sides)//Daredevil isn't as good as he used to be
var/comment = ""
if(sides == 20 && result == 20)
comment = "Nat 20!"
@@ -74,20 +127,14 @@
update_icon()
if(initial(icon_state) == "d00")
result = (result - 1)*10
+ if(special_faces.len == sides)
+ result = special_faces[result]
if(user != null) //Dice was rolled in someone's hand
user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \
"You throw [src]. It lands on [result]. [comment]", \
- "You hear [src] landing on [result]. [comment]")
+ "You hear [src] rolling, it sounds like a [fake_result].")
else if(src.throwing == 0) //Dice was thrown and is coming to rest
visible_message("[src] rolls to a stop, landing on [result]. [comment]")
-/*
-/obj/item/weapon/dice/d4/Crossed(var/mob/living/carbon/human/H)
- if(istype(H) && !H.shoes)
- to_chat(H, "You step on the D4!")
- H.apply_damage(4,BRUTE,(pick("l_leg", "r_leg")))
- H.Weaken(3)
-*///ew.
-
/obj/item/weapon/dice/d20/e20/diceroll(mob/user as mob, thrown)
if(triggered)
@@ -112,6 +159,7 @@
/obj/item/weapon/dice/update_icon()
overlays.Cut()
overlays += "[src.icon_state][src.result]"
+
/obj/item/weapon/storage/box/dice
name = "Box of dice"
desc = "ANOTHER ONE!? FUCK!"
diff --git a/code/game/objects/items/weapons/holosign.dm b/code/game/objects/items/weapons/holosign.dm
index 5912a055a34..dac93f9cb04 100644
--- a/code/game/objects/items/weapons/holosign.dm
+++ b/code/game/objects/items/weapons/holosign.dm
@@ -11,7 +11,7 @@
throw_range = 7
origin_tech = "programming=3"
var/list/signs = list()
- var/max_signs = 10
+ var/max_signs = 20
/obj/item/weapon/holosign_creator/afterattack(atom/target, mob/user, flag)
if(flag)
@@ -45,4 +45,4 @@
desc = "The words flicker as if they mean nothing."
icon = 'icons/obj/janitor.dmi'
icon_state = "holosign"
- anchored = 1
\ No newline at end of file
+ anchored = 1
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index ada15a3b108..600ff934a8f 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -9,6 +9,7 @@
throwforce = 10
w_class = 1
var/reskinned = FALSE
+ var/reskin_selectable = TRUE //set to FALSE if a subtype is meant to not normally be available as a reskin option (fluff ones will get re-added through their list)
var/list/fluff_transformations = list() //does it have any special transformations only accessible to it? Should only be subtypes of /obj/item/weapon/nullrod
/obj/item/weapon/nullrod/suicide_act(mob/user)
@@ -31,7 +32,11 @@
reskin_holy_weapon(user)
/obj/item/weapon/nullrod/proc/reskin_holy_weapon(mob/M)
- var/list/holy_weapons_list = typesof(/obj/item/weapon/nullrod) - typesof(/obj/item/weapon/nullrod/fluff)
+ var/list/holy_weapons_list = typesof(/obj/item/weapon/nullrod)
+ for(var/entry in holy_weapons_list)
+ var/obj/item/weapon/nullrod/variant = entry
+ if(!initial(variant.reskin_selectable))
+ holy_weapons_list -= variant
if(fluff_transformations.len)
for(var/thing in fluff_transformations)
holy_weapons_list += thing
@@ -57,10 +62,13 @@
M.put_in_active_hand(holy_weapon)
qdel(src)
+/obj/item/weapon/nullrod/fluff //fluff subtype to be used for all donator nullrods
+ reskin_selectable = FALSE
+
/obj/item/weapon/nullrod/godhand
+ name = "god hand"
icon_state = "disintegrate"
item_state = "disintegrate"
- name = "god hand"
desc = "This hand of yours glows with an awesome power!"
flags = ABSTRACT | NODROP
w_class = 5
@@ -69,9 +77,9 @@
attack_verb = list("punched", "cross countered", "pummeled")
/obj/item/weapon/nullrod/staff
+ name = "red holy staff"
icon_state = "godstaff-red"
item_state = "godstaff-red"
- name = "red holy staff"
desc = "It has a mysterious, protective aura."
w_class = 5
force = 5
@@ -84,9 +92,9 @@
item_state = "godstaff-blue"
/obj/item/weapon/nullrod/claymore
+ name = "holy claymore"
icon_state = "claymore"
item_state = "claymore"
- name = "holy claymore"
desc = "A weapon fit for a crusade!"
w_class = 4
slot_flags = SLOT_BACK|SLOT_BELT
@@ -102,26 +110,26 @@
return ..()
/obj/item/weapon/nullrod/claymore/darkblade
+ name = "dark blade"
icon_state = "cultblade"
item_state = "cultblade"
- name = "dark blade"
desc = "Spread the glory of the dark gods!"
slot_flags = SLOT_BELT
hitsound = 'sound/hallucinations/growl1.ogg'
/obj/item/weapon/nullrod/claymore/chainsaw_sword
+ name = "sacred chainsaw sword"
icon_state = "chainswordon"
item_state = "chainswordon"
- name = "sacred chainsaw sword"
desc = "Suffer not a heretic to live."
slot_flags = SLOT_BELT
attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
hitsound = 'sound/weapons/chainsaw.ogg'
/obj/item/weapon/nullrod/claymore/glowing
+ name = "force weapon"
icon_state = "swordon"
item_state = "swordon"
- name = "force weapon"
desc = "The blade glows with the power of faith. Or possibly a battery."
slot_flags = SLOT_BELT
@@ -171,9 +179,9 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
/obj/item/weapon/nullrod/scythe
+ name = "reaper scythe"
icon_state = "scythe0"
item_state = "scythe0"
- name = "reaper scythe"
desc = "Ask not for whom the bell tolls..."
w_class = 4
armour_penetration = 35
@@ -184,16 +192,16 @@
hitsound = 'sound/weapons/bladeslice.ogg'
/obj/item/weapon/nullrod/scythe/vibro
+ name = "high frequency blade"
icon_state = "hfrequency0"
item_state = "hfrequency1"
- name = "high frequency blade"
desc = "Bad references are the DNA of the soul."
attack_verb = list("chopped", "sliced", "cut", "zandatsu'd")
/obj/item/weapon/nullrod/scythe/talking
+ name = "possessed blade"
icon_state = "talking_sword"
item_state = "talking_sword"
- name = "possessed blade"
desc = "When the station falls into chaos, it's nice to have a friend by your side."
attack_verb = list("chopped", "sliced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -212,7 +220,7 @@
if(candidates.len)
theghost = pick(candidates)
- var/mob/living/simple_animal/shade/S = new(src)
+ var/mob/living/simple_animal/shade/sword/S = new(src)
S.real_name = name
S.name = name
S.ckey = theghost.ckey
@@ -227,16 +235,16 @@
possessed = FALSE
/obj/item/weapon/nullrod/scythe/talking/Destroy()
- for(var/mob/living/simple_animal/shade/S in contents)
+ for(var/mob/living/simple_animal/shade/sword/S in contents)
to_chat(S, "You were destroyed!")
S.ghostize()
qdel(S)
return ..()
/obj/item/weapon/nullrod/hammmer
+ name = "relic war hammer"
icon_state = "hammeron"
item_state = "hammeron"
- name = "relic war hammer"
desc = "This war hammer cost the chaplain fourty thousand space dollars."
slot_flags = SLOT_BELT
w_class = 5
@@ -255,10 +263,10 @@
hitsound = 'sound/weapons/chainsaw.ogg'
/obj/item/weapon/nullrod/clown
+ name = "clown dagger"
icon = 'icons/obj/wizard.dmi'
icon_state = "clownrender"
item_state = "gold_horn"
- name = "clown dagger"
desc = "Used for absolutely hilarious sacrifices."
hitsound = 'sound/items/bikehorn.ogg'
sharp = 1
@@ -342,9 +350,9 @@
item_state = "bostaff0"
/obj/item/weapon/nullrod/tribal_knife
+ name = "arrhythmic knife"
icon_state = "crysknife"
item_state = "crysknife"
- name = "arrhythmic knife"
w_class = 5
desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn."
sharp = 1
@@ -366,9 +374,9 @@
slowdown = rand(-2, 2)
/obj/item/weapon/nullrod/pitchfork
+ name = "unholy pitchfork"
icon_state = "pitchfork0"
item_state = "pitchfork0"
- name = "unholy pitchfork"
w_class = 3
desc = "Holding this makes you look absolutely devilish."
attack_verb = list("poked", "impaled", "pierced", "jabbed")
@@ -377,9 +385,9 @@
edge = 1
/obj/item/weapon/nullrod/rosary
+ name = "prayer beads"
icon_state = "rosary"
item_state = null
- name = "prayer beads"
desc = "A set of prayer beads used by many of the more traditional religions in space.
Vampires and other unholy abominations have learned to fear these."
force = 0
throwforce = 0
@@ -445,5 +453,122 @@
if(prob(10))
to_chat(M, "Being in the presence of [holder]'s [src] is interfering with your powers!")
+/obj/item/weapon/nullrod/missionary_staff
+ name = "holy staff"
+ desc = "It has a mysterious, protective aura."
+ description_antag = "This seemingly standard holy staff is actually a disguised neurotransmitter capable of inducing blind zealotry in its victims. It must be allowed to recharge in the presence of a linked set of missionary robes. Activate the staff while wearing robes to link, then aim the staff at your victim to try and convert them."
+ reskinned = TRUE
+ reskin_selectable = FALSE
+ icon_state = "godstaff-red"
+ item_state = "godstaff-red"
+ w_class = 5
+ force = 5
+ slot_flags = SLOT_BACK
+ block_chance = 50
+ var/team_color = "red"
+ var/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/robes = null //the robes linked with this staff
+ var/faith = 99 //a conversion requires 100 faith to attempt. faith recharges over time while you are wearing missionary robes that have been linked to the staff.
+/obj/item/weapon/nullrod/missionary_staff/New()
+ team_color = pick("red", "blue")
+ icon_state = "godstaff-[team_color]"
+ item_state = "godstaff-[team_color]"
+ name = "[team_color] holy staff"
+
+/obj/item/weapon/nullrod/missionary_staff/Destroy()
+ if(robes) //delink on destruction
+ robes.linked_staff = null
+ robes = null
+ return ..()
+
+/obj/item/weapon/nullrod/missionary_staff/attack_self(mob/user)
+ if(robes) //as long as it is linked, sec can't try to meta by stealing your staff and seeing if they get the link error message
+ return 0
+ if(!ishuman(user)) //prevents the horror (runtimes) of missionary xenos and other non-human mobs that might be able to activate the item
+ return 0
+ var/mob/living/carbon/human/missionary = user
+ if(missionary.wear_suit && istype(missionary.wear_suit, /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe))
+ var/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/robe_to_link = missionary.wear_suit
+ if(robe_to_link.linked_staff)
+ to_chat(missionary, "These robes are already linked with a staff and cannot support another. Connection refused.")
+ return 0
+ robes = robe_to_link
+ robes.linked_staff = src
+ to_chat(missionary, "Link established. Faith generators initialized. Go spread the word.")
+ faith = 100 //full charge when a fresh link is made (can't be delinked without destroying the robes so this shouldn't be an exploitable thing)
+ return 1
+ else
+ to_chat(missionary, "You must be wearing the missionary robes you wish to link with this staff.")
+ return 0
+
+/obj/item/weapon/nullrod/missionary_staff/afterattack(mob/living/carbon/human/target, mob/living/carbon/human/missionary, flag, params)
+ if(!istype(target) || !istype(missionary)) //ishuman checks effectively
+ return
+ if(target == missionary) //you can't convert yourself, that would raise too many questions about your own dedication to the cause
+ return
+ if(!robes) //staff must be linked to convert
+ to_chat(missionary, "You must link your staff to a set of missionary robes before attempting conversions.")
+ return
+ if(!missionary.wear_suit || missionary.wear_suit != robes) //must be wearing the robes to convert
+ return
+ if(faith < 100)
+ to_chat(missionary, "You don't have enough faith to attempt a conversion right now.")
+ return
+ to_chat(missionary, "You concentrate on [target] and begin the conversion ritual...")
+ if(!target.mind) //no mind means no conversion, but also means no faith lost.
+ to_chat(missionary, "You halt the conversion as you realize [target] is mindless! Best to save your faith for someone more worthwhile.")
+ return
+ if(do_after(missionary, 40)) //4 seconds to temporarily convert, roughly 1 second faster than a vampire's enthrall ability
+ if(faith < 100) //to stop people from trying to exploit the do_after system to multi-convert, we check again if you have enough faith when it completes
+ to_chat(missionary, "You don't have enough faith to complete the conversion on [target]!")
+ return
+ if(missionary in viewers(target)) //missionary must maintain line of sight to target, but the target doesn't necessary need to be able to see the missionary
+ do_convert(target, missionary)
+ else
+ to_chat(missionary, "You lost sight of the target before they could be converted!")
+ faith -= 25 //they escaped, so you only lost a little faith (to prevent spamming)
+ else //the do_after failed, probably because you moved or dropped the staff
+ to_chat(missionary, "Your concentration was broken!")
+
+/obj/item/weapon/nullrod/missionary_staff/proc/do_convert(mob/living/carbon/human/target, mob/living/carbon/human/missionary)
+ var/convert_duration = 6000 //10 min
+ if(!target || !istype(target) || !missionary || !istype(missionary))
+ return
+ if(ismindslave(target) || target.mind.zealot_master) //mindslaves and zealots override the staff because the staff is just a temporary mindslave
+ to_chat(missionary, "Your faith is strong, but their mind is already slaved to someone else's ideals. Perhaps an inquisition would reveal more...")
+ faith -= 25 //same faith cost as losing sight of them mid-conversion, but did you just find someone who can lead you to a fellow traitor?
+ return
+ if(isloyal(target))
+ if(prob(20)) //loyalty implants typically overpower this, but you CAN get lucky and convert still (20% chance of success)
+ faith -= 125 //yes, this puts it negative. it's gonna take longer to recharge if you manage to convert a one of these people to balance the new power you gained through them
+ to_chat(missionary, "Through sheer willpower, you overcome their closed mind and rally [target] to your cause! You may need a bit longer than usual before your faith is fully recharged, and they won't remain loyal to you for long ...")
+ convert_duration = 3000 //5 min, because the loyalty implant will attempt to counteract the subversion
+ else //80% chance to fail
+ faith -= 75
+ to_chat(missionary, "Your faith is strong, but their mind remains closed to your ideals. Your resolve helps you retain a bit of faith though.")
+ return
+ else if(target.mind.assigned_role == "Psychiatrist" || target.mind.assigned_role == "Librarian") //fancy book lernin helps counter religion (day 0 job love, what madness!)
+ if(prob(35)) //35% chance to fail
+ to_chat(missionary, "This one is well trained in matters of the mind... They will not be swayed as easily as you thought...")
+ faith -=50 //lose half your faith to the book-readers
+ return
+ else
+ to_chat(missionary, "You successfully convert [target] to your cause. The following grows because of your faith!")
+ faith -= 100
+ else if(target.mind.assigned_role == "Civilian")
+ if(prob(55)) //55% chance to take LESS faith than normal, because civies are stupid and easily manipulated
+ to_chat(missionary, "Your message seems to resound well with [target]; converting them was much easier than expected.")
+ faith -= 50
+ else //45% chance to take the normal 100 faith cost
+ to_chat(missionary, "You successfully convert [target] to your cause. The following grows because of your faith!")
+ faith -= 100
+ else //everyone else takes 100 faith cost because they are normal
+ to_chat(missionary, "You successfully convert [target] to your cause. The following grows because of your faith!")
+ faith -= 100
+ //if you made it this far: congratulations! you are now a religious zealot!
+ target.mind.make_zealot(missionary, convert_duration, team_color)
+
+ target << sound('sound/misc/wololo.ogg', 0, 1, 25)
+ missionary.say("WOLOLO!")
+ missionary << sound('sound/misc/wololo.ogg', 0, 1, 25)
diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/implants/implant_explosive.dm
index 23d35d59995..c02c3ba9fcc 100644
--- a/code/game/objects/items/weapons/implants/implant_explosive.dm
+++ b/code/game/objects/items/weapons/implants/implant_explosive.dm
@@ -133,6 +133,8 @@
/obj/item/weapon/implant/dust
name = "duster implant"
desc = "An alarm which monitors host vital signs, transmitting a radio message and dusting the corpse on death."
+ icon = 'icons/effects/blood.dmi'
+ icon_state = "remains"
/obj/item/weapon/implant/dust/get_data()
var/dat = {"Implant Specifications:
diff --git a/code/game/objects/items/weapons/implants/implant_traitor.dm b/code/game/objects/items/weapons/implants/implant_traitor.dm
index 65aa155c8cb..bb80d50845d 100644
--- a/code/game/objects/items/weapons/implants/implant_traitor.dm
+++ b/code/game/objects/items/weapons/implants/implant_traitor.dm
@@ -45,21 +45,21 @@
return -1
H.implanting = 1
to_chat(H, "You feel completely loyal to [user.name].")
- if(!(user.mind in ticker.mode:implanter))
- ticker.mode:implanter[ref] = list()
- implanters = ticker.mode:implanter[ref]
+ if(!(user.mind in ticker.mode.implanter))
+ ticker.mode.implanter[ref] = list()
+ implanters = ticker.mode.implanter[ref]
implanters.Add(H.mind)
ticker.mode.implanted.Add(H.mind)
ticker.mode.implanted[H.mind] = user.mind
- //ticker.mode:implanter[user.mind] += H.mind
- ticker.mode:implanter[ref] = implanters
+ //ticker.mode.implanter[user.mind] += H.mind
+ ticker.mode.implanter[ref] = implanters
ticker.mode.traitors += H.mind
H.mind.special_role = SPECIAL_ROLE_TRAITOR
to_chat(H, "You're now completely loyal to [user.name]! You now must lay down your life to protect them and assist in their goals at any cost.")
var/datum/objective/protect/mindslave/MS = new
MS.owner = H.mind
- MS.target = user:mind
- MS.explanation_text = "Obey every order from and protect [user:real_name], the [user:mind:assigned_role=="MODE" ? (user:mind:special_role) : (user:mind:assigned_role)]."
+ MS.target = user.mind
+ MS.explanation_text = "Obey every order from and protect [user.real_name], the [user.mind.assigned_role=="MODE" ? (user.mind.special_role) : (user.mind.assigned_role)]."
H.mind.objectives += MS
for(var/datum/objective/objective in H.mind.objectives)
to_chat(H, "Objective #1: [objective.explanation_text]")
diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm
index 2ff41257ea1..c230c033437 100644
--- a/code/game/objects/items/weapons/misc.dm
+++ b/code/game/objects/items/weapons/misc.dm
@@ -34,6 +34,9 @@
materials = list(MAT_METAL=50)
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
+/obj/item/weapon/cane/is_crutch()
+ return 1
+
/obj/item/weapon/c_tube
name = "cardboard tube"
desc = "A tube... of cardboard."
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 12219eadd0b..06bb11dd59e 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -73,13 +73,13 @@
/obj/item/weapon/mop/advanced
desc = "The most advanced tool in a custodian's arsenal. Just think of all the viscera you will clean up with this!"
name = "advanced mop"
- mopcap = 10
+ mopcap = 15
icon_state = "advmop"
item_state = "mop" //meh will do for now until TG makes one
force = 6
throwforce = 8
throw_range = 4
- mopspeed = 20
+ mopspeed = 10
/obj/item/weapon/mop/advanced/cyborg
mopcap = 40
@@ -90,4 +90,4 @@
/obj/item/weapon/mop/advanced/cyborg/examine(mob/user)
..(user)
- to_chat(user, "The mop's water tank has [round(reagents.get_reagent_amount("water"))] units of water left.")
\ No newline at end of file
+ to_chat(user, "The mop's water tank has [round(reagents.get_reagent_amount("water"))] units of water left.")
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 395d27d0300..937cc3214a3 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -33,7 +33,7 @@
icon_state = "trashbag"
item_state = "trashbag"
- w_class = 4
+ w_class = 1
max_w_class = 2
storage_slots = 30
can_hold = list() // any
@@ -46,12 +46,17 @@
/obj/item/weapon/storage/bag/trash/update_icon()
if(contents.len == 0)
+ w_class = 1
icon_state = "[initial(icon_state)]"
else if(contents.len < 12)
+ w_class = 4
icon_state = "[initial(icon_state)]1"
else if(contents.len < 21)
+ w_class = 4
icon_state = "[initial(icon_state)]2"
- else icon_state = "[initial(icon_state)]3"
+ else
+ w_class = 4
+ icon_state = "[initial(icon_state)]3"
/obj/item/weapon/storage/bag/trash/cyborg
@@ -499,4 +504,4 @@
max_combined_w_class = 200
w_class = 1
can_hold = list("/obj/item/slime_extract","/obj/item/weapon/reagent_containers/food/snacks/monkeycube","/obj/item/weapon/reagent_containers/syringe","/obj/item/weapon/reagent_containers/glass/beaker","/obj/item/weapon/reagent_containers/glass/bottle","/obj/item/weapon/reagent_containers/blood","/obj/item/weapon/reagent_containers/hypospray/autoinjector")
- burn_state = FLAMMABLE
\ No newline at end of file
+ burn_state = FLAMMABLE
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index c3a92c3ce48..96699998193 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -447,6 +447,7 @@
icon_state = "sheath"
item_state = "sheath"
storage_slots = 1
+ w_class = 4
max_w_class = 4
can_hold = list("/obj/item/weapon/melee/rapier")
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index 03ba6bed54b..67d44c53b2d 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -276,16 +276,6 @@
new /obj/item/weapon/reagent_containers/food/pill/charcoal( src )
new /obj/item/weapon/reagent_containers/food/pill/charcoal( src )
-/obj/item/weapon/storage/pill_bottle/dice
- name = "pack of dice"
- desc = "It's a small container with dice inside."
-
- New()
- ..()
- new /obj/item/weapon/dice( src )
- new /obj/item/weapon/dice/d20( src )
-
-
/obj/item/weapon/storage/pill_bottle/painkillers
name = "Pill Bottle (Salicylic Acid)"
desc = "Contains various pills for minor pain relief."
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index c34b392430e..40f56f7000f 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -576,5 +576,5 @@
if(islist(thing))
list_to_object(thing, src)
else
- log_debug("Non-list thing: [thing]. We are a [name]")
+ log_runtime(EXCEPTION("Non-list thing found in storage/deserialize."), src, list("Thing: [thing]"))
..()
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index ac994fe4b77..e3f21a93d30 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -77,8 +77,7 @@
new /obj/item/weapon/melee/energy/sword/saber(src)
new /obj/item/weapon/melee/energy/sword/saber(src)
new /obj/item/weapon/dnainjector/telemut/darkbundle(src)
- new /obj/item/clothing/head/chaplain_hood(src)
- new /obj/item/clothing/suit/chaplain_hoodie(src)
+ new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
new /obj/item/weapon/card/id/syndicate(src)
return
@@ -205,3 +204,16 @@
..()
new /obj/item/weapon/grenade/clusterbuster/plasma(src)
new /obj/item/weapon/grenade/clusterbuster/n2o(src)
+
+/obj/item/weapon/storage/box/syndie_kit/missionary_set
+ name = "Missionary Starter Kit"
+
+/obj/item/weapon/storage/box/syndie_kit/missionary_set/New()
+ ..()
+ new /obj/item/weapon/nullrod/missionary_staff(src)
+ new /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe(src)
+ var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible(src)
+ if(prob(25)) //an omen of success to come?
+ B.deity_name = "Success"
+ B.icon_state = "greentext"
+ B.item_state = "greentext"
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index 55f7c4d5eb8..e6fcf144013 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -79,6 +79,9 @@
item_state = "cane_nt"
needs_permit = 0
+/obj/item/weapon/melee/classic_baton/ntcane/is_crutch()
+ return 1
+
//Telescopic baton
/obj/item/weapon/melee/classic_baton/telescopic
name = "telescopic baton"
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 4ec1b1587c8..d498109b2dd 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -83,7 +83,7 @@
icon = loc
if(!in_range(src, user))
if(icon == src)
- to_chat(user, "\blue It's \a [bicon(icon)][src]! If you want any more information you'll need to get closer.")
+ to_chat(user, "It's \a [bicon(icon)][src]! If you want any more information you'll need to get closer.")
return
var/celsius_temperature = air_contents.temperature-T0C
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 1452273573a..176108b8f08 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -241,12 +241,20 @@
if(!(S.status & ORGAN_ROBOT) || user.a_intent != I_HELP || S.open == 2)
return ..()
+ if(!isOn()) //why wasn't this being checked already?
+ to_chat(user, "Turn on [src] before attempting repairs!")
+ return 1
+
if(S.brute_dam)
if(S.brute_dam < ROBOLIMB_SELF_REPAIR_CAP)
- if(remove_fuel(0,null))
- playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
- S.heal_damage(15,0,0,1)
- user.visible_message("\The [user] patches some dents on \the [M]'s [S.name] with \the [src].")
+ if(get_fuel() >= 1)
+ if(H == user)
+ if(!do_mob(user, H, 10))
+ return 1
+ if(remove_fuel(1,null))
+ playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+ S.heal_damage(15,0,0,1)
+ user.visible_message("\The [user] patches some dents on \the [M]'s [S.name] with \the [src].")
else if(S.open != 2)
to_chat(user, "Need more welding fuel!")
return 1
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index da21397529d..8e9424c4997 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -82,13 +82,6 @@
user.put_in_inactive_hand(O)
return
-/obj/item/weapon/twohanded/mob_can_equip(mob/M, slot)
- //Cannot equip wielded items.
- if(wielded)
- to_chat(M, "Unwield the [name] first!")
- return 0
- return ..()
-
/obj/item/weapon/twohanded/dropped(mob/user)
..()
//handles unwielding a twohanded weapon when dropped as well as clearing up the offhand
@@ -108,6 +101,12 @@
else //Trying to wield it
wield(user)
+
+/obj/item/weapon/twohanded/equip_to_best_slot(mob/M)
+ if(..())
+ unwield(M)
+ return
+
///////////OFFHAND///////////////
/obj/item/weapon/twohanded/offhand
w_class = 5
@@ -130,8 +129,8 @@
return
/obj/item/weapon/twohanded/required/mob_can_equip(M as mob, slot)
- if(wielded)
- to_chat(M, "[src.name] is too cumbersome to carry with anything but your hands!")
+ if(wielded && !slot_flags)
+ to_chat(M, "[src] is too cumbersome to carry with anything but your hands!")
return 0
return ..()
@@ -140,12 +139,18 @@
if(get_dist(src,user) > 1)
return 0
if(H != null)
- to_chat(user, "[src.name] is too cumbersome to carry in one hand!")
+ to_chat(user, "[src] is too cumbersome to carry in one hand!")
return
- var/obj/item/weapon/twohanded/offhand/O = new(user)
- user.put_in_inactive_hand(O)
+ if(loc != user)
+ wield(user)
..()
- wielded = 1
+
+/obj/item/weapon/twohanded/required/equipped(mob/user, slot)
+ ..()
+ if(slot == slot_l_hand || slot == slot_r_hand)
+ wield(user)
+ else
+ unwield(user)
/*
* Fireaxe
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 1831b983f2c..ed0092cf60d 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -65,7 +65,10 @@
/obj/structure/closet/proc/moveMob(var/mob/M, var/atom/destination)
loc.Exited(M)
M.loc = destination
- loc.Entered(M, ignoreRest = 1)
+ if(isturf(loc))
+ loc.Entered(M, src, ignoreRest = 1)
+ else
+ loc.Entered(M, src)
for(var/atom/movable/AM in loc)
if(istype(AM, /obj/item))
continue
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index 3fda5f8c603..c2401919497 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -89,12 +89,6 @@
new /obj/item/weapon/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
-/obj/structure/closet/firecloset/update_icon()
- if(!opened)
- icon_state = icon_closed
- else
- icon_state = icon_opened
-
/*
* Tool Closet
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index d84e879dbe0..9bca4dc0a75 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -25,7 +25,8 @@
/obj/structure/girder/proc/take_damage(var/amount)
health -= amount
- if(health < 0)
+ if(health <= 0)
+ new /obj/item/stack/sheet/metal(get_turf(src))
qdel(src)
/obj/structure/girder/attackby(obj/item/W as obj, mob/user as mob, params)
@@ -188,15 +189,10 @@
qdel(src)
/obj/structure/girder/bullet_act(var/obj/item/projectile/Proj)
- if(istype(Proj, /obj/item/projectile/beam))
- health -= Proj.damage
- ..()
- if(health <= 0)
- new /obj/item/stack/sheet/metal(get_turf(src))
- qdel(src)
-
if(istype(Proj ,/obj/item/projectile/beam/pulse))
src.ex_act(2)
+ else
+ take_damage(Proj.damage)
..()
return 0
diff --git a/code/game/response_team.dm b/code/game/response_team.dm
index 9e5605c3b28..81e800a2b00 100644
--- a/code/game/response_team.dm
+++ b/code/game/response_team.dm
@@ -173,9 +173,10 @@ var/ert_request_answered = 0
head_organ.r_hair = hex2num(copytext(hair_c, 2, 4))
head_organ.g_hair = hex2num(copytext(hair_c, 4, 6))
head_organ.b_hair = hex2num(copytext(hair_c, 6, 8))
- M.r_eyes = hex2num(copytext(eye_c, 2, 4))
- M.g_eyes = hex2num(copytext(eye_c, 4, 6))
- M.b_eyes = hex2num(copytext(eye_c, 6, 8))
+ var/eyes_red = hex2num(copytext(eye_c, 2, 4))
+ var/eyes_green = hex2num(copytext(eye_c, 4, 6))
+ var/eyes_blue = hex2num(copytext(eye_c, 6, 8))
+ M.change_eye_color(eyes_red, eyes_green, eyes_blue)
M.s_tone = skin_tone
head_organ.h_style = hair_style
head_organ.f_style = facial_hair_style
diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm
index 3bce2fcfe3d..a247e35a86f 100644
--- a/code/game/turfs/simulated.dm
+++ b/code/game/turfs/simulated.dm
@@ -54,17 +54,16 @@
/turf/simulated/Entered(atom/A, atom/OL, ignoreRest = 0)
..()
if(!ignoreRest)
- if(ismob(A)) //only mobs make dirt
- if(prob(80))
- dirt++
+ if(isliving(A) && prob(50))
+ dirt++
- var/obj/effect/decal/cleanable/dirt/dirtoverlay = locate(/obj/effect/decal/cleanable/dirt) in src
- if(dirt >= 100)
- if(!dirtoverlay)
- dirtoverlay = new/obj/effect/decal/cleanable/dirt(src)
- dirtoverlay.alpha = 10
- else if(dirt > 100)
- dirtoverlay.alpha = min(dirtoverlay.alpha + 10, 200)
+ var/obj/effect/decal/cleanable/dirt/dirtoverlay = locate(/obj/effect/decal/cleanable/dirt) in src
+ if(dirt >= 100)
+ if(!dirtoverlay)
+ dirtoverlay = new/obj/effect/decal/cleanable/dirt(src)
+ dirtoverlay.alpha = 10
+ else if(dirt > 100)
+ dirtoverlay.alpha = min(dirtoverlay.alpha + 10, 200)
if(ishuman(A))
var/mob/living/carbon/human/M = A
@@ -117,6 +116,8 @@
if(!..())
return 0
+ if(!istype(M)) // To avoid non-humans from causing runtimes whena dding blood to the floor
+ return 0
var/obj/effect/decal/cleanable/blood/B = locate() in contents //check for existing blood splatter
if(!B)
blood_splatter(src,M.get_blood(M.vessel),1)
@@ -138,4 +139,4 @@
. = ..()
smooth_icon_neighbors(src)
-/turf/simulated/proc/is_shielded()
\ No newline at end of file
+/turf/simulated/proc/is_shielded()
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index 6d59513e761..576ac6f993e 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -26,4 +26,5 @@
/turf/simulated/wall/r_wall/coated //Coated for heat resistance
name = "coated reinforced wall"
desc = "A huge chunk of reinforced metal used to seperate rooms. It seems to have additional plating to protect against heat."
+ icon = 'icons/turf/walls/coated_reinforced_wall.dmi'
max_temperature = INFINITY
\ No newline at end of file
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index fb10d23ae9c..c8c454383ea 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -213,21 +213,21 @@
/turf/space/proc/set_transition_north(dest_z)
destination_x = x
- destination_y = TRANSITIONEDGE + 2
+ destination_y = TRANSITION_BORDER_SOUTH + 1
destination_z = dest_z
/turf/space/proc/set_transition_south(dest_z)
destination_x = x
- destination_y = world.maxy - TRANSITIONEDGE - 2
+ destination_y = TRANSITION_BORDER_NORTH - 1
destination_z = dest_z
/turf/space/proc/set_transition_east(dest_z)
- destination_x = TRANSITIONEDGE + 2
+ destination_x = TRANSITION_BORDER_WEST + 1
destination_y = y
destination_z = dest_z
/turf/space/proc/set_transition_west(dest_z)
- destination_x = world.maxx - TRANSITIONEDGE - 2
+ destination_x = TRANSITION_BORDER_EAST - 1
destination_y = y
destination_z = dest_z
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 5946ef77f0a..3a04a11f9e6 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -200,6 +200,9 @@
levelupdate()
CalculateAdjacentTurfs()
+ if(air_master && !ignore_air)
+ air_master.add_to_active(src)
+
if(!keep_cabling && !can_have_cabling())
for(var/obj/structure/cable/C in contents)
qdel(C)
diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm
index 3027864ace6..c22a019addb 100644
--- a/code/modules/admin/DB ban/functions.dm
+++ b/code/modules/admin/DB ban/functions.dm
@@ -113,7 +113,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
else
adminwho += ", [C]"
- reason = sql_sanitize_text(reason)
+ reason = sanitizeSQL(reason)
if(maxadminbancheck)
var/DBQuery/adm_query = dbcon.NewQuery("SELECT count(id) AS num FROM [format_table_name("ban")] WHERE (a_ckey = '[a_ckey]') AND (bantype = 'ADMIN_PERMABAN' OR (bantype = 'ADMIN_TEMPBAN' AND expiration_time > Now())) AND isnull(unbanned)")
@@ -244,14 +244,14 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
to_chat(usr, "Invalid ban id. Contact the database admin")
return
- reason = sql_sanitize_text(reason)
+ reason = sanitizeSQL(reason)
var/value
switch(param)
if("reason")
if(!value)
value = input("Insert the new reason for [pckey]'s ban", "New Reason", "[reason]", null) as null|text
- value = sql_sanitize_text(value)
+ value = sanitizeSQL(value)
if(!value)
to_chat(usr, "Cancelled")
return
@@ -417,8 +417,8 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
adminckey = ckey(adminckey)
playerckey = ckey(playerckey)
- playerip = sql_sanitize_text(playerip)
- playercid = sql_sanitize_text(playercid)
+ playerip = sanitizeSQL(playerip)
+ playercid = sanitizeSQL(playercid)
if(adminckey || playerckey || playerip || playercid || dbbantype)
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index b8a1bda8c4c..30b8c8bb8e9 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -893,9 +893,6 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space
toArea = locate(/area/shuttle/gamma/space)
fromArea.move_contents_to(toArea)
- for(var/turf/simulated/floor/mech_bay_recharge_floor/F in toArea)
- F.init_devices()
-
for(var/obj/machinery/power/apc/A in toArea)
A.init()
diff --git a/code/modules/admin/banappearance.dm b/code/modules/admin/banappearance.dm
index b039f6bd634..06deaa1c461 100644
--- a/code/modules/admin/banappearance.dm
+++ b/code/modules/admin/banappearance.dm
@@ -92,18 +92,3 @@ DEBUG
appearance_savebanfile()
return 1
return 0
-
-/*
-proc/DB_ban_isappearancebanned(var/playerckey)
- establish_db_connection()
- if(!dbcon.IsConnected())
- return
-
- var/sqlplayerckey = sql_sanitize_text(ckey(playerckey))
-
- var/DBQuery/query = dbcon.NewQuery("SELECT id FROM [format_table_name("ban")] WHERE CKEY = '[sqlplayerckey]' AND ((bantype = 'APPEARANCE_BAN') OR (bantype = 'APPEARANCE_TEMPBAN' AND expiration_time > Now())) AND unbanned != 1")
- query.Execute()
- while(query.NextRow())
- return 1
- return 0
-*/
\ No newline at end of file
diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm
index 1f385093683..f95d5094446 100644
--- a/code/modules/admin/banjob.dm
+++ b/code/modules/admin/banjob.dm
@@ -77,7 +77,7 @@ DEBUG
if(jobban_regex.Find(s))
jobban_assoc_insert(jobban_regex.group[1], jobban_regex.group[2], jobban_regex.group[3])
else
- log_debug("Skipping malformed job ban: [s]")
+ log_runtime(EXCEPTION("Skipping malformed job ban: [s]"))
else
if(!establish_db_connection())
log_to_dd("Database connection failed. Reverting to the legacy ban system.")
@@ -132,9 +132,9 @@ DEBUG
if(jobban_assoclist[ckey] && jobban_assoclist[ckey][rank])
jobban_assoclist[ckey] -= rank
else
- log_debug("Attempted to remove non-existent job ban: [X]")
+ log_runtime(EXCEPTION("Attempted to remove non-existent job ban: [X]"))
else
- log_debug("Failed to remove malformed job ban from associative list: [X]")
+ log_runtime(EXCEPTION("Failed to remove malformed job ban from associative list: [X]"))
jobban_keylist.Remove(jobban_keylist[i])
if(config.ban_legacy_system)
jobban_savebanfile()
diff --git a/code/modules/admin/buildmode.dm b/code/modules/admin/buildmode.dm
index f08121634d3..87721320af5 100644
--- a/code/modules/admin/buildmode.dm
+++ b/code/modules/admin/buildmode.dm
@@ -86,7 +86,7 @@
cl = c
cl.images += I
else
- log_debug("Buildmode reticule created without a client!")
+ log_runtime(EXCEPTION("Buildmode reticule created without a client!"), src)
/obj/effect/buildmode_reticule/proc/deselect()
qdel(src)
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 512e2393f83..4234ea2773c 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -530,10 +530,6 @@
if(ticker.mode.greyshirts.len)
dat += check_role_table("Greyshirts", ticker.mode.greyshirts)
- var/datum/game_mode/mutiny/mutiny = get_mutiny_mode()
- if(mutiny)
- dat += mutiny.check_antagonists_ui(src)
-
dat += "