You can now communicate in the changeling hivemind, say \":g message\" to communicate!"
+ target.reagents.add_reagent("salbutamol", 40) // So they don't choke to death while you interrogate them
+ sleep(1800)
+ feedback_add_details("changeling_powers","A [i]")
+ if(!do_mob(user, target, 20))
+ user << "Our link with [target] has ended!"
+ changeling.islinking = 0
+ target.mind.linglink = 0
+ return
+
+ changeling.islinking = 0
+ target.mind.linglink = 0
+ user << "You cannot sustain the connection any longer, your victim fades from the hivemind"
+ target << "The link cannot be sustained any longer, your connection to the hivemind has faded!"
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index e5cc534da09..2b35c5df6b7 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -68,7 +68,7 @@
restricted_jobs += "Assistant"
//cult scaling goes here
- recommended_enemies = 3 + round(num_players()/20)
+ recommended_enemies = 3 + round(num_players()/15)
for(var/cultists_number = 1 to recommended_enemies)
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index fd97b4f73a8..64b6e1c6517 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -759,7 +759,7 @@ var/list/teleport_runes = list()
var/mob/living/user = invokers[1]
var/list/cultists = list()
for(var/datum/mind/M in ticker.mode.cult)
- if(!(M.current in invokers))
+ if(!(M.current in invokers) && M.current.stat != DEAD)
cultists |= M.current
var/mob/living/cultist_to_summon = input(user, "Who do you wish to call to [src]?", "Followers of the Geometer") as null|anything in cultists
if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated())
@@ -769,10 +769,15 @@ var/list/teleport_runes = list()
fail_invoke()
log_game("Summon Cultist rune failed - no target")
return
+ if(cultist_to_summon.stat == DEAD)
+ user << "[cultist_to_summon] has died!"
+ fail_invoke()
+ log_game("Summon Cultist rune failed - target died")
+ return
if(!iscultist(cultist_to_summon))
user << "[cultist_to_summon] is not a follower of the Geometer!"
fail_invoke()
- log_game("Summon Cultist rune failed - no target")
+ log_game("Summon Cultist rune failed - target was deconverted")
return
if(cultist_to_summon.z > ZLEVEL_SPACEMAX)
user << "[cultist_to_summon] is not in our dimension!"
diff --git a/code/game/gamemodes/demon/demon_game_mode.dm b/code/game/gamemodes/demon/demon_game_mode.dm
index 06856715515..5a0c26cde94 100644
--- a/code/game/gamemodes/demon/demon_game_mode.dm
+++ b/code/game/gamemodes/demon/demon_game_mode.dm
@@ -36,9 +36,9 @@
var/trueName= randomDevilName()
var/datum/objective/devil/soulquantity/soulquant = new
soulquant.owner = devil_mind
- var/datum/objective/devil/soulquality/soulqual = new
- soulqual.owner = devil_mind
- devil_mind.objectives += soulqual
+ var/datum/objective/devil/obj_2 = pick(new /datum/objective/devil/soulquality(null), new /datum/objective/devil/sintouch(null))
+ obj_2.owner = devil_mind
+ devil_mind.objectives += obj_2
devil_mind.objectives += soulquant
devil_mind.devilinfo = devilInfo(trueName, 1)
devil_mind.store_memory("Your devilic true name is [devil_mind.devilinfo.truename]
[lawlorify[LAW][devil_mind.devilinfo.ban]]
[lawlorify[LAW][devil_mind.devilinfo.bane]]
[lawlorify[LAW][devil_mind.devilinfo.obligation]]
[lawlorify[LAW][devil_mind.devilinfo.banish]]
")
diff --git a/code/game/gamemodes/demon/demoninfo.dm b/code/game/gamemodes/demon/demoninfo.dm
index 5c013496cac..b35fa604711 100644
--- a/code/game/gamemodes/demon/demoninfo.dm
+++ b/code/game/gamemodes/demon/demoninfo.dm
@@ -299,12 +299,12 @@ var/global/list/lawlorify = list (
owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_pitchfork/greater(null))
owner.AddSpell(new /obj/effect/proc_holder/spell/dumbfire/fireball/hellish(null))
owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/infernal_jaunt(null))
- //owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/sintouch(null)) TODO LORDPIDEY add this spell
+ owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/sintouch(null))
/datum/devilinfo/proc/give_arch_spells()
remove_spells()
owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_pitchfork/ascended(null))
- //owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/sintouch/ascended(null)) TODO LORDPIDEY
+ owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/sintouch/ascended(null))
/datum/devilinfo/proc/beginResurrectionCheck(mob/living/body)
if(SOULVALUE>0)
diff --git a/code/game/gamemodes/demon/objectives.dm b/code/game/gamemodes/demon/objectives.dm
index bdcac75b8e2..0a9d7083e92 100644
--- a/code/game/gamemodes/demon/objectives.dm
+++ b/code/game/gamemodes/demon/objectives.dm
@@ -6,7 +6,7 @@
var/quantity = 4
/datum/objective/devil/soulquantity/New()
- quantity = pick(4,5)
+ quantity = pick(6,8)
explanation_text = "Purchase, and retain control over at least [quantity] souls."
/datum/objective/devil/soulquantity/check_completion()
diff --git a/code/game/gamemodes/demon/true_demon/_true_demon.dm b/code/game/gamemodes/demon/true_demon/_true_demon.dm
index 36d491df5f9..3b725896d61 100644
--- a/code/game/gamemodes/demon/true_demon/_true_demon.dm
+++ b/code/game/gamemodes/demon/true_demon/_true_demon.dm
@@ -90,13 +90,11 @@
/mob/living/carbon/true_devil/IsAdvancedToolUser()
return 1
-
/mob/living/carbon/true_devil/canUseTopic()
if(stat)
return
return 1
-
/mob/living/carbon/true_devil/assess_threat()
return 666
@@ -193,3 +191,6 @@
/mob/living/carbon/true_devil/handle_breathing()
// devils do not need to breathe
+
+/mob/living/carbon/true_devil/is_literate()
+ return 1
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 8a14dfe1a10..b10374a2dbf 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -425,7 +425,7 @@ This is here to make the tiles around the station mininuke change when it's arme
/obj/item/weapon/disk/nuclear/process()
var/turf/disk_loc = get_turf(src)
- if(disk_loc.z > ZLEVEL_CENTCOM)
+ if(!disk_loc || disk_loc.z > ZLEVEL_CENTCOM)
get(src, /mob) << "You can't help but feel that you just lost something back there..."
qdel(src)
@@ -438,10 +438,10 @@ This is here to make the tiles around the station mininuke change when it's arme
M.remove_from_mob(src)
if(istype(loc, /obj/item/weapon/storage))
var/obj/item/weapon/storage/S = loc
- S.remove_from_storage(src, diskturf)
+ S.remove_from_storage(src, targetturf)
forceMove(targetturf) //move the disc, so ghosts remain orbitting it even if it's "destroyed"
- message_admins("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z] - JMP). Moving it to ([targetturf.x], [targetturf.y], [targetturf.z] - JMP).")
- log_game("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z]). Moving it to ([targetturf.x], [targetturf.y], [targetturf.z]).")
+ message_admins("[src] has been destroyed in ([diskturf ? "[diskturf.x], [diskturf.y] ,[diskturf.z] - JMP":"nonexistent location"]). Moving it to ([targetturf.x], [targetturf.y], [targetturf.z] - JMP).")
+ log_game("[src] has been destroyed in ([diskturf ? "[diskturf.x], [diskturf.y] ,[diskturf.z]":"nonexistent location"]). Moving it to ([targetturf.x], [targetturf.y], [targetturf.z]).")
else
throw EXCEPTION("Unable to find a blobstart landmark")
return QDEL_HINT_LETMELIVE //Cancel destruction regardless of success
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 253c17eeeb0..ec0f8298d81 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -94,7 +94,7 @@
qdel(src)
/obj/machinery/sleeper/MouseDrop_T(mob/target, mob/user)
- if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target))
+ if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser())
return
close_machine(target)
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index c3847474e60..9ab089a34ff 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -94,36 +94,35 @@
return
interact(user)
-/obj/machinery/computer/mech_bay_power_console/interact(mob/user)
- var/data
- if(!recharge_port)
- data += "No recharging port detected.
"
- data += "Reconnect"
- else
- data += "Mech status
"
- if(!recharge_port.recharging_mech)
- data += "No mech detected.
"
- else
- data += "Integrity: [recharge_port.recharging_mech.health]
"
+/obj/machinery/computer/mech_bay_power_console/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = default_state)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "mech_bay_power_console", "Mech Bay Power Control Console", 400, 170, master_ui, state)
+ ui.open()
- if(!recharge_port.recharging_mech.cell)
- data += "WARNING : the mech cell is missing!
"
- else if(recharge_port.recharging_mech.cell.crit_fail)
- data += "WARNING : the mech cell seems faulty!"
- else
- data += "Power: [recharge_port.recharging_mech.cell.charge]/[recharge_port.recharging_mech.cell.maxcharge]"
-
- var/datum/browser/popup = new(user, "mech recharger", name, 300, 300)
- popup.set_content(data)
- popup.open()
- return
-
-/obj/machinery/computer/mech_bay_power_console/Topic(href, href_list)
+/obj/machinery/computer/mech_bay_power_console/ui_act(action, params)
if(..())
return
- if(href_list["reconnect"])
- reconnect()
- updateUsrDialog()
+ switch(action)
+ if("reconnect")
+ reconnect()
+ . = TRUE
+ update_icon()
+
+/obj/machinery/computer/mech_bay_power_console/ui_data(mob/user)
+ var/list/data = list()
+ if(recharge_port && !qdeleted(recharge_port))
+ data["recharge_port"] = list("mech" = null)
+ if(recharge_port.recharging_mech && !qdeleted(recharge_port.recharging_mech))
+ data["recharge_port"]["mech"] = list("health" = recharge_port.recharging_mech.health, "maxhealth" = initial(recharge_port.recharging_mech.health), "cell" = null)
+ if(recharge_port.recharging_mech.cell && !qdeleted(recharge_port.recharging_mech.cell))
+ data["recharge_port"]["mech"]["cell"] = list(
+ "critfail" = recharge_port.recharging_mech.cell.crit_fail,
+ "charge" = recharge_port.recharging_mech.cell.charge,
+ "maxcharge" = recharge_port.recharging_mech.cell.maxcharge
+ )
+ return data
+
/obj/machinery/computer/mech_bay_power_console/proc/reconnect()
if(recharge_port)
@@ -142,11 +141,6 @@
else
recharge_port = null
-/obj/machinery/computer/mech_bay_power_console/process()
- if(recharge_port && recharge_port.recharging_mech && recharge_port.recharging_mech.cell)
- updateDialog()
-
-
/obj/machinery/computer/mech_bay_power_console/update_icon()
..()
if(!recharge_port || !recharge_port.recharging_mech || !recharge_port.recharging_mech.cell || !(recharge_port.recharging_mech.cell.charge < recharge_port.recharging_mech.cell.maxcharge) || stat & (NOPOWER|BROKEN))
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 9d365cbf546..9aa4f99e644 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -301,7 +301,7 @@ MASS SPECTROMETER
else
user << "Plasma: [round(plasma_concentration*100, 0.01)] %"
- if(bz_concentration > 0.005)
+ if(bz_concentration > 0.01)
user << "Hallucinogen: [round(plasma_concentration*100, 0.01)] %"
else
user << "Hallucinogen: [round(plasma_concentration*100, 0.01)] %"
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index b722c70fb6d..688a5ebc37a 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -72,7 +72,7 @@ effective or pretty fucking useless.
name = "health analyzer"
icon_state = "health"
item_state = "analyzer"
- desc = "A hand-held body scanner able to distinguish vital signs of the subject. A strange microlaser is hooked on to the scanning end."
+ desc = "A hand-held body scanner able to distinguish vital signs of the subject."
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 3
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 5da6f3aaaa7..745d27a0e5c 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -258,3 +258,13 @@
/obj/structure/grille/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)
return 0
+
+/obj/structure/grille/broken // Pre-broken grilles for map placement
+ icon_state = "brokengrille"
+ density = 0
+ health = 0
+ destroyed = 1
+
+/obj/structure/grille/broken/New()
+ ..()
+ stored.amount = 1
\ No newline at end of file
diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm
index ceaab94ab26..7f192fce020 100644
--- a/code/game/verbs/suicide.dm
+++ b/code/game/verbs/suicide.dm
@@ -9,6 +9,7 @@
return
if(confirm == "Yes")
suiciding = 1
+ log_game("[key_name(src)] (job: [job ? "[job]" : "None"]) commited suicide at [get_area(src)].")
var/obj/item/held_item = get_active_hand()
if(held_item)
var/damagetype = held_item.suicide_act(src)
diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm
index 5188750f085..754e9310d8b 100644
--- a/code/modules/atmospherics/gasmixtures/gas_types.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_types.dm
@@ -28,6 +28,7 @@ var/list/hardcoded_gases = list("o2","n2","co2","plasma") //the main four gases,
var/name = ""
var/gas_overlay = "" //icon_state in icons/effects/tile_effects.dmi
var/moles_visible = null
+ var/dangerous_concentration = 0 // levels at which Bad Shit(tm) starts to happen
/datum/gas/oxygen
id = "o2"
@@ -43,6 +44,7 @@ var/list/hardcoded_gases = list("o2","n2","co2","plasma") //the main four gases,
id = "co2"
specific_heat = 30
name = "Carbon Dioxide"
+ dangerous_concentration = 0.01
/datum/gas/plasma
id = "plasma"
@@ -50,6 +52,7 @@ var/list/hardcoded_gases = list("o2","n2","co2","plasma") //the main four gases,
name = "Plasma"
gas_overlay = "plasma"
moles_visible = MOLES_PLASMA_VISIBLE
+ dangerous_concentration = 0.005
/datum/gas/nitrous_oxide
id = "n2o"
@@ -72,6 +75,7 @@ var/list/hardcoded_gases = list("o2","n2","co2","plasma") //the main four gases,
id = "bz"
specific_heat = 20
name = "BZ"
+ dangerous_concentration = 0.01
/obj/effect/overlay/gas/
icon = 'icons/effects/tile_effects.dmi'
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 93cb87e4d1e..4b8791c3400 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -76,6 +76,7 @@
"co2" = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
"plasma" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
"n2o" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
+ "bz" = new/datum/tlv(-1, -1, 0.2, 0.5)
)
/obj/machinery/airalarm/server // No checks here.
@@ -87,6 +88,7 @@
"co2" = new/datum/tlv(-1, -1, -1, -1),
"plasma" = new/datum/tlv(-1, -1, -1, -1),
"n2o" = new/datum/tlv(-1, -1, -1, -1),
+ "bz" = new/datum/tlv(-1, -1, -1, -1),
)
/obj/machinery/airalarm/kitchen_cold_room // Copypasta: to check temperatures.
@@ -98,6 +100,7 @@
"co2" = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
"plasma" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
"n2o" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
+ "bz" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
)
//all air alarms in area are connected via magic
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index cdd0e0fea57..0198186a411 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -161,7 +161,7 @@
user << "[src] seems empty."
/obj/machinery/atmospherics/components/unary/cryo_cell/MouseDrop_T(mob/target, mob/user)
- if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target))
+ if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser())
return
close_machine(target)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 0de25cc3366..6aa577594d7 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -206,7 +206,7 @@
/obj/item/clothing/head/helmet/skull
name = "skull helmet"
desc = "An intimidating tribal helmet, it doesn't look very comfortable."
- flags_inv = HIDEEARS|HIDEHAIR
+ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES
armor = list(melee = 25, bullet = 25, laser = 25, energy = 10, bomb = 10, bio = 5, rad = 20)
icon_state = "skull"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 2d80c678690..228ba63a9c7 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -105,7 +105,7 @@
item_state = "bonearmor"
blood_overlay_type = "armor"
armor = list(melee = 35, bullet = 25, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
- body_parts_covered = CHEST
+ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS
/obj/item/clothing/suit/armor/bulletproof
name = "bulletproof armor"
diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm
index fa324c1886c..6fa698d12d2 100644
--- a/code/modules/detectivework/detective_work.dm
+++ b/code/modules/detectivework/detective_work.dm
@@ -47,80 +47,59 @@
//world.log << "Added fibertext: [fibertext]"
suit_fibers += "Material from a pair of [M.gloves.name]."
+
/atom/proc/add_hiddenprint(mob/living/M)
- if(isnull(M)) return
- if(isnull(M.key)) return
+ if(!M || !M.key)
+ return
+
+ if(!fingerprintshidden) //Add the list if it does not exist
+ fingerprintshidden = list()
+
+ var/hasgloves = ""
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.gloves)
- if(fingerprintslast != H.ckey)
- fingerprintshidden += "\[[time_stamp()]\] (Wearing gloves). Real name: [H.real_name], Key: [H.key]"
- fingerprintslast = H.ckey
- return 0
- if(!fingerprints)
- if(fingerprintslast != H.ckey)
- fingerprintshidden += "\[[time_stamp()]\] Real name: [H.real_name], Key: [H.key]"
- fingerprintslast = H.ckey
- return 1
+ hasgloves = "(gloves)"
+
+ var/current_time = time_stamp()
+ if(!fingerprintshidden[M.key])
+ fingerprintshidden[M.key] = "First: [M.real_name]\[[current_time]\][hasgloves]."
else
- if(fingerprintslast != M.ckey)
- fingerprintshidden += "\[[time_stamp()]\] Real name: [M.real_name], Key: [M.key]"
- fingerprintslast = M.ckey
- return
+ var/laststamppos = findtext(fingerprintshidden[M.key], " Last: ")
+ if(laststamppos)
+ fingerprintshidden[M.key] = copytext(fingerprintshidden[M.key], 1, laststamppos)
+ fingerprintshidden[M.key] += " Last: [M.real_name]\[[current_time]\][hasgloves]."
+
+ fingerprintslast = M.ckey
+
//Set ignoregloves to add prints irrespective of the mob having gloves on.
/atom/proc/add_fingerprint(mob/living/M, ignoregloves = 0)
- if(isnull(M)) return
- if(isnull(M.key)) return
+ if(!M || !M.key)
+ return
+
+ add_hiddenprint(M)
+
if(ishuman(M))
var/mob/living/carbon/human/H = M
- //Add the list if it does not exist.
- if(!fingerprintshidden)
- fingerprintshidden = list()
- //Fibers~
add_fibers(H)
- //Now, lets get to the dirty work.
-
- //Check if the gloves (if any) hide fingerprints
- if(H.gloves)
+ if(H.gloves) //Check if the gloves (if any) hide fingerprints
var/obj/item/clothing/gloves/G = H.gloves
if(G.transfer_prints)
ignoregloves = 1
- //Now, deal with gloves.
- if(!ignoregloves)
- if(H.gloves && H.gloves != src)
- if(fingerprintslast != H.ckey)
- fingerprintshidden += text("\[[]\](Wearing gloves). Real name: [], Key: []",time_stamp(), H.real_name, H.key)
- fingerprintslast = H.ckey
- H.gloves.add_fingerprint(M)
- return 0
+ if(!ignoregloves)
+ H.gloves.add_fingerprint(H, 1) //ignoregloves = 1 to avoid infinite loop.
+ return
- //More adminstuffz
- if(fingerprintslast != H.ckey)
- fingerprintshidden += text("\[[]\]Real name: [], Key: []",time_stamp(), H.real_name, H.key)
- fingerprintslast = H.ckey
-
- //Make the list if it does not exist.
- if(!fingerprints)
+ if(!fingerprints) //Add the list if it does not exist
fingerprints = list()
-
- //Hash this shit.
var/full_print = md5(H.dna.uni_identity)
-
- // Add the fingerprints
fingerprints[full_print] = full_print
- return 1
- else
- //Smudge up dem prints some
- if(fingerprintslast != M.ckey)
- fingerprintshidden += text("\[[]\]Real name: [], Key: []",time_stamp(), M.real_name, M.key)
- fingerprintslast = M.ckey
- return
/atom/proc/transfer_fingerprints_to(atom/A)
diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm
index 7f16410482b..19ccda1472b 100644
--- a/code/modules/events/abductor.dm
+++ b/code/modules/events/abductor.dm
@@ -16,7 +16,7 @@
/datum/round_event/ghost_role/abductor/spawn_role()
var/list/mob/dead/observer/candidates = get_candidates("abductor", null, ROLE_ABDUCTOR)
- if(!candidates.len < 2)
+ if(candidates.len < 2)
return NOT_ENOUGH_PLAYERS
//Oh god why we can't have static functions
// I feel your pain, bro
diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm
index cd4911f231a..b301049eaf4 100644
--- a/code/modules/events/wizard/greentext.dm
+++ b/code/modules/events/wizard/greentext.dm
@@ -68,6 +68,7 @@
new_holder.mind.objectives += O
new_holder.attack_log += "\[[time_stamp()]\] Won with greentext!!!"
color_altered_mobs -= new_holder
+ burn_state = ON_FIRE
qdel(src)
if(last_holder && last_holder != new_holder) //Somehow it was swiped without ever getting dropped
diff --git a/code/modules/library/lib_demonomicon.dm b/code/modules/library/lib_demonomicon.dm
index 88a10b0720b..03f62d84d2b 100644
--- a/code/modules/library/lib_demonomicon.dm
+++ b/code/modules/library/lib_demonomicon.dm
@@ -30,13 +30,13 @@
var/devilName = copytext(sanitize(input(user, "What infernal being do you wish to research?", "Codex Gigas", null) as text),1,MAX_MESSAGE_LEN)
var/speed = 300
var/correctness = 85
- var/willpower = 80
+ var/willpower = 98
if(U.job in list("Librarian")) // the librarian is both faster, and more accurate than normal crew members at research
speed = 45
correctness = 100
- willpower = 95
+ willpower = 100
if(U.job in list("Captain", "Security Officer", "Head of Security", "Detective", "Warden"))
- willpower = 90
+ willpower = 99
if(U.job in list("Clown")) // WHO GAVE THE CLOWN A DEMONOMICON? BAD THINGS WILL HAPPEN!
willpower = 25
correctness -= U.getBrainLoss() *0.5 //Brain damage makes researching hard.
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 0371463c3de..2b37d2476b4 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -594,3 +594,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(check_rights(R_ADMIN, 0))
return 1
return
+
+/mob/dead/observer/is_literate()
+ return 1
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 54b4c3b39ba..54d8d66f29a 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1038,3 +1038,6 @@
. = ..()
if (dna && dna.species)
. += dna.species.check_weakness(weapon, attacker)
+
+/mob/living/carbon/human/is_literate()
+ return 1
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 076a254f975..f4c7f3b2886 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -30,7 +30,6 @@
var/hair_color = null // this allows races to have specific hair colors... if null, it uses the H's hair/facial hair colors. if "mutcolor", it uses the H's mutant_color
var/hair_alpha = 255 // the alpha used by the hair. 255 is completely solid, 0 is transparent.
var/use_skintones = 0 // does it use skintones or not? (spoiler alert this is only used by humans)
- var/need_nutrition = 1 //Does it need to eat food on a regular basis?
var/exotic_blood = "" // If your race wants to bleed something other than bog standard blood, change this to reagent id.
var/meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing
var/skinned_type = /obj/item/stack/sheet/animalhide/generic
@@ -702,7 +701,9 @@
H.update_inv_wear_suit()
// nutrition decrease and satiety
- if (H.nutrition > 0 && H.stat != DEAD && H.dna.species.need_nutrition)
+ if (H.nutrition > 0 && H.stat != DEAD && \
+ H.dna && H.dna.species && (!(NOHUNGER in H.dna.species.specflags)))
+ // THEY HUNGER
var/hunger_rate = HUNGER_FACTOR
if(H.satiety > 0)
H.satiety--
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
index 396437b58fc..98ce33f8a64 100644
--- a/code/modules/mob/living/carbon/human/species_types.dm
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -217,7 +217,7 @@
id = "slime"
default_color = "00FFFF"
darksight = 3
- specflags = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD,VIRUSIMMUNE)
+ specflags = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD,VIRUSIMMUNE,NODISMEMBER)
say_mod = "says"
eyes = "eyes"
hair_color = "mutcolor"
@@ -406,11 +406,10 @@
name = "Spooky Scary Skeleton"
id = "skeleton"
say_mod = "rattles"
- need_nutrition = 0
blacklisted = 1
sexes = 0
meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
- specflags = list(NOBREATH,RESISTTEMP,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE)
+ specflags = list(NOBREATH,RESISTTEMP,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NOHUNGER)
mutant_organs = list(/obj/item/organ/tongue/bone)
/*
@@ -455,13 +454,12 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_
say_mod = "rattles"
sexes = 0
meat = /obj/item/stack/sheet/mineral/plasma
- specflags = list(NOBLOOD,RADIMMUNE,NOTRANSSTING,VIRUSIMMUNE)
+ specflags = list(NOBLOOD,RADIMMUNE,NOTRANSSTING,VIRUSIMMUNE,NOHUNGER)
safe_oxygen_min = 0 //We don't breath this
safe_toxins_min = 16 //We breath THIS!
safe_toxins_max = 0
dangerous_existence = 1 //So so much
blacklisted = 1 //See above
- need_nutrition = 0 //Hard to eat through a helmet
burnmod = 2
heatmod = 2
speedmod = 1
@@ -509,7 +507,7 @@ var/global/list/synth_flesh_disguises = list()
id = "synth"
say_mod = "beep boops" //inherited from a user's real species
sexes = 0
- specflags = list(NOTRANSSTING,NOBREATH,VIRUSIMMUNE,NODISMEMBER) //all of these + whatever we inherit from the real species
+ specflags = list(NOTRANSSTING,NOBREATH,VIRUSIMMUNE,NODISMEMBER,NOHUNGER) //all of these + whatever we inherit from the real species
safe_oxygen_min = 0
safe_toxins_min = 0
safe_toxins_max = 0
@@ -518,9 +516,8 @@ var/global/list/synth_flesh_disguises = list()
SA_sleep_min = 0
dangerous_existence = 1
blacklisted = 1
- need_nutrition = 0 //beep boop robots do not need sustinance
meat = null
- var/list/initial_specflags = list(NOTRANSSTING,NOBREATH,VIRUSIMMUNE) //for getting these values back for assume_disguise()
+ var/list/initial_specflags = list(NOTRANSSTING,NOBREATH,VIRUSIMMUNE,NOHUNGER) //for getting these values back for assume_disguise()
var/disguise_fail_health = 75 //When their health gets to this level their synthflesh partially falls off
var/image/damaged_synth_flesh = null //an image to display when we're below disguise_fail_health
var/datum/species/fake_species = null //a species to do most of our work for us, unless we're damaged
@@ -705,7 +702,6 @@ SYNDICATE BLACK OPS
name = "Corporate Agent"
id = "agent"
hair_alpha = 0
- need_nutrition = 0//They don't need to eat
say_mod = "declares"
speedmod = -2//Fast
brutemod = 0.7//Tough against firearms
@@ -719,5 +715,5 @@ SYNDICATE BLACK OPS
attack_sound = "sound/weapons/resonator_blast.ogg"
blacklisted = 1
use_skintones = 0
- specflags = list(RADIMMUNE,VIRUSIMMUNE,NOBLOOD,PIERCEIMMUNE,EYECOLOR,NODISMEMBER)
+ specflags = list(RADIMMUNE,VIRUSIMMUNE,NOBLOOD,PIERCEIMMUNE,EYECOLOR,NODISMEMBER,NOHUNGER)
sexes = 0
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index e90b7cb8188..8ac3547f12b 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -39,21 +39,21 @@ var/list/department_radio_keys = list(
//kinda localization -- rastaf0
//same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.
- ":" = "right hand", "#" = "right hand", "." = "right hand",
- ":" = "left hand", "#" = "left hand", "." = "left hand",
- ":" = "intercom", "#" = "intercom", "." = "intercom",
- ":" = "department", "#" = "department", "." = "department",
- ":" = "Command", "#" = "Command", "." = "Command",
- ":" = "Science", "#" = "Science", "." = "Science",
- ":" = "Medical", "#" = "Medical", "." = "Medical",
- ":" = "Engineering", "#" = "Engineering", "." = "Engineering",
- ":" = "Security", "#" = "Security", "." = "Security",
- ":" = "whisper", "#" = "whisper", "." = "whisper",
- ":" = "binary", "#" = "binary", "." = "binary",
- ":" = "alientalk", "#" = "alientalk", "." = "alientalk",
- ":" = "Syndicate", "#" = "Syndicate", "." = "Syndicate",
- ":" = "Supply", "#" = "Supply", "." = "Supply",
- ":" = "changeling", "#" = "changeling", "." = "changeling"
+ ":ê" = "right hand", "#ê" = "right hand", ".ê" = "right hand",
+ ":ä" = "left hand", "#ä" = "left hand", ".ä" = "left hand",
+ ":ø" = "intercom", "#ø" = "intercom", ".ø" = "intercom",
+ ":ð" = "department", "#ð" = "department", ".ð" = "department",
+ ":ñ" = "Command", "#ñ" = "Command", ".ñ" = "Command",
+ ":ò" = "Science", "#ò" = "Science", ".ò" = "Science",
+ ":ü" = "Medical", "#ü" = "Medical", ".ü" = "Medical",
+ ":ó" = "Engineering", "#ó" = "Engineering", ".ó" = "Engineering",
+ ":û" = "Security", "#û" = "Security", ".û" = "Security",
+ ":ö" = "whisper", "#ö" = "whisper", ".ö" = "whisper",
+ ":è" = "binary", "#è" = "binary", ".è" = "binary",
+ ":ô" = "alientalk", "#ô" = "alientalk", ".ô" = "alientalk",
+ ":å" = "Syndicate", "#å" = "Syndicate", ".å" = "Syndicate",
+ ":é" = "Supply", "#é" = "Supply", ".é" = "Supply",
+ ":ï" = "changeling", "#ï" = "changeling", ".ï" = "changeling"
)
var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
@@ -205,6 +205,21 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
/mob/living/proc/handle_inherent_channels(message, message_mode)
if(message_mode == MODE_CHANGELING)
switch(lingcheck())
+ if(3)
+ var/msg = "[src.mind]: [message]"
+ for(var/mob/M in mob_list)
+ if(M in dead_mob_list)
+ M << "(F) [msg]"
+ else
+ switch(M.lingcheck())
+ if(3)
+ M << msg
+ if(2)
+ M << msg
+ if(1)
+ if(prob(40))
+ M << "We can faintly sense an outsider trying to communicate through the hivemind..."
+ return 1
if(2)
var/msg = "[mind.changeling.changelingID]: [message]"
log_say("[mind.changeling.changelingID]/[src.key] : [message]")
@@ -213,6 +228,8 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
M << "(F) [msg]"
else
switch(M.lingcheck())
+ if(3)
+ M << msg
if(2)
M << msg
if(1)
@@ -272,11 +289,13 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
return NOPASS
return 0
-/mob/living/lingcheck() //Returns 1 if they are a changeling. Returns 2 if they are a changeling that can communicate through the hivemind
+/mob/living/lingcheck() //1 is ling w/ no hivemind. 2 is ling w/hivemind. 3 is ling victim being linked into hivemind.
if(mind && mind.changeling)
if(mind.changeling.changeling_speak)
return 2
return 1
+ if(mind && mind.linglink)
+ return 3
return 0
/mob/living/say_quote(input, list/spans)
@@ -285,4 +304,4 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
return "stammers, \"[tempinput]\""
if (getBrainLoss() >= 60)
return "gibbers, \"[tempinput]\""
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 3d1ebfaa7cd..0ac2332ed47 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -555,7 +555,10 @@
if(emagged || (connected_ai && lawupdate)) //Can't be sure which, metagamers
emote("buzz-[user.name]")
return
- MOD.install(src, user) //Proc includes a success mesage so we don't need another one
+ if(!mind) //A player mind is required for law procs to run antag checks.
+ user << "[src] is entirely unresponsive!"
+ return
+ MOD.install(laws, user) //Proc includes a success mesage so we don't need another one
return
else if(istype(W, /obj/item/device/encryptionkey/) && opened)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 208bd2da166..42d1c25a729 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -489,3 +489,5 @@
animate(src, transform = ntransform, time = 2,easing = EASE_IN|EASE_OUT)
return ..()
+/mob/living/silicon/is_literate()
+ return 1
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index b94d3db30a2..2376524973d 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -61,6 +61,7 @@
var/new_destination // pending new destination (waiting for beacon response)
var/destination // destination description tag
var/next_destination // the next destination in the patrol route
+ var/shuffle = FALSE // If we should shuffle our adjacency checking
var/blockcount = 0 //number of times retried a blocked path
var/awaiting_beacon = 0 // count of pticks awaiting a beacon response
@@ -375,11 +376,22 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r
if(!T)
return
var/list/adjacent = T.GetAtmosAdjacentTurfs(1)
+ if(shuffle) //If we were on the same tile as another bot, let's randomize our choices so we dont both go the same way
+ adjacent = shuffle(adjacent)
+ shuffle = FALSE
for(var/scan in adjacent)//Let's see if there's something right next to us first!
- var/final_result = checkscan(scan,scan_type,old_target)
- if(final_result)
- return final_result
-
+ if(check_bot(scan)) //Is there another bot there? Then let's just skip it
+ continue
+ if(isturf(scan_type)) //If we're lookeing for a turf we can just run the checks directly!
+ var/final_result = checkscan(scan,scan_type,old_target)
+ if(final_result)
+ return final_result
+ else
+ var/turf/turfy = scan
+ for(var/deepscan in turfy.contents)//Check the contents since adjacent is turfs
+ var/final_result = checkscan(deepscan,scan_type,old_target)
+ if(final_result)
+ return final_result
for (var/scan in shuffle(view(scan_range, src))-adjacent) //Search for something in range!
var/final_result = checkscan(scan,scan_type,old_target)
if(final_result)
@@ -390,11 +402,7 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r
return 0 //If not, keep searching!
if( (scan in ignore_list) || (scan == old_target) ) //Filter for blacklisted elements, usually unreachable or previously processed oness
return 0
- var/turf/T = get_turf(scan)
- if(T)
- for(var/C in T.contents)
- if(istype(C,src.type) && (C != src)) //Is there another bot there already? If so, let's skip it so we dont all atack on top of eachother.
- return 0
+
var/scan_result = process_scan(scan) //Some bots may require additional processing when a result is selected.
if(scan_result)
return scan_result
@@ -402,6 +410,12 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r
return 0 //The current element failed assessment, move on to the next.
return
+/mob/living/simple_animal/bot/proc/check_bot(targ)
+ var/turf/T = get_turf(targ)
+ if(T)
+ for(var/C in T.contents)
+ if(istype(C,type) && (C != src)) //Is there another bot there already? If so, let's skip it so we dont all atack on top of eachother.
+ return 1 //Let's abort if we find a bot so we dont have to keep rechecking
//When the scan finds a target, run bot specific processing to select it for the next step. Empty by default.
/mob/living/simple_animal/bot/proc/process_scan(scan_target)
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 5c00a4fc3bf..00892f702b7 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -140,7 +140,10 @@
return
if(target && loc == target.loc)
- clean(target)
+ if(!(check_bot(target) && prob(50))) //Target is not defined at the parent. 50% chance to still try and clean so we dont get stuck on the last blood drop.
+ clean(target) //Rather than check at every step of the way, let's check before we do an action, so we can rescan before the other bot.
+ else
+ shuffle = TRUE //Shuffle the list the next time we scan so we dont both go the same way.
path = list()
target = null
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index 8ba86a9b2d7..8956f7872a6 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -81,7 +81,7 @@
dat += "Loaded \[[specialtiles]/[maxtiles]\]
"
else
dat += "None Loaded
"
-
+
dat += "Behaviour controls are [locked ? "locked" : "unlocked"]
"
if(!locked || issilicon(user) || IsAdminGhost(user))
dat += "Add tiles to new hull plating: [autotile ? "Yes" : "No"]
"
@@ -162,7 +162,7 @@
if("disable")
targetdirection = null
update_controls()
-
+
/mob/living/simple_animal/bot/floorbot/proc/empty_tiles()
var/turf/Tsec = get_turf(src)
@@ -204,7 +204,7 @@
if(!target && fixfloors) //Repairs damaged floors and tiles.
process_type = FIX_TILE
target = scan(/turf/open/floor)
-
+
if(!target && replacetiles && specialtiles > 0) //Replace a floor tile with custom tile
process_type = REPLACE_TILE //The target must be a tile. The floor must already have a floortile.
target = scan(/turf/open/floor)
@@ -242,6 +242,12 @@
return
if(loc == target || loc == target.loc)
+ if(check_bot(target)) //Target is not defined at the parent
+ shuffle = TRUE
+ if(prob(50)) //50% chance to still try to repair so we dont end up with 2 floorbots failing to fix the last breach
+ target = null
+ path = list()
+ return
if(istype(target, /turf/) && emagged < 2)
repair(target)
else if(emagged == 2 && istype(target,/turf/open/floor))
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
index 652bea72c7c..1fd2754ae85 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
@@ -148,6 +148,7 @@
/mob/living/simple_animal/hostile/megafauna/dragon/proc/swoop_attack(fire_rain = 0, atom/movable/manual_target)
if(stat)
return
+ swoop_cooldown = world.time + 200
var/swoop_target
if(manual_target)
swoop_target = manual_target
@@ -194,10 +195,6 @@
stop_automated_movement = FALSE
swooping = 0
density = 1
- swoop_cooldown = world.time + 200
-
-
-
/mob/living/simple_animal/hostile/megafauna/dragon/AltClickOn(atom/movable/A)
if(!istype(A))
diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm
index eccba5770c6..cd600cd1367 100644
--- a/code/modules/mob/living/simple_animal/hostile/zombie.dm
+++ b/code/modules/mob/living/simple_animal/hostile/zombie.dm
@@ -35,17 +35,19 @@
/mob/living/simple_animal/hostile/zombie/darkholme //BOY♂NEXT♂RUIN
desc = "This guy seems to have gotten lost on his way to the leather club."
-
+ gold_core_spawnable = 0
+
/mob/living/simple_animal/hostile/zombie/darkholme/New()
..()
name = pick("Leatherman","Leatherhead")
-
+
mob/living/simple_animal/hostile/zombie/gymboss
name = "boss of this gym"
desc = "There seems to be something shiny embedded in his waist."
butcher_results = list(/obj/item/weapon/storage/belt/champion/wrestling = 1)
attacktext = "spanks"
-
+ gold_core_spawnable = 0
+
/mob/living/simple_animal/hostile/zombie/AttackingTarget()
..()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index e4de12e8ac3..5efb361452b 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -933,3 +933,6 @@ var/next_mob_id = 0
if("resize")
update_transform()
..()
+
+/mob/proc/is_literate()
+ return 0
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index bef437af32a..29d4bc11de5 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -60,11 +60,11 @@
user << "There are indecipherable images scrawled on the paper in what looks to be... blood?"
return
if(in_range(user, src) || isobserver(user))
- if( !(ishuman(user) || isobserver(user) || issilicon(user)) )
- user << browse("[name][stars(info)]
[stamps]", "window=[name]")
+ if(user.is_literate())
+ user << browse("[name][info]
[stamps]", "window=[name]")
onclose(user, "[name]")
else
- user << browse("[name][info]
[stamps]", "window=[name]")
+ user << browse("[name][stars(info)]
[stamps]", "window=[name]")
onclose(user, "[name]")
else
user << "It is too far away."
@@ -75,17 +75,15 @@
set category = "Object"
set src in usr
- if(usr.stat || !usr.canmove || usr.restrained())
- return
-
- if(!ishuman(usr))
- return
- var/mob/living/carbon/human/H = usr
- if(H.disabilities & CLUMSY && prob(25))
- H << "You cut yourself on the paper! Ahhhh! Ahhhhh!"
- H.damageoverlaytemp = 9001
- H.update_damage_hud()
+ if(usr.incapacitated() || !usr.is_literate())
return
+ if(ishuman(usr))
+ var/mob/living/carbon/human/H = usr
+ if(H.disabilities & CLUMSY && prob(25))
+ H << "You cut yourself on the paper! Ahhhh! Ahhhhh!"
+ H.damageoverlaytemp = 9001
+ H.update_damage_hud()
+ return
var/n_name = stripped_input(usr, "What would you like to label the paper?", "Paper Labelling", null, MAX_NAME_LEN)
if((loc == usr && usr.stat == 0))
name = "paper[(n_name ? text("- '[n_name]'") : null)]"
@@ -293,7 +291,7 @@
return
if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon))
- if(user.IsAdvancedToolUser())
+ if(user.is_literate())
user << browse("[name][info_links]
[stamps]", "window=[name]")
return
else
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index c565aa30661..b29c69b400a 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -30,6 +30,9 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
contained = 0
density = 1
energy = 0
+ dissipate = 1
+ dissipate_delay = 5
+ dissipate_strength = 1
var/list/orbiting_balls = list()
var/produced_power
var/energy_to_raise = 32
@@ -51,7 +54,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
if(!orbiting)
handle_energy()
- move_the_basket_ball(4 + orbiting_balls.len * 2)
+ move_the_basket_ball(4 + orbiting_balls.len * 1.5)
playsound(src.loc, 'sound/magic/lightningbolt.ogg', 100, 1, extrarange = 30)
@@ -63,7 +66,8 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
pixel_x = -32
pixel_y = -32
for (var/ball in orbiting_balls)
- tesla_zap(ball, rand(1, Clamp(orbiting_balls.len, 3, 7)), TESLA_MINI_POWER)
+ var/range = rand(1, Clamp(orbiting_balls.len, 3, 7))
+ tesla_zap(ball, range, TESLA_MINI_POWER/7*range)
else
energy = 0 // ensure we dont have miniballs of miniballs
@@ -88,9 +92,10 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
/obj/singularity/energy_ball/proc/handle_energy()
+
if(energy >= energy_to_raise)
energy_to_lower = energy_to_raise - 20
- energy_to_raise = energy_to_raise * 1.5
+ energy_to_raise = energy_to_raise * 1.25
playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, 1, extrarange = 30)
spawn(100)
@@ -105,16 +110,17 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
orbitsize -= (orbitsize / world.icon_size) * (world.icon_size * 0.25)
EB.orbit(src, orbitsize, pick(FALSE, TRUE), rand(10, 25), pick(3, 4, 5, 6, 36))
+
else if(energy < energy_to_lower && orbiting_balls.len)
- energy_to_raise = energy_to_raise / 1.5
- energy_to_lower = (energy_to_raise / 1.5) - 20
+ energy_to_raise = energy_to_raise / 1.25
+ energy_to_lower = (energy_to_raise / 1.25) - 20
var/Orchiectomy_target = pick(orbiting_balls)
qdel(Orchiectomy_target)
else if(orbiting_balls.len)
- energy -= orbiting_balls.len * 0.5
+ dissipate() //sing code has a much better system.
/obj/singularity/energy_ball/Bump(atom/A)
dust_mobs(A)
@@ -126,11 +132,13 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
if (istype(target))
target.orbiting_balls += src
poi_list -= src
+ target.dissipate_strength = target.orbiting_balls.len
. = ..()
if (istype(target))
target.orbiting_balls -= src
+ target.dissipate_strength = target.orbiting_balls.len
if (!loc)
qdel(src)
@@ -154,11 +162,11 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
var/obj/structure/closest_structure
var/obj/effect/blob/closest_blob
- for(var/A in oview(source, zap_range))
+ for(var/A in oview(source, zap_range+2))
if(istype(A, /obj/machinery/power/tesla_coil))
var/dist = get_dist(source, A)
var/obj/machinery/power/tesla_coil/C = A
- if((dist < closest_dist || !closest_tesla_coil) && !C.being_shocked)
+ if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !C.being_shocked)
closest_dist = dist
//we use both of these to save on istype and typecasting overhead later on
@@ -171,8 +179,8 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
continue //no need checking these other things
else if(istype(A, /obj/machinery/power/grounding_rod))
- var/dist = get_dist(source, A)
- if(dist < closest_dist || !closest_grounding_rod)
+ var/dist = get_dist(source, A)-2
+ if(dist <= zap_range && (dist < closest_dist || !closest_grounding_rod))
closest_grounding_rod = A
closest_atom = A
closest_dist = dist
@@ -183,7 +191,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
else if(istype(A, /mob/living))
var/dist = get_dist(source, A)
var/mob/living/L = A
- if((dist < closest_dist || !closest_mob) && L.stat != DEAD)
+ if(dist <= zap_range && (dist < closest_dist || !closest_mob) && L.stat != DEAD)
closest_mob = L
closest_atom = A
closest_dist = dist
@@ -194,7 +202,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
else if(istype(A, /obj/machinery))
var/obj/machinery/M = A
var/dist = get_dist(source, A)
- if((dist < closest_dist || !closest_machine) && !M.being_shocked)
+ if(dist <= zap_range && (dist < closest_dist || !closest_machine) && !M.being_shocked)
closest_machine = M
closest_atom = A
closest_dist = dist
@@ -205,7 +213,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
else if(istype(A, /obj/effect/blob))
var/obj/effect/blob/B = A
var/dist = get_dist(source, A)
- if((dist < closest_dist || !closest_tesla_coil) && !B.being_shocked)
+ if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !B.being_shocked)
closest_blob = B
closest_atom = A
closest_dist = dist
@@ -216,7 +224,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
else if(istype(A, /obj/structure))
var/obj/structure/S = A
var/dist = get_dist(source, A)
- if((dist < closest_dist || !closest_tesla_coil) && !S.being_shocked)
+ if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !S.being_shocked)
closest_structure = S
closest_atom = A
closest_dist = dist
diff --git a/code/modules/projectiles/projectile/reusable.dm b/code/modules/projectiles/projectile/reusable.dm
index 216b24e570a..f253655e3f6 100644
--- a/code/modules/projectiles/projectile/reusable.dm
+++ b/code/modules/projectiles/projectile/reusable.dm
@@ -54,8 +54,7 @@
newdart.update_icon()
/obj/item/projectile/bullet/reusable/foam_dart/Destroy()
- if(pen)
- qdel(pen)
+ pen = null
return ..()
/obj/item/projectile/bullet/reusable/foam_dart/riot
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 92716ddc9d3..b1dee893500 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -722,7 +722,7 @@
M.adjustToxLoss(rand(5,10))
/datum/reagent/space_cleaner/reaction_mob(mob/M, method=TOUCH, reac_volume)
- if(method == TOUCH || VAPOR)
+ if(method == TOUCH || method == VAPOR)
if(iscarbon(M))
var/mob/living/carbon/C = M
if(istype(M,/mob/living/carbon/human))
diff --git a/code/modules/spells/spell_types/demon.dm b/code/modules/spells/spell_types/demon.dm
index ae32cf92292..12671cfffba 100644
--- a/code/modules/spells/spell_types/demon.dm
+++ b/code/modules/spells/spell_types/demon.dm
@@ -102,7 +102,7 @@
/obj/effect/proc_holder/spell/targeted/infernal_jaunt
name = "Infernal Jaunt"
- desc = "Use pools of blood to phase out of existence."
+ desc = "Use hellfire to phase out of existence."
charge_max = 10
clothes_req = 0
selection_type = "range"
@@ -165,3 +165,38 @@
src.visible_message("[src] appears in a firey blaze!")
playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
return 1
+
+/obj/effect/proc_holder/spell/targeted/sintouch
+ name = "Sin Touch"
+ desc = "Subtly encourage someone to sin."
+ charge_max = 1800
+ clothes_req = 0
+ selection_type = "range"
+ range = 2
+ cooldown_min = 0
+ overlay = null
+ include_user = 0
+ action_icon_state = "sintouch"
+ action_background_icon_state = "bg_demon"
+ phase_allowed = 0
+ random_target = 1
+ random_target_priority = TARGET_RANDOM
+ max_targets = 3
+ invocation = "TASTE SIN AND INDULGE!!"
+ invocation_type = "shout"
+
+/obj/effect/proc_holder/spell/targeted/sintouch/ascended
+ name = "Greater sin touch"
+ charge_max = 100
+ range = 7
+ max_targets = 10
+
+/obj/effect/proc_holder/spell/targeted/sintouch/cast(list/targets, mob/living/user = usr)
+ for(var/mob/living/carbon/human/H in targets)
+ if(!H.mind)
+ continue
+ for(var/datum/objective/sintouched/A in H.mind.objectives)
+ continue
+ H.influenceSin()
+ H.Weaken(2)
+ H.Stun(2)
diff --git a/code/world.dm b/code/world.dm
index 478b3790af7..9f2eefed96d 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -178,6 +178,14 @@ var/last_irc_status = 0
if(ticker.delay_end)
world << "Reboot was cancelled by an admin."
return
+ if(mapchanging)
+ world << "Map change operation detected, delaying reboot."
+ rebootingpendingmapchange = 1
+ spawn(1200)
+ if(mapchanging)
+ mapchanging = 0 //map rotation can in some cases be finished but never exit, this is a failsafe
+ Reboot("Map change timed out", time = 10)
+ return
feedback_set_details("[feedback_c]","[feedback_r]")
log_game("Rebooting World. [reason]")
kick_clients_in_lobby("The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked
@@ -386,17 +394,19 @@ var/failed_db_connections = 0
world << "Map rotation has chosen [VM.friendlyname] for next round!"
var/datum/votablemap/nextmap
-
+var/mapchanging = 0
+var/rebootingpendingmapchange = 0
/proc/changemap(var/datum/votablemap/VM)
if (!SERVERTOOLS)
return
if (!istype(VM))
return
-
+ mapchanging = 1
log_game("Changing map to [VM.name]([VM.friendlyname])")
var/file = file("setnewmap.bat")
file << "\nset MAPROTATE=[VM.name]\n"
. = shell("..\\bin\\maprotate.bat")
+ mapchanging = 0
switch (.)
if (null)
message_admins("Failed to change map: Could not run map rotator")
@@ -426,3 +436,5 @@ var/datum/votablemap/nextmap
else
message_admins("Failed to change map: Unknown error: Error code #[.]")
log_game("Failed to change map: Unknown error: Error code #[.]")
+ if(rebootingpendingmapchange)
+ world.Reboot("Map change finished", time = 10)
diff --git a/html/changelog.html b/html/changelog.html
index 380533e46cc..2cb489a4ce7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,26 @@
-->
+
18 May 2016
+
Metacide updated:
+
+ - MetaStation: the library and chapel have had windows removed to make them feel more isolated.
+
+
MrStonedOne updated:
+
+ - Tesla has been rebalanced.
+ - It should now lose balls slower, increase balls faster, and be a bit more aggressive about finding nearby grounding rods.
+ - additional zaps from it's orbiting balls should be a bit more varied, but a touch less powerful.
+
+
Robustin updated:
+
+ - Lings have a new default ability, Hivemind Link. This lets you bring a neck-grabbed victim into hivemind communications after short period of time. You can talk to victims who are in crit/muted and perhaps persuade them to help you, give you intel, or even a PDA code. The link will stabilize crit victims to help ensure they do not die during the link.
+
+
Shadowlight213 updated:
+
+ - Cleanbot and floorbot scanning has greatly improved. they should prioritize areas next to them, as well as resolve themselves stacking on the same tiles.
+
+
15 May 2016
Iamgoofball updated:
@@ -565,66 +585,6 @@
- Mechas can now toggle strafing mode.
-
- 20 April 2016
- Erwgd updated:
-
- - The autolathe can now make trays.
-
- Fox McCloud updated:
-
- - Fixes abductor vests having no cooldown between uses
-
- Kor updated:
-
- - You can now craft boats and oars out of goliath hides. These boats can move in lava.
- - Added a spooky, upgraded boat to necropolis chests.
-
- coiax updated:
-
- - Slime grinders now cease suction of new slimes while grinding
-
- coiax, Joan updated:
-
- - Drone dufflebags now have their own sprite.
-
- kevinz000 updated:
-
- - Admin Detection Multitool: A multitool that shows when administrators are watching you! Now you can grief in safety!
- - Syndicate R&D scientists have significantly increased the range of their "AI detection multitools", making them turn yellow when an AI's tracking is near, but not on you just yet!
-
-
- 18 April 2016
- Joan updated:
-
- - Crates are now dense even when open.
- - You can now climb onto crates in the same way as table and sandbags, though climbing onto crates is very fast and does not stun you.
- - You can walk on crates, provided both are closed/open or the crate you're on is closed.
- - You can't close or open a crate if there's a large mob on top of it.
- - Stuffing items into a closet or crate is now instant and does not close the closet or crate. Stuffing mobs into a closet or crate still takes time and closes the closet/crate in question.
- - Crowbars and wirecutters have new inhand sprites. Crowbars can now be distinguished from wrenches in-hand.
-
- RandomMarine updated:
-
- - Cloth items removed from biogenerator. Instead, it can create stacking cloth that crafts those items.
- - In addition, cloth can be used to create grey jumpsuits, backpacks, dufflebags, bio bags, black shoes, bedsheets, and bandages.
- - Bedsheets now tear into cloth instead of directly into bandages.
-
- Shadowlight213 updated:
-
- - AI will be notified when one of their cyborgs is detonated.
-
- coiax updated:
-
- - Fixed slime grinders not sucking up more than one slime
- - Drones now start with a spacious dufflebag full of tools, so they will stop stealing the captain's
- - Fixed issues with drones wearing chameleon headgear.
- - Added admin-only "snowflake drone" (also known as drone camogear) headgear.
-
- nullbear updated:
-
- - Fixes air canisters being silent when bashed.
-