Memo by [ckey] on [timestamp]:"
+ var/ckey = query_memoshow.item[1]
+ var/memotext = query_memoshow.item[2]
+ var/timestamp = query_memoshow.item[3]
+ var/last_editor = query_memoshow.item[4]
+ output += "Memo by [ckey] on [timestamp]"
if(last_editor)
- output += "
Last edit by [last_editor] (Click here to see edit log)"
+ output += "
Last edit by [last_editor] (Click here to see edit log)"
output += "
[memotext]
"
+ if(!output)
+ src << "No memos found in database."
+ return
src << output
if("Remove")
var/DBQuery/query_memodellist = dbcon.NewQuery("SELECT ckey FROM [format_table_name("memo")]")
@@ -81,13 +106,13 @@
var/err = query_memodellist.ErrorMsg()
log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n")
return
- if(!query_memodellist.NextRow())
- src << "No memos found in database."
- return
var/list/memolist = list()
while(query_memodellist.NextRow())
- var/ckey = query_memodellist.item[2]
+ var/ckey = query_memodellist.item[1]
memolist += "[ckey]"
+ if(!memolist.len)
+ src << "No memos found in database."
+ return
var/target_ckey = input(src, "Select whose memo to delete", "Select memo") as null|anything in memolist
if(!target_ckey)
return
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 1320ae695c2..7fdf3adb2d7 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -264,7 +264,11 @@
M_job = "New player"
else if(isobserver(M))
- M_job = "Ghost"
+ var/mob/dead/observer/O = M
+ if(O.started_as_observer)//Did they get BTFO or are they just not trying?
+ M_job = "Observer"
+ else
+ M_job = "Ghost"
var/M_name = html_encode(M.name)
var/M_rname = html_encode(M.real_name)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 6f0493a0f86..b1ce38e14d7 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2058,10 +2058,14 @@
src.access_news_network()
else if(href_list["memoeditlist"])
- var/DBQuery/query_memoedits = dbcon.NewQuery("SELECT edits FROM [format_table_name("memo")] WHERE (id = '[href_list["id"]]")
- query_memoedits.Execute()
+ var/sql_key = sanitizeSQL("[href_list["memoeditlist"]]")
+ var/DBQuery/query_memoedits = dbcon.NewQuery("SELECT edits FROM [format_table_name("memo")] WHERE (ckey = '[sql_key]')")
+ if(!query_memoedits.Execute())
+ var/err = query_memoedits.ErrorMsg()
+ log_game("SQL ERROR obtaining edits from memo table. Error : \[[err]\]\n")
+ return
if(query_memoedits.NextRow())
- var/edit_log = query_memoedits.item[6]
+ var/edit_log = query_memoedits.item[1]
usr << browse(edit_log,"window=memoeditlist")
else if(href_list["check_antagonist"])
diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm
index dce6bbf8659..107c5310770 100644
--- a/code/modules/admin/verbs/cinematic.dm
+++ b/code/modules/admin/verbs/cinematic.dm
@@ -10,7 +10,7 @@
var/override
switch(parameter)
if(1)
- override = input(src,"mode = ?","Enter Parameter",null) as anything in list("nuclear emergency","no override")
+ override = input(src,"mode = ?","Enter Parameter",null) as anything in list("nuclear emergency","gang war","fake","no override")
if(0)
override = input(src,"mode = ?","Enter Parameter",null) as anything in list("blob","nuclear emergency","AI malfunction","no override")
ticker.station_explosion_cinematic(parameter,override)
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 5cdf335ed49..25b84838539 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -450,17 +450,17 @@
// CENTCOM RESPONSE TEAM
/datum/admins/proc/makeEmergencyresponseteam()
- var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: Centcom Official", "Blue: Light ERT", "Amber: Full ERT", "Red: Elite ERT", "Delta: Deathsquad")
+ var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: Centcom Official", "Blue: Light ERT (No Armoury Access)", "Amber: Full ERT (Armoury Access)", "Red: Elite ERT (Armoury Access + Pulse Weapons)", "Delta: Deathsquad")
if(!alert)
return
switch(alert)
if("Delta: Deathsquad")
return makeDeathsquad()
- if("Red: Elite ERT")
+ if("Red: Elite ERT (Armoury Access + Pulse Weapons)")
alert = "Red"
- if("Amber: Full ERT")
+ if("Amber: Full ERT (Armoury Access)")
alert = "Amber"
- if("Blue: Light ERT")
+ if("Blue: Light ERT (No Armoury Access)")
alert = "Blue"
if("Green: Centcom Official")
return makeOfficial()
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 4e07e0d8a3c..15de84c0369 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -128,7 +128,7 @@ var/next_external_rsc = 0
if(holder)
add_admin_verbs()
- admin_memo("Show")
+ admin_memo_output("Show")
if((global.comms_key == "default_pwd" || length(global.comms_key) <= 6) && global.comms_allowed) //It's the default value or less than 6 characters long, but it somehow didn't disable comms.
src << "The server's API key is either too short or is the default value! Consider changing it immediately!"
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index d351a3e0890..d0119b29ec5 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1045,14 +1045,6 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
character.real_name = real_name
character.name = character.real_name
- if(character.dna)
- character.dna.real_name = character.real_name
- if(pref_species != /datum/species/human && config.mutant_races)
- hardset_dna(character, null, null, null, null, pref_species.type, features)
- else
- hardset_dna(character, null, null, null, null, /datum/species/human, features)
- character.update_mutcolor()
-
character.gender = gender
character.age = age
character.blood_type = blood_type
@@ -1072,5 +1064,15 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
character.backbag = backbag
- character.update_body()
- character.update_hair()
+ if(character.dna)
+ var/datum/species/chosen_species
+
+ character.dna.real_name = character.real_name
+ if(pref_species != /datum/species/human && config.mutant_races)
+ chosen_species = pref_species.type
+ else
+ chosen_species = /datum/species/human
+ hardset_dna(character, null, null, null, null, chosen_species, features)
+ else
+ character.update_body()
+ character.update_hair()
\ No newline at end of file
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 18f5c7937f4..ced08b92025 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -66,6 +66,13 @@
item_state = "redgloves"
item_color = "red"
+/obj/item/clothing/gloves/color/red/insulated
+ name = "insulated gloves"
+ desc = "These gloves will protect the wearer from electric shock."
+ siemens_coefficient = 0
+ permeability_coefficient = 0.05
+ burn_state = -1 //Won't burn in fires
+
/obj/item/clothing/gloves/color/rainbow
name = "rainbow gloves"
desc = "A pair of gloves, they don't look special in any way."
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 6f9bc4c6228..ccb288dd6cc 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -228,3 +228,8 @@
name = "jester hat"
desc = "A hat with bells, to add some merryness to the suit."
icon_state = "jester_hat"
+
+/obj/item/clothing/head/rice_hat
+ name = "rice hat"
+ desc = "Welcome to the rice fields, motherfucker."
+ icon_state = "rice_hat"
\ No newline at end of file
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 9237f31d8f2..cc3435554d5 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -3,9 +3,9 @@
/obj/item/clothing/under/rank/bartender
desc = "It looks like it could use some more flair."
name = "bartender's uniform"
- icon_state = "bar_suit"
+ icon_state = "barman"
item_state = "bar_suit"
- item_color = "bar_suit"
+ item_color = "barman"
/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 8ad8c75980a..756d7608141 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -15,7 +15,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
var/image/halimage
var/image/halbody
var/obj/halitem
- var/hal_screwyhud = 0 //1 - critical, 2 - dead, 3 - oxygen indicator, 4 - toxin indicator
+ var/hal_screwyhud = 0 //1 - critical, 2 - dead, 3 - oxygen indicator, 4 - toxin indicator, 5 - perfect health
var/handling_hal = 0
var/hal_crit = 0
diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm
index 9fa1cbe5555..8f003e6fb75 100644
--- a/code/modules/food&drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food&drinks/drinks/drinks/bottle.dm
@@ -300,6 +300,11 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params)
if(is_hot(I) && !active)
active = 1
+ var/turf/bombturf = get_turf(src)
+ var/area/bombarea = get_area(bombturf)
+ message_admins("[key_name(user)]? has primed a [name] for detonation at [bombarea] (JMP).")
+ log_game("[key_name(user)] has primed a [name] for detonation at [bombarea] ([bombturf.x],[bombturf.y],[bombturf.z]).")
+
user << "You light \the [src] on fire."
overlays += fire_overlay
if(!isGlass)
@@ -324,4 +329,4 @@
return
user << "You snuff out the flame on \the [src]."
overlays -= fire_overlay
- active = 0
\ No newline at end of file
+ active = 0
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 82734bf827c..334cc5f671c 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -171,6 +171,7 @@
dat += "Leather Satchel: Make ([400/efficiency])
"
dat += "Leather Jacket: Make ([500/efficiency])
"
dat += "Leather Overcoat: Make ([1000/efficiency])
"
+ dat += "Rice Hat: Make ([300/efficiency])
"
dat += ""
else
dat += "No container inside, please insert container.
"
@@ -309,9 +310,9 @@
if("overcoat")
if (check_cost(1000/efficiency)) return 0
else new/obj/item/clothing/suit/jacket/leather/overcoat(src.loc)
- //if("monkey")
- // if (check_cost(500)) return 0
- // else new/mob/living/carbon/monkey(src.loc)
+ if("rice_hat")
+ if (check_cost(300/efficiency)) return 0
+ else new/obj/item/clothing/head/rice_hat(src.loc)
processing = 0
menustat = "complete"
update_icon()
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 85d0eaa50f0..f0e699253be 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -623,7 +623,7 @@
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = I
if(W.welding && !stat)
- if(stance != HOSTILE_STANCE_IDLE)
+ if(AIStatus == AI_ON)
user << "[src] is moving around too much to repair!"
return
if(maxHealth == health)
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 01e6c9b3094..0cf843f2df1 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -457,6 +457,13 @@ var/global/list/rockTurfEdgeCache
gets_drilled()
..()
+/turf/simulated/mineral/attack_alien(mob/living/carbon/alien/M)
+ M << "You start digging into the rock..."
+ playsound(src, 'sound/effects/break_stone.ogg', 50, 1)
+ if(do_after(M,40, target = src))
+ M << "You tunnel into the rock."
+ gets_drilled(M)
+
/*
/turf/simulated/mineral/proc/setRandomMinerals()
var/s = pickweight(list("uranium" = 5, "iron" = 50, "gold" = 5, "silver" = 5, "plasma" = 50, "diamond" = 1))
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 51f948910c1..13ca44627a0 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -167,6 +167,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
mind.current.key = key
return 1
+/mob/dead/observer/proc/notify_cloning(var/message, var/sound)
+ if(message)
+ src << "[message]"
+ src << "(Click to re-enter)"
+ if(sound)
+ src << sound(sound)
+
/mob/dead/observer/proc/dead_tele()
set category = "Ghost"
set name = "Teleport"
@@ -363,8 +370,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return ..()
/mob/dead/observer/Topic(href, href_list)
- if(href_list["follow"])
- var/atom/movable/target = locate(href_list["follow"])
- if((usr == src) && istype(target) && (target != src)) //for safety against href exploits
- ManualFollow(target)
-
+ ..()
+ if(usr == src)
+ if(href_list["follow"])
+ var/atom/movable/target = locate(href_list["follow"])
+ if(istype(target) && (target != src))
+ ManualFollow(target)
+ if(href_list["reenter"])
+ reenter_corpse()
\ No newline at end of file
diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm
new file mode 100644
index 00000000000..3283c0ebb4f
--- /dev/null
+++ b/code/modules/mob/living/bloodcrawl.dm
@@ -0,0 +1,115 @@
+//Travel through pools of blood. Slaughter Demon powers for everyone!
+
+#define BLOODCRAWL 1
+#define BLOODCRAWL_EAT 2
+
+/mob/living/proc/phaseout(obj/effect/decal/cleanable/B)
+ var/mob/living/kidnapped = null
+ var/turf/mobloc = get_turf(src.loc)
+ var/turf/bloodloc = get_turf(B.loc)
+ if(Adjacent(bloodloc))
+ src.notransform = TRUE
+ spawn(0)
+ src.visible_message("[src] sinks into the pool of blood.")
+ playsound(get_turf(src), 'sound/magic/enter_blood.ogg', 100, 1, -1)
+ var/obj/effect/dummy/slaughter/holder = PoolOrNew(/obj/effect/dummy/slaughter,mobloc)
+ src.ExtinguishMob()
+ if(src.buckled)
+ src.buckled.unbuckle_mob()
+ if(src.pulling && src.bloodcrawl == BLOODCRAWL_EAT)
+ if(istype(src.pulling, /mob/living))
+ var/mob/living/victim = src.pulling
+ if(victim.stat == CONSCIOUS)
+ src.visible_message("[victim] kicks free of the [src] at the last second!")
+ else
+ victim.loc = holder
+ src.visible_message("The [src] drags [victim] into the pool of blood!")
+ kidnapped = victim
+ src.loc = holder
+ src.holder = holder
+ if(kidnapped)
+ src << "You begin to feast on [kidnapped]. You can not move while you are doing this."
+ playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
+ sleep(30)
+ playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
+ sleep(30)
+ playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
+ sleep(30)
+ src << "You devour [kidnapped]. Your health is fully restored."
+ src.adjustBruteLoss(-1000)
+ src.adjustFireLoss(-1000)
+ src.adjustOxyLoss(-1000)
+ src.adjustToxLoss(-1000)
+ kidnapped.ghostize()
+ qdel(kidnapped)
+ src.notransform = 0
+
+/mob/living/proc/phasein(obj/effect/decal/cleanable/B)
+ if(src.notransform)
+ src << "Finish eating first!"
+ else
+ src.loc = B.loc
+ src.client.eye = src
+ src.visible_message("The [src] rises out of the pool of blood!")
+ playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
+ qdel(src.holder)
+ src.holder = null
+
+/obj/effect/decal/cleanable/blood/CtrlClick(mob/living/user)
+ ..()
+ if(user.bloodcrawl)
+ if(user.holder)
+ user.phasein(src)
+ else
+ user.phaseout(src)
+
+
+/obj/effect/decal/cleanable/trail_holder/CtrlClick(mob/living/user)
+ ..()
+ if(user.bloodcrawl)
+ if(user.holder)
+ user.phasein(src)
+ else
+ user.phaseout(src)
+
+
+
+/turf/CtrlClick(var/mob/living/user)
+ ..()
+ if(user.bloodcrawl)
+ for(var/obj/effect/decal/cleanable/B in src.contents)
+ if(istype(B, /obj/effect/decal/cleanable/blood) || istype(B, /obj/effect/decal/cleanable/trail_holder))
+ if(user.holder)
+ user.phasein(B)
+ break
+ else
+ user.phaseout(B)
+ break
+
+/obj/effect/dummy/slaughter //Can't use the wizard one, blocked by jaunt/slow
+ name = "water"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "nothing"
+ var/canmove = 1
+ density = 0
+ anchored = 1
+ invisibility = 60
+
+obj/effect/dummy/slaughter/relaymove(mob/user, direction)
+ if (!src.canmove || !direction) return
+ var/turf/newLoc = get_step(src,direction)
+ loc = newLoc
+ src.canmove = 0
+ spawn(1)
+ src.canmove = 1
+
+/obj/effect/dummy/slaughter/ex_act(blah)
+ return
+/obj/effect/dummy/slaughter/bullet_act(blah)
+ return
+
+/obj/effect/dummy/slaughter/singularity_act(blah)
+ return
+
+/obj/effect/dummy/slaughter/Destroy()
+ return QDEL_HINT_PUTINPOOL
diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm
index fd46ca92087..5270fdabb6d 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm
@@ -6,56 +6,54 @@
param = copytext(act, t1 + 1, length(act) + 1)
act = copytext(act, 1, t1)
- if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
- act = copytext(act,1,length(act))
var/muzzled = is_muzzled()
var/m_type = 1
var/message
switch(act) //Alphabetical please
- if ("deathgasp")
+ if ("deathgasp","deathgasps")
message = "[src] lets out a waning guttural screech, green blood bubbling from its maw..."
m_type = 2
- if ("gnarl")
+ if ("gnarl","gnarls")
if (!muzzled)
message = "[src] gnarls and shows its teeth.."
m_type = 2
- if ("hiss")
+ if ("hiss","hisses")
if(!muzzled)
message = "[src] hisses."
m_type = 2
- if ("moan")
+ if ("moan","moans")
message = "[src] moans!"
m_type = 2
- if ("roar")
+ if ("roar","roars")
if (!muzzled)
message = "[src] roars."
m_type = 2
- if ("roll")
+ if ("roll","rolls")
if (!src.restrained())
message = "[src] rolls."
m_type = 1
- if ("scratch")
+ if ("scratch","scratches")
if (!src.restrained())
message = "[src] scratches."
m_type = 1
- if ("scretch")
+ if ("screech","screeches")
if (!muzzled)
- message = "[src] scretches."
+ message = "[src] screeches."
m_type = 2
- if ("shiver")
+ if ("shiver","shivers")
message = "[src] shivers."
m_type = 2
- if ("sign")
+ if ("sign","signs")
if (!src.restrained())
message = text("[src] signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))
m_type = 1
@@ -65,7 +63,7 @@
m_type = 1
if ("help") //This is an exception
- src << "Help for xenomorph emotes. You can use these emotes with say \"*emote\":\n\naflap, airguitar, blink, blink_r, blush, bow, burp, choke, chucke, clap, collapse, cough, dance, deathgasp, drool, flap, frown, gasp, giggle, glare-(none)/mob, gnarl, hiss, jump, laugh, look-atom, me, moan, nod, point-atom, roar, roll, scream, scratch, scretch, shake, shiver, sign-#, sit, smile, sneeze, sniff, snore, stare-(none)/mob, sulk, sway, tail, tremble, twitch, twitch_s, wave, whimper, wink, yawn"
+ src << "Help for xenomorph emotes. You can use these emotes with say \"*emote\":\n\naflap, airguitar, blink, blink_r, blush, bow, burp, choke, chucke, clap, collapse, cough, dance, deathgasp, drool, flap, frown, gasp, giggle, glare-(none)/mob, gnarl, hiss, jump, laugh, look-atom, me, moan, nod, point-atom, roar, roll, scream, scratch, screech, shake, shiver, sign-#, sit, smile, sneeze, sniff, snore, stare-(none)/mob, sulk, sway, tail, tremble, twitch, twitch_s, wave, whimper, wink, yawn"
else
..(act)
diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm
index cf4f18c5d07..286ee10a07d 100644
--- a/code/modules/mob/living/carbon/alien/larva/emote.dm
+++ b/code/modules/mob/living/carbon/alien/larva/emote.dm
@@ -6,83 +6,81 @@
param = copytext(act, t1 + 1, length(act) + 1)
act = copytext(act, 1, t1)
- if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
- act = copytext(act,1,length(act))
var/muzzled = is_muzzled()
var/m_type = 1
var/message
switch(act) //Alphabetically sorted please.
- if ("burp")
+ if ("burp","burps")
if (!muzzled)
message = "[src] burps."
m_type = 2
- if ("choke")
+ if ("choke","chokes")
message = "[src] chokes."
m_type = 2
- if ("collapse")
+ if ("collapse","collapses")
Paralyse(2)
message = "[src] collapses!"
m_type = 2
- if ("dance")
+ if ("dance","dances")
if (!src.restrained())
message = "[src] dances around happily."
m_type = 1
- if ("drool")
+ if ("drool","drools")
message = "[src] drools."
m_type = 1
- if ("gasp")
+ if ("gasp","gasps")
message = "[src] gasps."
m_type = 2
- if ("gnarl")
+ if ("gnarl","gnarls")
if (!muzzled)
message = "[src] gnarls and shows its teeth.."
m_type = 2
- if ("hiss")
+ if ("hiss","hisses")
message = "[src] hisses softly."
m_type = 1
- if ("jump")
+ if ("jump","jumps")
message = "[src] jumps!"
m_type = 1
- if ("moan")
+ if ("moan","moans")
message = "[src] moans!"
m_type = 2
- if ("nod")
+ if ("nod","nods")
message = "[src] nods its head."
m_type = 1
-// if ("roar")
-// if (!muzzled)
-// message = "[src] roars." Commenting out since larva shouldn't roar /N
-// m_type = 2
- if ("roll")
+ if ("roar","roars")
+ if (!muzzled)
+ message = "[src] softly roars."
+ m_type = 2
+ if ("roll","rolls")
if (!src.restrained())
message = "[src] rolls."
m_type = 1
- if ("scratch")
+ if ("scratch","scratches")
if (!src.restrained())
message = "[src] scratches."
m_type = 1
- if ("scretch")
+ if ("screech","screeches") //This orignally was called scretch, changing it. -Sum99
if (!muzzled)
- message = "[src] scretches."
+ message = "[src] screeches."
m_type = 2
- if ("shake")
+ if ("shake","shakes")
message = "[src] shakes its head."
m_type = 1
- if ("shiver")
+ if ("shiver","shivers")
message = "[src] shivers."
m_type = 2
- if ("sign")
+ if ("sign","signs")
if (!src.restrained())
message = text("[src] signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))
m_type = 1
- if ("snore")
+ if ("snore","snores")
message = "[src] snores."
m_type = 2
- if ("sulk")
+ if ("sulk","sulks")
message = "[src] sulks down sadly."
m_type = 1
- if ("sway")
+ if ("sway","sways")
message = "[src] sways around dizzily."
m_type = 1
if ("tail")
@@ -91,13 +89,13 @@
if ("twitch")
message = "[src] twitches violently."
m_type = 1
- if ("whimper")
+ if ("whimper","whimpers")
if (!muzzled)
message = "[src] whimpers."
m_type = 2
if ("help") //"The exception"
- src << "Help for larva emotes. You can use these emotes with say \"*emote\":\n\nburp, choke, collapse, dance, drool, gasp, gnarl, hiss, jump, moan, nod, roll, scratch,\nscretch, shake, shiver, sign-#, sulk, sway, tail, twitch, whimper"
+ src << "Help for larva emotes. You can use these emotes with say \"*emote\":\n\nburp, choke, collapse, dance, drool, gasp, gnarl, hiss, jump, moan, nod, roll, roar, scratch, screech, shake, shiver, sign-#, sulk, sway, tail, twitch, whimper"
else
src << "Unusable emote '[act]'. Say *help for a list."
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 7763954c786..6f514dc0d3b 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -87,7 +87,7 @@ var/const/MAX_ACTIVE_TIME = 400
return Attach(AM)
return 0
-/obj/item/clothing/mask/facehugger/throw_at(atom/target, range, speed)
+/obj/item/clothing/mask/facehugger/throw_at(atom/target, range, speed, mob/thrower, spin)
if(!..())
return
if(stat == CONSCIOUS)
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 216b5c0765b..ec1fd6b67fb 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -31,12 +31,6 @@
else
icon_state = "mmi_empty"
-/obj/item/device/mmi/Topic(href, href_list)
- if(href_list["reenter"])
- var/mob/dead/observer/ghost = usr
- if(istype(ghost))
- ghost.reenter_corpse(ghost)
-
/obj/item/device/mmi/attackby(obj/item/O, mob/user, params)
user.changeNext_move(CLICK_CD_MELEE)
if(istype(O,/obj/item/organ/brain)) //Time to stick a brain in it --NEO
@@ -52,11 +46,7 @@
return
var/mob/living/carbon/brain/B = newbrain.brainmob
if(!B.key)
- var/mob/dead/observer/ghost = B.get_ghost()
- if(ghost)
- if(ghost.client)
- ghost << "Someone has put your brain in a MMI! (Click to enter)"
- ghost << sound('sound/effects/genetics.ogg')
+ B.notify_ghost_cloning("Someone has put your brain in a MMI!")
visible_message("[user] sticks \a [newbrain] into \the [src].")
brainmob = newbrain.brainmob
diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm
index c9feda102b4..072f5c3f7d5 100644
--- a/code/modules/mob/living/carbon/brain/emote.dm
+++ b/code/modules/mob/living/carbon/brain/emote.dm
@@ -6,8 +6,6 @@
var/t1 = findtext(act, "-", 1, null)
act = copytext(act, 1, t1)
- if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
- act = copytext(act,1,length(act))
if(src.stat == DEAD)
return
@@ -22,16 +20,16 @@
message = "[src] lets out a distressed noise."
m_type = 2
- if ("beep")
+ if ("beep","beeps")
src << "You beep."
message = "[src] beeps."
m_type = 2
- if ("blink")
+ if ("blink","blinks")
message = "[src] blinks."
m_type = 1
- if ("boop")
+ if ("boop","boops")
src << "You boop."
message = "[src] boops."
m_type = 2
@@ -45,7 +43,7 @@
message = "[src] plays a loud tone."
m_type = 2
- if ("whistle")
+ if ("whistle","whistles")
src << "You whistle."
message = "[src] whistles."
m_type = 2
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 9b705841a82..3c92e6403a1 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -11,6 +11,11 @@
return 1
return ..()
+/mob/living/carbon/throw_impact(atom/hit_atom)
+ . = ..()
+ if(hit_atom.density && isturf(hit_atom))
+ Weaken(1)
+ take_organ_damage(10)
/mob/living/carbon/attackby(obj/item/I, mob/user, params)
if(lying)
diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index 320ae709bc3..2009c2bc5fe 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -10,9 +10,6 @@
param = copytext(act, t1 + 1, length(act) + 1)
act = copytext(act, 1, t1)
- if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
- act = copytext(act,1,length(act))
-
var/muzzled = is_muzzled()
//var/m_type = 1
@@ -27,7 +24,7 @@
message = "[src] is strumming the air and headbanging like a safari chimp."
m_type = 1
- if ("blink")
+ if ("blink","blinks")
message = "[src] blinks."
m_type = 1
@@ -35,11 +32,11 @@
message = "[src] blinks rapidly."
m_type = 1
- if ("blush")
+ if ("blush","blushes")
message = "[src] blushes."
m_type = 1
- if ("bow")
+ if ("bow","bows")
if (!src.buckled)
var/M = null
if (param)
@@ -55,117 +52,117 @@
message = "[src] bows."
m_type = 1
- if ("burp")
+ if ("burp","burps")
if (!muzzled)
..(act)
- if ("choke")
+ if ("choke","chokes")
if (!muzzled)
..(act)
else
message = "[src] makes a strong noise."
m_type = 2
- if ("chuckle")
+ if ("chuckle","chuckles")
if (!muzzled)
..(act)
else
message = "[src] makes a noise."
m_type = 2
- if ("clap")
+ if ("clap","claps")
if (!src.restrained())
message = "[src] claps."
m_type = 2
- if ("cough")
+ if ("cough","coughs")
if (!muzzled)
..(act)
else
message = "[src] makes a strong noise."
m_type = 2
- if ("deathgasp")
+ if ("deathgasp","deathgasps")
message = "[src] seizes up and falls limp, \his eyes dead and lifeless..."
m_type = 1
- if ("flap")
+ if ("flap","flaps")
if (!src.restrained())
message = "[src] flaps \his wings."
m_type = 2
- if ("gasp")
+ if ("gasp","gasps")
if (!muzzled)
..(act)
else
message = "[src] makes a weak noise."
m_type = 2
- if ("giggle")
+ if ("giggle","giggles")
if (!muzzled)
..(act)
else
message = "[src] makes a noise."
m_type = 2
- if ("laugh")
+ if ("laugh","laughs")
if (!muzzled)
..(act)
else
message = "[src] makes a noise."
- if ("nod")
+ if ("nod","nods")
message = "[src] nods."
m_type = 1
- if ("scream")
+ if ("scream","screams")
if (!muzzled)
..(act)
else
message = "[src] makes a very loud noise."
m_type = 2
- if ("shake")
+ if ("shake","shakes")
message = "[src] shakes \his head."
m_type = 1
- if ("sneeze")
+ if ("sneeze","sneezes")
if (!muzzled)
..(act)
else
message = "[src] makes a strange noise."
m_type = 2
- if ("sigh")
+ if ("sigh","sighs")
if (!muzzled)
..(act)
else
message = "[src] sighs."
m_type = 2
- if ("sniff")
+ if ("sniff","sniffs")
message = "[src] sniffs."
m_type = 2
- if ("snore")
+ if ("snore","snores")
if (!muzzled)
..(act)
else
message = "[src] makes a noise."
m_type = 2
- if ("whimper")
+ if ("whimper","whimpers")
if (!muzzled)
..(act)
else
message = "[src] makes a weak noise."
m_type = 2
- if ("wink")
+ if ("wink","winks")
message = "[src] winks."
m_type = 1
- if ("yawn")
+ if ("yawn","yawns")
if (!muzzled)
..(act)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 2b5a09b4c72..6523c085039 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -6,8 +6,6 @@
param = copytext(act, t1 + 1, length(act) + 1)
act = copytext(act, 1, t1)
- if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
- act = copytext(act,1,length(act))
var/muzzled = is_muzzled()
//var/m_type = 1
@@ -28,29 +26,29 @@
message = "[src] flaps \his wings ANGRILY!"
m_type = 2
- if ("choke")
+ if ("choke","chokes")
if (miming)
message = "[src] clutches \his throat desperately!"
else
..(act)
- if ("chuckle")
+ if ("chuckle","chuckles")
if(miming)
message = "[src] appears to chuckle."
else
..(act)
- if ("clap")
+ if ("clap","claps")
if (!src.restrained())
message = "[src] claps."
m_type = 2
- if ("collapse")
+ if ("collapse","collapses")
Paralyse(2)
message = "[src] collapses!"
m_type = 2
- if ("cough")
+ if ("cough","coughs")
if (miming)
message = "[src] appears to cough!"
else
@@ -61,7 +59,7 @@
message = "[src] makes a strong noise."
m_type = 2
- if ("cry")
+ if ("cry","crys","cries") //I feel bad if people put s at the end of cry. -Sum99
if (miming)
message = "[src] cries."
else
@@ -101,7 +99,7 @@
return
message = "[src] [input]"
- if ("dap")
+ if ("dap","daps")
m_type = 1
if (!src.restrained())
var/M = null
@@ -119,24 +117,24 @@
message = "[src] raises an eyebrow."
m_type = 1
- if ("flap")
+ if ("flap","flaps")
if (!src.restrained())
message = "[src] flaps \his wings."
m_type = 2
- if ("gasp")
+ if ("gasp","gasps")
if (miming)
message = "[src] appears to be gasping!"
else
..(act)
- if ("giggle")
+ if ("giggle","giggles")
if (miming)
message = "[src] giggles silently!"
else
..(act)
- if ("groan")
+ if ("groan","groans")
if (miming)
message = "[src] appears to groan!"
else
@@ -147,7 +145,7 @@
message = "[src] makes a loud noise."
m_type = 2
- if ("grumble")
+ if ("grumble","grumbles")
if (!muzzled)
message = "[src] grumbles!"
else
@@ -171,7 +169,7 @@
else
message = "[src] holds out \his hand to [M]."
- if ("hug")
+ if ("hug","hugs")
m_type = 1
if (!src.restrained())
var/M = null
@@ -215,14 +213,14 @@
else
message = "[src] [message]"
- if ("moan")
+ if ("moan","moans")
if(miming)
message = "[src] appears to moan!"
else
message = "[src] moans!"
m_type = 2
- if ("mumble")
+ if ("mumble","mumbles")
message = "[src] mumbles!"
m_type = 2
@@ -235,7 +233,7 @@
message = "[src] raises a hand."
m_type = 1
- if ("salute")
+ if ("salute","salutes")
if (!src.buckled)
var/M = null
if (param)
@@ -251,27 +249,27 @@
message = "[src] salutes."
m_type = 1
- if ("scream")
+ if ("scream","screams")
if (miming)
message = "[src] acts out a scream!"
else
..(act)
- if ("shiver")
+ if ("shiver","shivers")
message = "[src] shivers."
m_type = 1
- if ("shrug")
+ if ("shrug","shrugs")
message = "[src] shrugs."
m_type = 1
- if ("sigh")
+ if ("sigh","sighs")
if(miming)
message = "[src] sighs."
else
..(act)
- if ("signal")
+ if ("signal","signals")
if (!src.restrained())
var/t1 = round(text2num(param))
if (isnum(t1))
@@ -281,34 +279,34 @@
message = "[src] raises [t1] finger\s."
m_type = 1
- if ("sneeze")
+ if ("sneeze","sneezes")
if (miming)
message = "[src] sneezes."
else
..(act)
- if ("sniff")
+ if ("sniff","sniffs")
message = "[src] sniffs."
m_type = 2
- if ("snore")
+ if ("snore","snores")
if (miming)
message = "[src] sleeps soundly."
else
..(act)
- if ("whimper")
+ if ("whimper","whimpers")
if (miming)
message = "[src] appears hurt."
else
..(act)
- if ("yawn")
+ if ("yawn","yawns")
if (!muzzled)
message = "[src] yawns."
m_type = 2
- if("wag")
+ if("wag","wags")
if(dna && dna.species && (("tail_lizard" in dna.species.mutant_bodyparts) || (features["tail_human"] != "None")))
message = "[src] wags \his tail."
startTailWag()
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 4d4876bb4db..0e90a523120 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -707,6 +707,7 @@
switch(H.hal_screwyhud)
if(1) H.healths.icon_state = "health6"
if(2) H.healths.icon_state = "health7"
+ if(5) H.healths.icon_state = "health0"
else
switch(H.health - H.staminaloss)
if(100 to INFINITY) H.healths.icon_state = "health0"
@@ -737,6 +738,8 @@
icon_num = 4
if(damage > (comparison*4))
icon_num = 5
+ if(H.hal_screwyhud == 5)
+ icon_num = 0
if(icon_num)
H.healthdoll.overlays += image('icons/mob/screen_gen.dmi',"[L.name][icon_num]")
diff --git a/code/modules/mob/living/carbon/monkey/emote.dm b/code/modules/mob/living/carbon/monkey/emote.dm
index e21d3a48bb7..42adb99ec59 100644
--- a/code/modules/mob/living/carbon/monkey/emote.dm
+++ b/code/modules/mob/living/carbon/monkey/emote.dm
@@ -6,19 +6,17 @@
param = copytext(act, t1 + 1, length(act) + 1)
act = copytext(act, 1, t1)
- if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
- act = copytext(act,1,length(act))
var/muzzled = is_muzzled()
var/m_type = 1
var/message
switch(act) //Ooh ooh ah ah keep this alphabetical ooh ooh ah ah!
- if ("deathgasp")
+ if ("deathgasp","deathgasps")
message = "[src] lets out a faint chimper as it collapses and stops moving..."
m_type = 1
- if ("gnarl")
+ if ("gnarl","gnarls")
if (!muzzled)
message = "[src] gnarls and shows its teeth.."
m_type = 2
@@ -28,35 +26,35 @@
message = "[src] flails its paw."
m_type = 1
- if ("moan")
+ if ("moan","moans")
message = "[src] moans!"
m_type = 2
- if ("roar")
+ if ("roar","roars")
if (!muzzled)
message = "[src] roars."
m_type = 2
- if ("roll")
+ if ("roll","rolls")
if (!src.restrained())
message = "[src] rolls."
m_type = 1
- if ("scratch")
+ if ("scratch","scratches")
if (!src.restrained())
message = "[src] scratches."
m_type = 1
- if ("scretch")
+ if ("screech","screeches")
if (!muzzled)
- message = "[src] scretches."
+ message = "[src] screeches."
m_type = 2
- if ("shiver")
+ if ("shiver","shivers")
message = "[src] shivers."
m_type = 2
- if ("sign")
+ if ("sign","signs")
if (!src.restrained())
message = text("[src] signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))
m_type = 1
@@ -66,7 +64,7 @@
m_type = 1
if ("help") //Ooh ah ooh ooh this is an exception to alphabetical ooh ooh.
- src << "Help for monkey emotes. You can use these emotes with say \"*emote\":\n\naflap, airguitar, blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, dance, deathgasp, drool, flap, frown, gasp, gnarl, giggle, glare-(none)/mob, grin, jump, laugh, look, me, moan, nod, paw, point-(atom), roar, roll, scream, scratch, scretch, shake, shiver, sigh, sign-#, sit, smile, sneeze, sniff, snore, stare-(none)/mob, sulk, sway, tail, tremble, twitch, twitch_s, wave whimper, wink, yawn"
+ src << "Help for monkey emotes. You can use these emotes with say \"*emote\":\n\naflap, airguitar, blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, dance, deathgasp, drool, flap, frown, gasp, gnarl, giggle, glare-(none)/mob, grin, jump, laugh, look, me, moan, nod, paw, point-(atom), roar, roll, scream, scratch, screech, shake, shiver, sigh, sign-#, sit, smile, sneeze, sniff, snore, stare-(none)/mob, sulk, sway, tail, tremble, twitch, twitch_s, wave whimper, wink, yawn"
else
..(act)
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index 112fe73cc82..06f663a56f2 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -143,7 +143,7 @@
/mob/living/carbon/monkey/handle_changeling()
if(mind && hud_used)
if(mind.changeling)
- mind.changeling.regenerate()
+ mind.changeling.regenerate(src)
hud_used.lingchemdisplay.invisibility = 0
hud_used.lingchemdisplay.maptext = "[round(mind.changeling.chem_charges)]
"
else
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index ef8a6b82680..a3092fb9228 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -8,25 +8,22 @@
var/param = null
- if (findtext(act, "-", 1, null))
+ if (findtext(act, "-", 1, null)) //Removes dashes for npcs "EMOTE-PLAYERNAME" or something like that, I ain't no AI coder. It's not for players. -Sum99
var/t1 = findtext(act, "-", 1, null)
param = copytext(act, t1 + 1, length(act) + 1)
act = copytext(act, 1, t1)
- if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
- act = copytext(act,1,length(act))
-
switch(act)//Hello, how would you like to order? Alphabetically!
if ("aflap")
if (!src.restrained())
message = "[src] flaps its wings ANGRILY!"
m_type = 2
- if ("blush")
+ if ("blush","blushes")
message = "[src] blushes."
m_type = 1
- if ("bow")
+ if ("bow","bows")
if (!src.buckled)
var/M = null
if (param)
@@ -42,70 +39,70 @@
message = "[src] bows."
m_type = 1
- if ("burp")
+ if ("burp","burps")
message = "[src] burps."
m_type = 2
- if ("choke")
+ if ("choke","chokes")
message = "[src] chokes!"
m_type = 2
- if ("chuckle")
+ if ("chuckle","chuckles")
message = "[src] chuckles."
m_type = 2
- if ("collapse")
+ if ("collapse","collapses")
Paralyse(2)
message = "[src] collapses!"
m_type = 2
- if ("cough")
+ if ("cough","coughs")
message = "[src] coughs!"
m_type = 2
- if ("dance")
+ if ("dance","dances")
if (!src.restrained())
message = "[src] dances around happily."
m_type = 1
- if ("deathgasp")
+ if ("deathgasp","deathgasps")
message = "[src] seizes up and falls limp, its eyes dead and lifeless..."
m_type = 1
- if ("drool")
+ if ("drool","drools")
message = "[src] drools."
m_type = 1
- if ("faint")
+ if ("faint","faints")
message = "[src] faints."
if(src.sleeping)
return //Can't faint while asleep
src.sleeping += 10 //Short-short nap
m_type = 1
- if ("flap")
+ if ("flap","flaps")
if (!src.restrained())
message = "[src] flaps its wings."
m_type = 2
- if ("flip")
+ if ("flip","flips")
if (!src.restrained() || !src.resting || !src.sleeping)
src.SpinAnimation(7,1)
m_type = 2
- if ("frown")
+ if ("frown","frowns")
message = "[src] frowns."
m_type = 1
- if ("gasp")
+ if ("gasp","gasps")
message = "[src] gasps!"
m_type = 2
- if ("giggle")
+ if ("giggle","giggles")
message = "[src] giggles."
m_type = 2
- if ("glare")
+ if ("glare","glares")
var/M = null
if (param)
for (var/mob/A in view(1, src))
@@ -119,19 +116,19 @@
else
message = "[src] glares."
- if ("grin")
+ if ("grin","grins")
message = "[src] grins."
m_type = 1
- if ("jump")
+ if ("jump","jumps")
message = "[src] jumps!"
m_type = 1
- if ("laugh")
+ if ("laugh","laughs")
message = "[src] laughs."
m_type = 2
- if ("look")
+ if ("look","looks")
var/M = null
if (param)
for (var/mob/A in view(1, src))
@@ -158,11 +155,11 @@
else
message = "[src] [message]"
- if ("nod")
+ if ("nod","nods")
message = "[src] nods."
m_type = 1
- if ("point")
+ if ("point","points")
if (!src.restrained())
var/atom/M = null
if (param)
@@ -176,39 +173,39 @@
pointed(M)
m_type = 1
- if ("scream")
+ if ("scream","screams")
message = "[src] screams!"
m_type = 2
- if ("shake")
+ if ("shake","shakes")
message = "[src] shakes its head."
m_type = 1
- if ("sigh")
+ if ("sigh","sighs")
message = "[src] sighs."
m_type = 2
- if ("sit")
+ if ("sit","sits")
message = "[src] sits down."
m_type = 1
- if ("smile")
+ if ("smile","smiles")
message = "[src] smiles."
m_type = 1
- if ("sneeze")
+ if ("sneeze","sneezes")
message = "[src] sneezes."
m_type = 2
- if ("sniff")
+ if ("sniff","sniffs")
message = "[src] sniffs."
m_type = 2
- if ("snore")
+ if ("snore","snores")
message = "[src] snores."
m_type = 2
- if ("stare")
+ if ("stare","stares")
var/M = null
if (param)
for (var/mob/A in view(1, src))
@@ -222,19 +219,19 @@
else
message = "[src] stares."
- if ("sulk")
+ if ("sulk","sulks")
message = "[src] sulks down sadly."
m_type = 1
- if ("sway")
+ if ("sway","sways")
message = "[src] sways around dizzily."
m_type = 1
- if ("tremble")
+ if ("tremble","trembles")
message = "[src] trembles in fear!"
m_type = 1
- if ("twitch")
+ if ("twitch","twitches")
message = "[src] twitches violently."
m_type = 1
@@ -242,15 +239,15 @@
message = "[src] twitches."
m_type = 1
- if ("wave")
+ if ("wave","waves")
message = "[src] waves."
m_type = 1
- if ("whimper")
+ if ("whimper","whimpers")
message = "[src] whimpers."
m_type = 2
- if ("yawn")
+ if ("yawn","yawns")
message = "[src] yawns."
m_type = 2
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index bbcdc72c6aa..5dc99707a72 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -99,22 +99,23 @@ Sorry Giacom. Please don't be mad :(
if(loc && !loc.Adjacent(M.loc))
return 1
now_pushing = 1
- //TODO: Make this use Move(). we're pretty much recreating it here.
- //it could be done by setting one of the locs to null to make Move() work, then setting it back and Move() the other mob
var/oldloc = loc
- loc = M.loc
- M.loc = oldloc
- M.LAssailant = src
+ var/oldMloc = M.loc
- for(var/mob/living/simple_animal/slime/slime in view(1,M))
- if(slime.Victim == M)
- slime.UpdateFeed()
- //cross any movable atoms on either turf
- for(var/atom/movable/AM in loc)
- AM.Crossed(src)
- for(var/atom/movable/AM in oldloc)
- AM.Crossed(M)
+ var/M_passmob = (M.pass_flags & PASSMOB) // we give PASSMOB to both mobs to avoid bumping other mobs during swap.
+ var/src_passmob = (pass_flags & PASSMOB)
+ M.pass_flags |= PASSMOB
+ pass_flags |= PASSMOB
+
+ M.Move(oldloc)
+ Move(oldMloc)
+
+ if(!src_passmob)
+ pass_flags &= ~PASSMOB
+ if(!M_passmob)
+ M.pass_flags &= ~PASSMOB
+
now_pushing = 0
return 1
@@ -569,7 +570,8 @@ Sorry Giacom. Please don't be mad :(
else
stop_pulling()
. = ..()
- if ((s_active && !( s_active in contents ) ))
+ if (s_active && !(s_active in contents) && !(s_active.loc in contents))
+ // It's ugly. But everything related to inventory/storage is. -- c0
s_active.close(src)
for(var/mob/living/simple_animal/slime/M in oview(1,src))
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 43e2c2735bf..9d8017d0c2b 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -44,12 +44,6 @@
else
return 0
-/mob/living/throw_impact(atom/hit_atom)
- . = ..()
- if(hit_atom.density)
- Weaken(1)
- take_organ_damage(10)
-
/mob/living/hitby(atom/movable/AM)
if(istype(AM, /obj/item))
var/obj/item/I = AM
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 56c0426c5bc..06f14523bcf 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -25,7 +25,7 @@
var/list/surgeries = list() //a list of surgery datums. generally empty, they're added when the player wants them.
- var/now_pushing = null
+ var/now_pushing = null //used by living/Bump() and living/PushAM() to prevent potential infinite loop.
var/cameraFollow = null
@@ -34,6 +34,8 @@
var/on_fire = 0 //The "Are we on fire?" var
var/fire_stacks = 0 //Tracks how many stacks of fire we have on, max is usually 20
+ var/bloodcrawl = 0 //0 No blood crawling, BLOODCRAWL for bloodcrawling, BLOODCRAWL_EAT for crawling+mob devour
+ var/holder = null //The holder for blood crawling
var/ventcrawler = 0 //0 No vent crawling, 1 vent crawling in the nude, 2 vent crawling always
var/floating = 0
var/mob_size = MOB_SIZE_HUMAN
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index f7910fd9d77..d9a69f3c25a 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -90,7 +90,8 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
src << "You find yourself unable to speak!"
return
- message = treat_message(message)
+ if(message_mode != MODE_WHISPER) //whisper() calls treat_message(); double process results in "hisspering"
+ message = treat_message(message)
var/spans = list()
spans += get_spans()
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index d424af7bf41..4280be744bc 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -5,8 +5,6 @@
param = copytext(act, t1 + 1, length(act) + 1)
act = copytext(act, 1, t1)
- if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
- act = copytext(act,1,length(act))
switch(act)//01000001011011000111000001101000011000010110001001100101011101000110100101111010011001010110010000100001 (Seriously please keep it that way.)
if ("aflap")
@@ -15,7 +13,7 @@
m_type = 2
m_type = 1
- if("beep")
+ if("beep","beeps")
var/M = null
if(param)
for (var/mob/A in view(1, src))
@@ -32,7 +30,7 @@
playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
m_type = 2
- if ("bow")
+ if ("bow","bows")
if (!src.buckled)
var/M = null
if (param)
@@ -70,12 +68,12 @@
playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
m_type = 2
- if ("chime") //You have mail!
+ if ("chime","chimes") //You have mail!
message = "[src] chimes."
playsound(loc, 'sound/machines/chime.ogg', 50, 0)
m_type = 2
- if ("clap")
+ if ("clap","claps")
if (!src.restrained())
message = "[src] claps."
m_type = 2
@@ -94,16 +92,16 @@
return
message = "[src] [input]"
- if ("deathgasp")
+ if ("deathgasp","deathgasps")
message = "[src] shudders violently for a moment, then becomes motionless, its eyes slowly darkening."
m_type = 1
- if ("flap")
+ if ("flap","flaps")
if (!src.restrained())
message = "[src] flaps \his wings."
m_type = 2
- if ("glare")
+ if ("glare","glares")
var/M = null
if (param)
for (var/mob/A in view(1, src))
@@ -117,12 +115,12 @@
else
message = "[src] glares."
- if ("honk") //Honk!
+ if ("honk","honks") //Honk!
message = "[src] honks!"
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
m_type = 2
- if ("look")
+ if ("look","looks")
var/M = null
if (param)
for (var/mob/A in view(1, src))
@@ -150,11 +148,11 @@
else
message = "[src] [message]"
- if ("nod")
+ if ("nod","nods")
message = "[src] nods."
m_type = 1
- if ("ping")
+ if ("ping","pings")
var/M = null
if(param)
for (var/mob/A in view(1, src))
@@ -175,7 +173,7 @@
playsound(loc, 'sound/misc/sadtrombone.ogg', 50, 0)
m_type = 2
- if ("salute")
+ if ("salute","salutes")
if (!src.buckled)
var/M = null
if (param)
@@ -191,7 +189,7 @@
else
message = "[src] salutes."
- if ("stare")
+ if ("stare","stares")
var/M = null
if (param)
for (var/mob/A in view(1, src))
@@ -206,7 +204,7 @@
message = "[src] stares."
m_type = 1
- if ("twitch")
+ if ("twitch","twitches")
message = "[src] twitches violently."
m_type = 1
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 68300be05f1..e37ec22d115 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -63,6 +63,7 @@
var/braintype = "Cyborg"
var/lamp_max = 10 //Maximum brightness of a borg lamp. Set as a var for easy adjusting.
var/lamp_intensity = 0 //Luminosity of the headlamp. 0 is off. Higher settings than the minimum require power.
+ var/lamp_recharging = 0 //Flag for if the lamp is on cooldown after being forcibly disabled.
/mob/living/silicon/robot/New(loc)
spark_system = new /datum/effect/effect/system/spark_spread()
@@ -990,7 +991,7 @@
set_autosay()
/mob/living/silicon/robot/proc/control_headlamp()
- if(stat)
+ if(stat || lamp_recharging)
src << "This function is currently offline."
return
@@ -999,12 +1000,15 @@
src << "[lamp_intensity ? "Headlamp power set to Level [lamp_intensity/2]" : "Headlamp disabled."]"
update_headlamp()
-/mob/living/silicon/robot/proc/update_headlamp(var/turn_off = 0)
+/mob/living/silicon/robot/proc/update_headlamp(var/turn_off = 0, var/cooldown = 100)
SetLuminosity(0)
if(lamp_intensity && (turn_off || stat))
src << "Your headlamp has been deactivated."
lamp_intensity = 0
+ lamp_recharging = 1
+ spawn(cooldown) //10 seconds by default, if the source of the deactivation does not keep stat that long.
+ lamp_recharging = 0
else
AddLuminosity(lamp_intensity)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 92749a073a2..83b20b450cb 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -153,7 +153,7 @@
/mob/living/silicon/bullet_act(obj/item/projectile/Proj)
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
adjustBruteLoss(Proj.damage)
- Proj.on_hit(src,2)
+ Proj.on_hit(src)
return 2
/mob/living/silicon/apply_effect(effect = 0,effecttype = STUN, blocked = 0)
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 261dad9eaa9..ed126f984ed 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -61,7 +61,7 @@
return
if(Proj.damage_type == BURN || Proj.damage_type == BRUTE)
adjustBruteLoss(Proj.damage)
- Proj.on_hit(src, 0)
+ Proj.on_hit(src)
return 0
/mob/living/simple_animal/construct/narsie_act()
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index cfafe5093b8..3d04bb5dc61 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -40,14 +40,14 @@
var/plant_cooldown = 30
var/plants_off = 0
-/mob/living/simple_animal/hostile/alien/drone/Life()
- ..()
- if(!stat)
- plant_cooldown--
- if(stance==HOSTILE_STANCE_IDLE)
- if(!plants_off && prob(10) && plant_cooldown<=0)
- plant_cooldown = initial(plant_cooldown)
- SpreadPlants()
+/mob/living/simple_animal/hostile/alien/drone/handle_automated_action()
+ if(!..()) //AIStatus is off
+ return
+ plant_cooldown--
+ if(AIStatus == AI_IDLE)
+ if(!plants_off && prob(10) && plant_cooldown<=0)
+ plant_cooldown = initial(plant_cooldown)
+ SpreadPlants()
/mob/living/simple_animal/hostile/alien/sentinel
name = "alien sentinel"
@@ -87,18 +87,18 @@
var/egg_cooldown = 30
var/plant_cooldown = 30
-/mob/living/simple_animal/hostile/alien/queen/Life()
- ..()
- if(!stat)
- egg_cooldown--
- plant_cooldown--
- if(stance==HOSTILE_STANCE_IDLE)
- if(!plants_off && prob(10) && plant_cooldown<=0)
- plant_cooldown = initial(plant_cooldown)
- SpreadPlants()
- if(!sterile && prob(10) && egg_cooldown<=0)
- egg_cooldown = initial(egg_cooldown)
- LayEggs()
+/mob/living/simple_animal/hostile/alien/queen/handle_automated_action()
+ if(!..()) //AIStatus is off
+ return
+ egg_cooldown--
+ plant_cooldown--
+ if(AIStatus == AI_IDLE)
+ if(!plants_off && prob(10) && plant_cooldown<=0)
+ plant_cooldown = initial(plant_cooldown)
+ SpreadPlants()
+ if(!sterile && prob(10) && egg_cooldown<=0)
+ egg_cooldown = initial(egg_cooldown)
+ LayEggs()
/mob/living/simple_animal/hostile/alien/proc/SpreadPlants()
if(!isturf(loc) || istype(loc, /turf/space))
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index e28524867f2..ae03ebe143e 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -13,10 +13,7 @@
if(isliving(target))
var/mob/living/L = target
if(L.reagents)
- L.reagents.add_reagent("toxin", poison_per_bite)
- if(prob(poison_per_bite))
- L << "You feel a tiny prick."
- L.reagents.add_reagent(poison_type, poison_per_bite)
+ L.reagents.add_reagent(poison_type, poison_per_bite)
@@ -77,20 +74,18 @@
poison_per_bite = 5
move_to_delay = 5
-/mob/living/simple_animal/hostile/poison/giant_spider/Life()
- ..()
- if(!stat && !ckey)
- if(stance == HOSTILE_STANCE_IDLE)
- //1% chance to skitter madly away
- if(!busy && prob(1))
- /*var/list/move_targets = list()
- for(var/turf/T in orange(20, src))
- move_targets.Add(T)*/
- stop_automated_movement = 1
- Goto(pick(orange(20, src)), move_to_delay)
- spawn(50)
- stop_automated_movement = 0
- walk(src,0)
+/mob/living/simple_animal/hostile/poison/giant_spider/handle_automated_action()
+ if(!..()) //AIStatus is off
+ return 0
+ if(AIStatus == AI_IDLE)
+ //1% chance to skitter madly away
+ if(!busy && prob(1))
+ stop_automated_movement = 1
+ Goto(pick(orange(20, src)), move_to_delay)
+ spawn(50)
+ stop_automated_movement = 0
+ walk(src,0)
+ return 1
/mob/living/simple_animal/hostile/poison/giant_spider/nurse/proc/GiveUp(C)
spawn(100)
@@ -100,53 +95,50 @@
busy = 0
stop_automated_movement = 0
-/mob/living/simple_animal/hostile/poison/giant_spider/nurse/Life()
- ..()
- if(!stat && !ckey)
- if(stance == HOSTILE_STANCE_IDLE)
- var/list/can_see = view(src, 10)
- //30% chance to stop wandering and do something
- if(!busy && prob(30))
- //first, check for potential food nearby to cocoon
- for(var/mob/living/C in can_see)
- if(C.stat && !istype(C,/mob/living/simple_animal/hostile/poison/giant_spider))
- cocoon_target = C
- busy = MOVING_TO_TARGET
- Goto(C, move_to_delay)
- //give up if we can't reach them after 10 seconds
- GiveUp(C)
- return
+/mob/living/simple_animal/hostile/poison/giant_spider/nurse/handle_automated_action()
+ if(..())
+ var/list/can_see = view(src, 10)
+ if(!busy && prob(30)) //30% chance to stop wandering and do something
+ //first, check for potential food nearby to cocoon
+ for(var/mob/living/C in can_see)
+ if(C.stat && !istype(C,/mob/living/simple_animal/hostile/poison/giant_spider))
+ cocoon_target = C
+ busy = MOVING_TO_TARGET
+ Goto(C, move_to_delay)
+ //give up if we can't reach them after 10 seconds
+ GiveUp(C)
+ return
- //second, spin a sticky spiderweb on this tile
- var/obj/effect/spider/stickyweb/W = locate() in get_turf(src)
- if(!W)
- Web()
+ //second, spin a sticky spiderweb on this tile
+ var/obj/effect/spider/stickyweb/W = locate() in get_turf(src)
+ if(!W)
+ Web()
+ else
+ //third, lay an egg cluster there
+ if(fed)
+ LayEggs()
else
- //third, lay an egg cluster there
- if(fed)
- LayEggs()
- else
- //fourthly, cocoon any nearby items so those pesky pinkskins can't use them
- for(var/obj/O in can_see)
+ //fourthly, cocoon any nearby items so those pesky pinkskins can't use them
+ for(var/obj/O in can_see)
- if(O.anchored)
- continue
+ if(O.anchored)
+ continue
- if(istype(O, /obj/item) || istype(O, /obj/structure) || istype(O, /obj/machinery))
- cocoon_target = O
- busy = MOVING_TO_TARGET
- stop_automated_movement = 1
- Goto(O, move_to_delay)
- //give up if we can't reach them after 10 seconds
- GiveUp(O)
+ if(istype(O, /obj/item) || istype(O, /obj/structure) || istype(O, /obj/machinery))
+ cocoon_target = O
+ busy = MOVING_TO_TARGET
+ stop_automated_movement = 1
+ Goto(O, move_to_delay)
+ //give up if we can't reach them after 10 seconds
+ GiveUp(O)
- else if(busy == MOVING_TO_TARGET && cocoon_target)
- if(get_dist(src, cocoon_target) <= 1)
- Wrap()
+ else if(busy == MOVING_TO_TARGET && cocoon_target)
+ if(get_dist(src, cocoon_target) <= 1)
+ Wrap()
- else
- busy = 0
- stop_automated_movement = 0
+ else
+ busy = 0
+ stop_automated_movement = 0
/mob/living/simple_animal/hostile/poison/giant_spider/verb/Web()
set name = "Lay Web"
@@ -249,6 +241,8 @@
var/obj/effect/spider/eggcluster/C = new /obj/effect/spider/eggcluster(src.loc)
if(ckey)
C.player_spiders = 1
+ C.poison_type = poison_type
+ C.poison_per_bite = poison_per_bite
fed--
busy = 0
stop_automated_movement = 0
@@ -262,4 +256,4 @@
#undef SPINNING_WEB
#undef LAYING_EGGS
#undef MOVING_TO_TARGET
-#undef SPINNING_COCOON
\ No newline at end of file
+#undef SPINNING_COCOON
diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
index 1d46890166d..2fe08fe36ed 100644
--- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm
+++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
@@ -1,4 +1,4 @@
-#define EGG_INCUBATION_TIME 180
+#define EGG_INCUBATION_TIME 120
/mob/living/simple_animal/hostile/headcrab
name = "Headslug"
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index b70b4418d89..c51fc8e17b1 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -2,7 +2,6 @@
faction = list("hostile")
stop_automated_movement_when_pulled = 0
environment_smash = 1 //Set to 1 to break closets,tables,racks, etc; 2 for walls; 3 for rwalls
- var/stance = HOSTILE_STANCE_IDLE //Used to determine behavior
var/atom/target
var/ranged = 0
var/rapid = 0
@@ -32,37 +31,32 @@
var/stat_exclusive = 0 //Mobs with this set to 1 will exclusively attack things defined by stat_attack, stat_attack 2 means they will only attack corpses
var/attack_same = 0 //Set us to 1 to allow us to attack our own faction, or 2, to only ever attack our own faction
- var/AIStatus = AI_ON //The Status of our AI, can be set to AI_ON (On, usual processing), AI_SLEEP (Will not process, but will return to AI_ON if an enemy comes near), AI_OFF (Off, Not processing ever)
+ var/AIStatus = AI_ON //The Status of our AI, can be set to AI_ON (On, usual processing), AI_IDLE (Will not process, but will return to AI_ON if an enemy comes near), AI_OFF (Off, Not processing ever)
/mob/living/simple_animal/hostile/Life()
-
. = ..()
if(!.) //dead
walk(src, 0) //stops walking
return 0
+
+/mob/living/simple_animal/hostile/handle_automated_action()
+ if(AIStatus == AI_OFF)
+ return 0
if(ranged)
ranged_cooldown--
- if(client)
- return 0
- if(!AICanContinue())
- return 0
- if(!stat)
- switch(stance)
- if(HOSTILE_STANCE_IDLE)
- if(environment_smash)
- EscapeConfinement()
- FindTarget()
+ var/list/possible_targets = ListTargets() //we look around for potential targets and make it a list for later use.
- if(HOSTILE_STANCE_ATTACK)
- MoveToTarget()
- DestroySurroundings()
+ if(environment_smash)
+ EscapeConfinement()
+
+ if(AICanContinue(possible_targets))
+ DestroySurroundings()
+ if(!MoveToTarget(possible_targets)) //if we lose our target
+ if(AIShouldSleep(possible_targets)) // we try to acquire a new one
+ AIStatus = AI_IDLE // otherwise we go idle
+ return 1
- if(HOSTILE_STANCE_ATTACKING)
- AttackTarget()
- DestroySurroundings()
- if(AIShouldSleep())
- AIStatus = AI_SLEEP
//////////////HOSTILE MOB TARGETTING AND AGGRESSION////////////
@@ -81,19 +75,18 @@
L += Objects
return L
-/mob/living/simple_animal/hostile/proc/FindTarget()//Step 2, filter down possible targets to things we actually care about
+/mob/living/simple_animal/hostile/proc/FindTarget(var/list/possible_targets, var/HasTargetsList = 0)//Step 2, filter down possible targets to things we actually care about
var/list/Targets = list()
- var/Target
- for(var/atom/A in ListTargets())
+ if(!HasTargetsList)
+ possible_targets = ListTargets()
+ for(var/atom/A in possible_targets)
if(Found(A))//Just in case people want to override targetting
- var/list/FoundTarget = list()
- FoundTarget += A
- Targets = FoundTarget
+ Targets = list(A)
break
if(CanAttack(A))//Can we attack it?
Targets += A
continue
- Target = PickTarget(Targets)
+ var/Target = PickTarget(Targets)
GiveTarget(Target)
return Target //We now have a target
@@ -101,14 +94,14 @@
return
/mob/living/simple_animal/hostile/proc/PickTarget(list/Targets)//Step 3, pick amongst the possible, attackable targets
+ if(!Targets.len)//We didnt find nothin!
+ return
if(target != null)//If we already have a target, but are told to pick again, calculate the lowest distance between all possible, and pick from the lowest distance targets
for(var/atom/A in Targets)
var/target_dist = get_dist(src, target)
var/possible_target_distance = get_dist(src, A)
if(target_dist < possible_target_distance)
Targets -= A
- if(!Targets.len)//We didnt find nothin!
- return
var/chosen_target = pick(Targets)//Pick the remaining targets (if any) at random
return chosen_target
@@ -150,15 +143,14 @@
target = new_target
if(target != null)
Aggro()
- stance = HOSTILE_STANCE_ATTACK
- return
+ return 1
-/mob/living/simple_animal/hostile/proc/MoveToTarget()//Step 5, handle movement between us and our target
+/mob/living/simple_animal/hostile/proc/MoveToTarget(var/list/possible_targets)//Step 5, handle movement between us and our target
stop_automated_movement = 1
if(!target || !CanAttack(target))
LoseTarget()
- return
- if(target in ListTargets())
+ return 0
+ if(target in possible_targets)
var/target_distance = get_dist(src,target)
if(ranged)//We ranged? Shoot at em
if(target_distance >= 2 && ranged_cooldown <= 0)//But make sure they're a tile away at least, and our range attack is off cooldown
@@ -172,46 +164,33 @@
Goto(target,move_to_delay,minimum_distance)
if(isturf(loc) && target.Adjacent(src)) //If they're next to us, attack
AttackingTarget()
- return
+ return 1
if(environment_smash)
if(target.loc != null && get_dist(src, target.loc) <= vision_range)//We can't see our target, but he's in our vision range still
if(environment_smash >= 2)//If we're capable of smashing through walls, forget about vision completely after finding our target
Goto(target,move_to_delay,minimum_distance)
FindHidden()
- return
+ return 1
else
if(FindHidden())
- return
+ return 1
LoseTarget()
+ return 0
/mob/living/simple_animal/hostile/proc/Goto(target, delay, minimum_distance)
walk_to(src, target, minimum_distance, delay)
/mob/living/simple_animal/hostile/adjustBruteLoss(damage)
..(damage)
- if(!client && !stat && search_objects < 3)//Not unconscious, and we don't ignore mobs
+ if(!ckey && !stat && search_objects < 3)//Not unconscious, and we don't ignore mobs
if(search_objects)//Turn off item searching and ignore whatever item we were looking at, we're more concerned with fight or flight
search_objects = 0
target = null
- if(stance == HOSTILE_STANCE_IDLE)//If we took damage while idle, immediately attempt to find the source of it so we find a living target
- Aggro()
+ if(AIStatus == AI_IDLE)
+ AIStatus = AI_ON
+ FindTarget()
+ else if(target != null && prob(40))//No more pulling a mob forever and having a second player attack it, it can switch targets now if it finds a more suitable one
FindTarget()
- if(stance == HOSTILE_STANCE_ATTACK)//No more pulling a mob forever and having a second player attack it, it can switch targets now if it finds a more suitable one
- if(target != null && prob(40))
- FindTarget()
-
-/mob/living/simple_animal/hostile/proc/AttackTarget()
-
- stop_automated_movement = 1
- if(!target || !CanAttack(target))
- LoseTarget()
- return 0
- if(!(target in ListTargets()))
- LoseTarget()
- return 0
- if(isturf(loc) && target.Adjacent(src))
- AttackingTarget()
- return 1
/mob/living/simple_animal/hostile/proc/AttackingTarget()
target.attack_animal(src)
@@ -229,7 +208,6 @@
taunt_chance = initial(taunt_chance)
/mob/living/simple_animal/hostile/proc/LoseTarget()
- stance = HOSTILE_STANCE_IDLE
target = null
walk(src, 0)
LoseAggro()
@@ -325,30 +303,16 @@
////// AI Status ///////
-/mob/living/simple_animal/hostile/proc/AICanContinue()
+/mob/living/simple_animal/hostile/proc/AICanContinue(var/list/possible_targets)
switch(AIStatus)
if(AI_ON)
. = 1
- if(AI_SLEEP)
- if(AIShouldWake())
+ if(AI_IDLE)
+ if(FindTarget(possible_targets, 1))
. = 1
AIStatus = AI_ON //Wake up for more than one Life() cycle.
else
. = 0
- if(AI_OFF)
- . = 0
-
-//Returns 1 if the AI should wake up
-//Returns 0 if the AI should remain asleep
-/mob/living/simple_animal/hostile/proc/AIShouldWake()
- . = 0
- if(FindTarget())
- . = 1
-
-
-//Convenience
-/mob/living/simple_animal/hostile/proc/AIShouldSleep()
- . = !(AIShouldWake())
- if(. && stance != HOSTILE_STANCE_IDLE) //This proc was called before LoseTarget().
- LoseTarget()
+/mob/living/simple_animal/hostile/proc/AIShouldSleep(var/list/possible_targets)
+ return !FindTarget(possible_targets, 1)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index 45c8d140c89..7e01e2942ef 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -87,16 +87,12 @@
temperature = 50
/mob/living/simple_animal/hostile/asteroid/basilisk/GiveTarget(new_target)
- target = new_target
- if(target != null)
- Aggro()
- stance = HOSTILE_STANCE_ATTACK
+ if(..()) //we have a target
if(isliving(target))
var/mob/living/L = target
if(L.bodytemperature > 200)
L.bodytemperature = 200
visible_message("The [src.name]'s stare chills [L.name] to the bone!")
- return
/mob/living/simple_animal/hostile/asteroid/basilisk/ex_act(severity, target)
switch(severity)
@@ -154,17 +150,14 @@
if(target != null)
if(istype(target, /obj/item/weapon/ore))
visible_message("The [src.name] looks at [target.name] with hungry eyes.")
- stance = HOSTILE_STANCE_ATTACK
- return
- if(isliving(target))
+
+ else if(isliving(target))
Aggro()
- stance = HOSTILE_STANCE_ATTACK
visible_message("The [src.name] tries to flee from [target.name]!")
retreat_distance = 10
minimum_distance = 10
Burrow()
- return
- return
+
/mob/living/simple_animal/hostile/asteroid/goldgrub/AttackingTarget()
if(istype(target, /obj/item/weapon/ore))
@@ -366,7 +359,7 @@
/mob/living/simple_animal/hostile/asteroid/goliath/proc/handle_preattack()
if(ranged_cooldown <= 2 && !pre_attack)
pre_attack++
- if(!pre_attack || stat || stance == HOSTILE_STANCE_IDLE)
+ if(!pre_attack || stat || AIStatus == AI_IDLE)
return
icon_state = "Goliath_preattack"
diff --git a/code/modules/mob/living/simple_animal/morph/morph.dm b/code/modules/mob/living/simple_animal/morph/morph.dm
index 15d69564839..16e67c4f126 100644
--- a/code/modules/mob/living/simple_animal/morph/morph.dm
+++ b/code/modules/mob/living/simple_animal/morph/morph.dm
@@ -35,7 +35,7 @@
/mob/living/simple_animal/hostile/morph/examine(mob/user)
if(morphed)
form.examine(user) // Refactor examine to return desc so it's static? Not sure if worth it
- if(get_dist(user,src)<=3)
+ if(get_dist(user,src)<=3)
user << "Looks odd!"
else
..()
@@ -61,7 +61,7 @@
/mob/living/simple_animal/hostile/morph/proc/assume(atom/movable/target)
morphed = 1
form = target
-
+
//anim(loc,src,'icons/mob/mob.dmi',,"morph",,src.dir) No effect better than shit effect
//Todo : update to .appearance once 508 hits
@@ -89,9 +89,9 @@
return
morphed = 0
form = null
-
- //anim(loc,src,'icons/mob/mob.dmi',,"morph",,src.dir)
-
+
+ //anim(loc,src,'icons/mob/mob.dmi',,"morph",,src.dir)
+
name = initial(name)
icon = initial(icon)
icon_state = initial(icon_state)
@@ -127,7 +127,7 @@
/mob/living/simple_animal/hostile/morph/LoseAggro()
vision_range = idle_vision_range
-/mob/living/simple_animal/hostile/morph/AIShouldSleep()
+/mob/living/simple_animal/hostile/morph/AIShouldSleep(var/list/possible_targets)
. = ..()
if(.)
var/list/things = list()
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 938ee7cf586..64a70739e32 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -74,10 +74,10 @@
health = Clamp(health, 0, maxHealth)
/mob/living/simple_animal/Life()
- if(..())
- if(!client && !stat)
+ if(..()) //alive
+ if(!ckey)
handle_automated_movement()
-
+ handle_automated_action()
handle_automated_speech()
return 1
@@ -114,6 +114,9 @@
if(druggy)
druggy = 0
+/mob/living/simple_animal/proc/handle_automated_action()
+ return
+
/mob/living/simple_animal/proc/handle_automated_movement()
if(!stop_automated_movement && wander)
if(isturf(src.loc) && !resting && !buckled && canmove) //This is so it only moves if it's not inside a closet, gentics machine, etc.
@@ -254,7 +257,7 @@
if(!Proj)
return
apply_damage(Proj.damage, Proj.damage_type)
- Proj.on_hit(src, 0)
+ Proj.on_hit(src)
return 0
/mob/living/simple_animal/adjustFireLoss(amount)
diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm
index 58fe29515b3..ff0c9866215 100644
--- a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm
+++ b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm
@@ -12,7 +12,7 @@
icon = 'icons/mob/mob.dmi'
icon_state = "daemon"
icon_living = "daemon"
- speed = 0
+ speed = 1
a_intent = "harm"
stop_automated_movement = 1
status_flags = CANPUSH
@@ -21,22 +21,26 @@
minbodytemp = 0
faction = list("slaughter")
attacktext = "wildly tears into"
- maxHealth = 250
- health = 250
+ maxHealth = 200
+ health = 200
environment_smash = 1
melee_damage_lower = 30
melee_damage_upper = 30
see_in_dark = 8
+ var/boost = 0
+ bloodcrawl = BLOODCRAWL_EAT
see_invisible = SEE_INVISIBLE_MINIMUM
- var/devoured = 0
- var/phased = FALSE
- var/holder = null
- var/eating = FALSE
- var/mob/living/kidnapped = null
var/playstyle_string = "You are the Slaughter Demon, a terible creature from another existence. You have a single desire: To kill. \
You may Ctrl+Click on blood pools to travel through them, appearing and dissaapearing from the station at will. \
- Pulling a dead or critical mob while you enter a pool will pull them in with you, allowing you to feast. "
+ Pulling a dead or critical mob while you enter a pool will pull them in with you, allowing you to feast. \
+ You move quickly upon leaving a pool of blood, but the material world will soon sap your strength and leave you sluggish. "
+/mob/living/simple_animal/slaughter/Life()
+ ..()
+ if(boostThe [src] drags [victim] into the pool of blood!")
- src.kidnapped = victim
- src.loc = holder
- src.phased = TRUE
- src.holder = holder
- if(src.kidnapped)
- src << "You begin to feast on [kidnapped]. You can not move while you are doing this."
- src.eating = TRUE
- playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
- sleep(30)
- playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
- sleep(30)
- playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
- sleep(30)
- src << "You devour [kidnapped]. Your health is fully restored."
- src.adjustBruteLoss(-1000)
- kidnapped.ghostize()
- qdel(kidnapped)
- src.devoured++
- src.kidnapped = null
- src.eating = FALSE
- src.notransform = 0
-
-/mob/living/simple_animal/slaughter/proc/phasein(obj/effect/decal/cleanable/B)
- if(src.eating)
- src << "Finish eating first!"
- else
- src.loc = B.loc
- src.phased = FALSE
- src.client.eye = src
- src.visible_message("The [src] rises out of the pool of blood!")
- playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
- qdel(src.holder)
-
-/obj/effect/decal/cleanable/blood/CtrlClick(mob/user)
+/mob/living/simple_animal/slaughter/phasein()
..()
- if(istype(user, /mob/living/simple_animal/slaughter))
- var/mob/living/simple_animal/slaughter/S = user
- if(S.phased)
- S.phasein(src)
- else
- S.phaseout(src)
-
-
-/obj/effect/decal/cleanable/trail_holder/CtrlClick(mob/user)
- ..()
- if(istype(user, /mob/living/simple_animal/slaughter))
- var/mob/living/simple_animal/slaughter/S = user
- if(S.phased)
- S.phasein(src)
- else
- S.phaseout(src)
-
-
-
-/turf/CtrlClick(var/mob/user)
- ..()
- if(istype(user, /mob/living/simple_animal/slaughter))
- var/mob/living/simple_animal/slaughter/S = user
- for(var/obj/effect/decal/cleanable/B in src.contents)
- if(istype(B, /obj/effect/decal/cleanable/blood) || istype(B, /obj/effect/decal/cleanable/trail_holder))
- if(S.phased)
- S.phasein(B)
- break
- else
- S.phaseout(B)
- break
-
-/obj/effect/dummy/slaughter //Can't use the wizard one, blocked by jaunt/slow
- name = "water"
- icon = 'icons/effects/effects.dmi'
- icon_state = "nothing"
- var/canmove = 1
- density = 0
- anchored = 1
- invisibility = 60
-
-obj/effect/dummy/slaughter/relaymove(mob/user, direction)
- if (!src.canmove || !direction) return
- var/turf/newLoc = get_step(src,direction)
- loc = newLoc
- src.canmove = 0
- spawn(1)
- src.canmove = 1
-
-/obj/effect/dummy/slaughter/ex_act(blah)
- return
-/obj/effect/dummy/slaughter/bullet_act(blah)
- return
-
-/obj/effect/dummy/slaughter/singularity_act(blah)
- return
+ speed = 0
+ boost = world.time + 30
//////////The Loot
@@ -172,4 +66,11 @@ obj/effect/dummy/slaughter/relaymove(mob/user, direction)
desc = "It's still faintly beating with rage"
icon = 'icons/obj/surgery.dmi'
icon_state = "heart-on"
- origin_tech = "combat=5;biotech=8"
\ No newline at end of file
+ origin_tech = "combat=5;biotech=8"
+
+/obj/item/weapon/demonheart/attack_self(mob/living/user)
+ visible_message("[user] feasts upon the [src].")
+ user << "You absorb some of the demon's power!"
+ user.bloodcrawl = BLOODCRAWL
+ qdel(src)
+
diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm b/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm
index 8e836a74250..de3e477ab6d 100644
--- a/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm
+++ b/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm
@@ -36,9 +36,9 @@
spawn_locs += L.loc
if(!spawn_locs)
return find_slaughter()
- var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(pick(spawn_locs))
+ var /obj/effect/dummy/slaughter/holder = PoolOrNew(/obj/effect/dummy/slaughter,(pick(spawn_locs)))
var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder)
- S.phased = TRUE
+ S.holder = holder
player_mind.transfer_to(S)
player_mind.assigned_role = "Slaughter Demon"
player_mind.special_role = "Slaughter Demon"
@@ -64,4 +64,4 @@
log_game("[key_of_slaughter] was spawned as a Slaughter Demon by an event.")
return 0
message_admins("Unfortunately, no candidates were available for becoming a Slaugter Demon. Shutting down.")
- return kill()
\ No newline at end of file
+ return kill()
diff --git a/code/modules/mob/living/simple_animal/slime/emote.dm b/code/modules/mob/living/simple_animal/slime/emote.dm
index 85a298336a0..183ace95d10 100644
--- a/code/modules/mob/living/simple_animal/slime/emote.dm
+++ b/code/modules/mob/living/simple_animal/slime/emote.dm
@@ -6,43 +6,41 @@
//param = copytext(act, t1 + 1, length(act) + 1)
act = copytext(act, 1, t1)
- if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
- act = copytext(act,1,length(act))
var/m_type = 1
var/regenerate_icons
var/message
switch(act) //Alphabetical please
- if("bounce")
+ if("bounce","bounces")
message = "The [src.name] bounces in place."
m_type = 1
- if("jiggle")
+ if("jiggle","jiggles")
message = "The [src.name] jiggles!"
m_type = 1
- if("light")
+ if("light","lights")
message = "The [src.name] lights up for a bit, then stops."
m_type = 1
- if("moan")
+ if("moan","moans")
message = "The [src.name] moans."
m_type = 2
- if("shiver")
+ if("shiver","shivers")
message = "The [src.name] shivers."
m_type = 2
- if("sway")
+ if("sway","sways")
message = "The [src.name] sways around dizzily."
m_type = 1
- if("twitch")
+ if("twitch","twitches")
message = "The [src.name] twitches."
m_type = 1
- if("vibrate")
+ if("vibrate","vibrates")
message = "The [src.name] vibrates!"
m_type = 1
@@ -50,7 +48,7 @@
mood = null
regenerate_icons = 1
- if("smile")
+ if("smile","smiles")
mood = "mischevous"
regenerate_icons = 1
@@ -58,15 +56,15 @@
mood = ":33"
regenerate_icons = 1
- if("pout")
+ if("pout","pouts")
mood = "pout"
regenerate_icons = 1
- if("frown")
+ if("frown","frowns")
mood = "sad"
regenerate_icons = 1
- if("scowl")
+ if("scowl","scowls")
mood = "angry"
regenerate_icons = 1
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index 75da09b542c..6c2582fe005 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -167,7 +167,7 @@
attacked += 10
if((Proj.damage_type == BURN))
adjustBruteLoss(-abs(Proj.damage)) //fire projectiles heals slimes.
- Proj.on_hit(src, 0)
+ Proj.on_hit(src)
else
..(Proj)
return 0
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index b2415704445..3c0e579eb5f 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -946,6 +946,14 @@ var/list/slot_equipment_priority = list( \
return G
break
+/mob/proc/notify_ghost_cloning(var/message = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!", var/sound = 'sound/effects/genetics.ogg')
+ var/mob/dead/observer/ghost = get_ghost()
+ if(ghost)
+ ghost.notify_cloning(message, sound)
+ return ghost
+
+
+
/mob/proc/adjustEarDamage()
return
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 62fb5c75178..400a0facf8b 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -46,7 +46,7 @@
return 0
/proc/iscorgi(A)
- if(istype(A, /mob/living/simple_animal/pet/corgi))
+ if(istype(A, /mob/living/simple_animal/pet/dog/corgi))
return 1
return 0
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 0b5158f6085..2b4776c12b7 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -300,14 +300,11 @@
/mob/new_player/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
if (ticker.current_state == GAME_STATE_PLAYING)
- var/ailist[] = list()
- for (var/mob/living/silicon/ai/A in living_mob_list)
- ailist += A
- if (ailist.len)
- var/mob/living/silicon/ai/announcer = pick(ailist)
+ if(announcement_systems.len)
if(character.mind)
if((character.mind.assigned_role != "Cyborg") && (character.mind.assigned_role != character.mind.special_role))
- announcer.say("[announcer.radiomod] [character.real_name] has signed up as [rank].")
+ var/obj/machinery/announcement_system/announcer = pick(announcement_systems)
+ announcer.announce("ARRIVAL", character.real_name, rank, list()) //make the list empty to make it announce it in common
/mob/new_player/proc/LateChoices()
var/mills = world.time // 1/10 of a second, not real milliseconds but whatever
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index d065b489ff6..8cebce6b253 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -163,7 +163,7 @@
else if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(BARTENDER)
- clothes_s = new /icon('icons/mob/uniform.dmi', "bar_suit_s")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "barman_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
if(backbag == 1)
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 45fe320ce0c..46d057fd8fc 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -430,7 +430,7 @@
for(var/t in organs) //this really should not be necessary
qdel(t)
- var/mob/living/simple_animal/pet/corgi/new_corgi = new /mob/living/simple_animal/pet/corgi (loc)
+ var/mob/living/simple_animal/pet/dog/corgi/new_corgi = new /mob/living/simple_animal/pet/dog/corgi (loc)
new_corgi.a_intent = "harm"
new_corgi.key = key
@@ -509,7 +509,7 @@
//Good mobs!
if(ispath(MP, /mob/living/simple_animal/pet/cat))
return 1
- if(ispath(MP, /mob/living/simple_animal/pet/corgi))
+ if(ispath(MP, /mob/living/simple_animal/pet/dog/corgi))
return 1
if(ispath(MP, /mob/living/simple_animal/crab))
return 1
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
index e87ac8e1ff8..107502ce151 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
@@ -3,20 +3,22 @@
Contents:
- Stealth Verbs
-- Stealth Icon Stuff
*/
/obj/item/clothing/suit/space/space_ninja/proc/toggle_stealth()
var/mob/living/carbon/human/U = affecting
+ if(!U)
+ return
if(s_active)
cancel_stealth()
else
- spawn(0)
- anim(U.loc,U,'icons/mob/mob.dmi',,"cloak",,U.dir)
+ if(cell.charge <= 0)
+ U << "You don't have enough power to enable Stealth!"
+ return
s_active=!s_active
- U.alpha = 0
+ animate(U, U.alpha = 0,time = 15)
U.visible_message("[U.name] vanishes into thin air!", \
"You are now invisible to normal detection.")
return
@@ -24,11 +26,11 @@ Contents:
/obj/item/clothing/suit/space/space_ninja/proc/cancel_stealth()
var/mob/living/carbon/human/U = affecting
+ if(!U)
+ return 0
if(s_active)
- spawn(0)
- anim(U.loc,U,'icons/mob/mob.dmi',,"uncloak",,U.dir)
s_active=!s_active
- U.alpha = 255
+ animate(U, U.alpha = 255, time = 15)
U.visible_message("[U.name] appears from thin air!", \
"You are now visible.")
return 1
@@ -45,34 +47,3 @@ Contents:
else
affecting << "Stealth does not appear to work!"
-
-//Allows the mob to grab a stealth icon.
-/mob/proc/NinjaStealthActive(atom/A)//A is the atom which we are using as the overlay.
- invisibility = INVISIBILITY_LEVEL_TWO//Set ninja invis to 2.
- var/icon/opacity_icon = new(A.icon, A.icon_state)
- var/icon/alpha_mask = getIconMask(src)
- var/icon/alpha_mask_2 = new('icons/effects/effects.dmi', "at_shield1")
- alpha_mask.AddAlphaMask(alpha_mask_2)
- opacity_icon.AddAlphaMask(alpha_mask)
- for(var/i=0,i<5,i++)//And now we add it as overlays. It's faster than creating an icon and then merging it.
- var/image/I = image("icon" = opacity_icon, "icon_state" = A.icon_state, "layer" = layer+0.8)//So it's above other stuff but below weapons and the like.
- switch(i)//Now to determine offset so the result is somewhat blurred.
- if(1)
- I.pixel_x -= 1
- if(2)
- I.pixel_x += 1
- if(3)
- I.pixel_y -= 1
- if(4)
- I.pixel_y += 1
-
- overlays += I//And finally add the overlay.
- overlays += image("icon"='icons/effects/effects.dmi',"icon_state" ="electricity","layer" = layer+0.9)
-
-//When ninja steal malfunctions.
-/mob/proc/NinjaStealthMalf()
- invisibility = 0//Set ninja invis to 0.
- overlays += image("icon"='icons/effects/effects.dmi',"icon_state" ="electricity","layer" = layer+0.9)
- playsound(loc, 'sound/effects/stealthoff.ogg', 75, 1)
-
-
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index 810e9058165..5fcca544ae9 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -83,7 +83,6 @@ Contents:
cell.charge = 9000
-
/obj/item/clothing/suit/space/space_ninja/Destroy()
if(affecting)
affecting << browse(null, "window=hack spideros")
diff --git a/code/modules/ninja/suit/suit_process.dm b/code/modules/ninja/suit/suit_process.dm
index 6440ffc71c9..73fcd2d788c 100644
--- a/code/modules/ninja/suit/suit_process.dm
+++ b/code/modules/ninja/suit/suit_process.dm
@@ -4,25 +4,27 @@
set background = BACKGROUND_ENABLED
//Runs in the background while the suit is initialized.
- spawn while(cell.charge)
+ //Requires charge or stealth to process.
+ spawn while(cell.charge || s_active)
- //Let's check for some safeties.
if(s_initialized && !affecting)
terminate()//Kills the suit and attached objects.
if(!s_initialized)
- return//When turned off the proc stops.
+ return
- //Now let's do the normal processing.
- if(s_coold)
- s_coold--//Checks for ability s_cooldown first.
+ if(cell.charge)
+ if(s_coold)
+ s_coold--//Checks for ability s_cooldown first.
- var/A = s_cost//s_cost is the default energy cost each ntick, usually 5.
- if(s_active)//If stealth is active.
- A += s_acost
- cell.charge-=A
+ var/A = s_cost//s_cost is the default energy cost each ntick, usually 5.
+ if(s_active)//If stealth is active.
+ A += s_acost
+ cell.charge-=A
- if(!cell.charge)
+ if(cell.charge <= 0)
cell.charge=0
cancel_stealth()
sleep(10)//Checks every second.
+
+
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index e1a143f2f5d..fcd6363ddbb 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -11,6 +11,7 @@
var/select = 1 //The state of the select fire switch. Determines from the ammo_type list what kind of shot is fired next.
var/can_charge = 1 //Can it be charged in a recharger?
ammo_x_offset = 2
+ var/shaded_charge = 0 //if this gun uses a stateful charge bar for more detail
/obj/item/weapon/gun/energy/emp_act(severity)
power_supply.use(round(power_supply.charge / severity))
@@ -87,9 +88,12 @@
itemState += "[shot.select_name]"
if(power_supply.charge < shot.e_cost)
overlays += "[icon_state]_empty"
- ratio = 0
- for(var/i = ratio, i >= 1, i--)
- overlays += image(icon = icon, icon_state = iconState, pixel_x = ammo_x_offset * (i -1))
+ else
+ if(!shaded_charge)
+ for(var/i = ratio, i >= 1, i--)
+ overlays += image(icon = icon, icon_state = iconState, pixel_x = ammo_x_offset * (i -1))
+ else
+ overlays += image(icon = icon, icon_state = "[icon_state]_charge[ratio]")
if(F)
var/iconF = "flight"
if(F.on)
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index a3312bbe75e..f6b625d1169 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -8,7 +8,7 @@
origin_tech = "combat=3;magnets=2"
ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
ammo_x_offset = 1
-
+ shaded_charge = 1
/obj/item/weapon/gun/energy/laser/practice
name = "practice laser gun"
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index e11357de9a7..89c73331581 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -20,6 +20,7 @@
icon_state = "hoslaser"
force = 10
ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler)
+ ammo_x_offset = 4
/obj/item/weapon/gun/energy/gun/dragnet
name = "DRAGnet"
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index 18706908c93..0e143cefe8e 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -59,6 +59,6 @@
/obj/item/weapon/gun/energy/pulse/pistol/m1911
name = "\improper M1911-P"
desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers. It's not the size of the gun, it's the size of the hole it puts through people."
- icon_state = "m1911-p"
+ icon_state = "m1911"
item_state = "gun"
cell_type = "/obj/item/weapon/stock_parts/cell/infinite"
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 45e936f8867..1401c31937a 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -52,6 +52,7 @@
origin_tech = "materials=2;biotech=3;powerstorage=3"
modifystate = 1
var/charge_tick = 0
+ ammo_x_offset = 1
/obj/item/weapon/gun/energy/floragun/New()
..()
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 0a1eddc7eb5..4ff0cfff93c 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -60,19 +60,20 @@
if(!isliving(target))
return 0
var/mob/living/L = target
-
- var/organ_hit_text = ""
- if(L.has_limbs)
- organ_hit_text = " in \the [parse_zone(def_zone)]"
- if(suppressed)
- playsound(loc, hitsound, 5, 1, -1)
- L << "You're shot by \a [src][organ_hit_text]!"
- else
- if(hitsound)
- var/volume = vol_by_damage()
- playsound(loc, hitsound, volume, 1, -1)
- L.visible_message("[L] is hit by \a [src][organ_hit_text]!", \
- "[L] is hit by \a [src][organ_hit_text]!") //X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
+ if(blocked != 100) // not completely blocked
+ var/organ_hit_text = ""
+ if(L.has_limbs)
+ organ_hit_text = " in \the [parse_zone(def_zone)]"
+ if(suppressed)
+ playsound(loc, hitsound, 5, 1, -1)
+ L << "You're shot by \a [src][organ_hit_text]!"
+ else
+ if(hitsound)
+ var/volume = vol_by_damage()
+ playsound(loc, hitsound, volume, 1, -1)
+ L.visible_message("[L] is hit by \a [src][organ_hit_text]!", \
+ "[L] is hit by \a [src][organ_hit_text]!") //X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
+ L.on_hit(type)
var/reagent_note
if(reagents && reagents.reagent_list)
@@ -81,7 +82,6 @@
reagent_note += R.id + " ("
reagent_note += num2text(R.volume) + ") "
- L.on_hit(type)
add_logs(firer, L, "shot", src, reagent_note)
return L.apply_effects(stun, weaken, paralyze, irradiate, stutter, slur, eyeblur, drowsy, blocked, stamina, jitter)
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 84bbe11872b..83d693f3479 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -125,19 +125,19 @@
create_reagents(50)
/obj/item/projectile/bullet/dart/on_hit(atom/target, blocked = 0, hit_zone)
- var/deflect = 0
if(iscarbon(target))
var/mob/living/carbon/M = target
- if(M.can_inject(null,0,hit_zone)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
- ..()
- reagents.trans_to(M, reagents.total_volume)
- return 1
- else
- deflect = 1
- target.visible_message("The [name] was deflected!", \
- "You were protected against the [name]!")
- if(!deflect)
- ..()
+ if(blocked != 100) // not completely blocked
+ if(M.can_inject(null,0,hit_zone)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
+ ..()
+ reagents.trans_to(M, reagents.total_volume)
+ return 1
+ else
+ blocked = 100
+ target.visible_message("The [name] was deflected!", \
+ "You were protected against the [name]!")
+
+ ..(target, blocked, hit_zone)
flags &= ~NOREACT
reagents.handle_reactions()
return 1
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 7ad01293b93..bbe10e02af3 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -22,7 +22,6 @@
damage = 10
damage_type = BRUTE
nodamage = 0
- flag = "magic"
/obj/item/projectile/magic/fireball/Range()
var/mob/living/L = locate(/mob/living) in (range(src, 1) - firer)
@@ -45,7 +44,6 @@
damage = 0
damage_type = OXY
nodamage = 1
- flag = "magic"
/obj/item/projectile/magic/resurrection/on_hit(mob/living/carbon/target)
. = ..()
@@ -69,7 +67,6 @@
damage = 0
damage_type = OXY
nodamage = 1
- flag = "magic"
var/inner_tele_radius = 0
var/outer_tele_radius = 6
@@ -93,7 +90,6 @@
damage = 0
damage_type = OXY
nodamage = 1
- flag = "magic"
/obj/item/projectile/magic/door/on_hit(atom/target)
. = ..()
@@ -114,7 +110,6 @@
damage = 0
damage_type = BURN
nodamage = 1
- flag = "magic"
/obj/item/projectile/magic/change/on_hit(atom/change)
. = ..()
@@ -205,7 +200,7 @@
var/animal = pick("parrot","corgi","crab","pug","cat","mouse","chicken","cow","lizard","chick","fox","butterfly")
switch(animal)
if("parrot") new_mob = new /mob/living/simple_animal/parrot(M.loc)
- if("corgi") new_mob = new /mob/living/simple_animal/pet/corgi(M.loc)
+ if("corgi") new_mob = new /mob/living/simple_animal/pet/dog/corgi(M.loc)
if("crab") new_mob = new /mob/living/simple_animal/crab(M.loc)
if("pug") new_mob = new /mob/living/simple_animal/pet/pug(M.loc)
if("cat") new_mob = new /mob/living/simple_animal/pet/cat(M.loc)
@@ -257,7 +252,6 @@
damage = 0
damage_type = BURN
nodamage = 1
- flag = "magic"
/obj/item/projectile/magic/animate/Bump(atom/change)
..()
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index ed67992617a..1e0034644f4 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -25,7 +25,6 @@
name ="explosive bolt"
icon_state= "bolter"
damage = 50
- flag = "bullet"
/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0)
..()
@@ -37,7 +36,6 @@
desc = "USE A WEEL GUN"
icon_state= "bolter"
damage = 60
- flag = "bullet"
/obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = 0)
..()
diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
index 80aea6a6168..3f08110b756 100644
--- a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
@@ -224,6 +224,42 @@
..()
return
+/datum/reagent/medicine/mine_salve
+ name = "Miner's Salve"
+ id = "mine_salve"
+ description = "Slowly heals burn and brute damage, and causes subject to believe they are fully healed."
+ reagent_state = LIQUID
+ color = "#6D6374"
+ metabolization_rate = 0.4 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/M)
+ if(iscarbon(M))
+ var/mob/living/carbon/N = M
+ N.hal_screwyhud = 5
+ M.adjustBruteLoss(-0.25*REM)
+ M.adjustFireLoss(-0.25*REM)
+ ..()
+ return
+
+/datum/reagent/medicine/mine_salve/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1)
+ if(iscarbon(M))
+ if(method == TOUCH)
+ if(show_message)
+ M << "You feel your wounds knitting back together!"
+ if(method == INGEST)
+ if(show_message)
+ M << "That tasted horrible."
+ M.AdjustStunned(2)
+ M.AdjustWeakened(2)
+ ..()
+ return
+
+/datum/reagent/medicine/mine_salve/on_mob_delete(mob/living/M)
+ if(iscarbon(M))
+ var/mob/living/carbon/N = M
+ N.hal_screwyhud = 0
+ ..()
+
/datum/reagent/medicine/synthflesh
name = "Synthflesh"
id = "synthflesh"
@@ -614,11 +650,6 @@
..()
return
-/datum/reagent/medicine/strange_reagent/Topic(href, href_list)
- if(href_list["reenter"])
- var/mob/dead/observer/ghost = usr
- if(istype(ghost))
- ghost.reenter_corpse(ghost)
/datum/reagent/medicine/strange_reagent
name = "Strange Reagent"
@@ -633,14 +664,11 @@
if(M.getBruteLoss() >= 100 || M.getFireLoss() >= 100)
M.visible_message("[M]'s body convulses a bit, and then falls still once more.")
return
- var/mob/dead/observer/ghost = M.get_ghost()
M.visible_message("[M]'s body convulses a bit.")
if(!M.suiciding && !(NOCLONE in M.mutations))
if(!M)
return
- if(ghost)
- ghost << "Someone is trying to revive you. Re-enter your corpse if you want to be revived! (Click to re-enter)"
- ghost << sound('sound/effects/genetics.ogg')
+ if(M.notify_ghost_cloning())
spawn (100) //so the ghost has time to re-enter
return
else
diff --git a/code/modules/reagents/Chemistry-Recipes/Medicine.dm b/code/modules/reagents/Chemistry-Recipes/Medicine.dm
index 357eac96a5e..60e80923400 100644
--- a/code/modules/reagents/Chemistry-Recipes/Medicine.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Medicine.dm
@@ -57,6 +57,20 @@
result = "salglu_solution"
required_reagents = list("sodiumchloride" = 1, "water" = 1, "sugar" = 1)
result_amount = 3
+
+/datum/chemical_reaction/mine_salve
+ name = "Miner's Salve"
+ id = "mine_salve"
+ result = "mine_salve"
+ required_reagents = list("oil" = 1, "water" = 1, "iron" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/mine_salve2
+ name = "Miner's Salve"
+ id = "mine_salve"
+ result = "mine_salve"
+ required_reagents = list("plasma" = 5, "iron" = 5, "sugar" = 1) // A sheet of plasma, a twinkie and a sheet of metal makes four of these
+ result_amount = 15
/datum/chemical_reaction/synthflesh
name = "Synthflesh"
diff --git a/code/modules/reagents/Chemistry-Recipes/Others.dm b/code/modules/reagents/Chemistry-Recipes/Others.dm
index b839ad05c4c..c04022f3414 100644
--- a/code/modules/reagents/Chemistry-Recipes/Others.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Others.dm
@@ -308,7 +308,7 @@
/datum/chemical_reaction/corgium/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
- new /mob/living/simple_animal/pet/corgi(location)
+ new /mob/living/simple_animal/pet/dog/corgi(location)
..()
/datum/chemical_reaction/hair_dye
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index b64d21f6c14..99f7e10089c 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -82,7 +82,7 @@
/obj/item/weapon/reagent_containers/throw_impact(atom/target)
. = ..()
- if(!reagents.total_volume || !spillable)
+ if(!reagents || !reagents.total_volume || !spillable)
return
if(ismob(target) && target.reagents)
@@ -91,10 +91,9 @@
var/R
target.visible_message("[M] has been splashed with something!", \
"[M] has been splashed with something!")
- if(reagents)
- for(var/datum/reagent/A in reagents.reagent_list)
- R += A.id + " ("
- R += num2text(A.volume) + "),"
+ for(var/datum/reagent/A in reagents.reagent_list)
+ R += A.id + " ("
+ R += num2text(A.volume) + "),"
if(thrownby)
add_logs(thrownby, M, "splashed", R)
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index e85c1218e39..d636f818374 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -138,7 +138,7 @@
if(DISP_END_TRUNK)
return /obj/structure/disposalpipe/trunk
if(DISP_END_BIN)
- return /obj/machinery/disposal
+ return /obj/machinery/disposal/bin
if(DISP_END_OUTLET)
return /obj/structure/disposaloutlet
if(DISP_END_CHUTE)
@@ -240,9 +240,9 @@
SortP.updatedir()
else if(ptype == DISP_END_BIN)
- var/obj/machinery/disposal/P = new /obj/machinery/disposal(loc,src)
- P.mode = 0 // start with pump off
- transfer_fingerprints_to(P)
+ var/obj/machinery/disposal/bin/B = new /obj/machinery/disposal/bin(loc,src)
+ B.mode = 0 // start with pump off
+ transfer_fingerprints_to(B)
else if(ptype == DISP_END_OUTLET)
var/obj/structure/disposaloutlet/P = new /obj/structure/disposaloutlet(loc,src)
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal-structures.dm
similarity index 60%
rename from code/modules/recycling/disposal.dm
rename to code/modules/recycling/disposal-structures.dm
index 0ad17216e87..ca1364644be 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal-structures.dm
@@ -1,1335 +1,869 @@
-// Disposal bin
-// Holds items for disposal into pipe system
-// Draws air from turf, gradually charges internal reservoir
-// Once full (~1 atm), uses air resv to flush items into the pipes
-// Automatically recharges air (unless off), will flush when ready if pre-set
-// Can hold items and human size things, no other draggables
-// Toilets are a type of disposal bin for small objects only and work on magic. By magic, I mean torque rotation
-#define SEND_PRESSURE 0.05*ONE_ATMOSPHERE
-
-/obj/machinery/disposal
- name = "disposal unit"
- desc = "A pneumatic waste disposal unit."
- icon = 'icons/obj/atmospherics/pipes/disposal.dmi'
- icon_state = "disposal"
- anchored = 1
- density = 1
- var/datum/gas_mixture/air_contents // internal reservoir
- var/mode = 1 // item mode 0=off 1=charging 2=charged
- var/flush = 0 // true if flush handle is pulled
- var/obj/structure/disposalpipe/trunk/trunk = null // the attached pipe trunk
- var/flushing = 0 // true if flushing in progress
- var/flush_every_ticks = 30 //Every 30 ticks it will look whether it is ready to flush
- var/flush_count = 0 //this var adds 1 once per tick. When it reaches flush_every_ticks it resets and tries to flush.
- var/last_sound = 0
- var/obj/structure/disposalconstruct/stored
- // create a new disposal
- // find the attached trunk (if present) and init gas resvr.
-/obj/machinery/disposal/New(loc, var/obj/structure/disposalconstruct/make_from)
- ..()
-
- if(make_from)
- dir = make_from.dir
- make_from.loc = 0
- stored = make_from
- else
- stored = new /obj/structure/disposalconstruct(0,DISP_END_BIN,dir)
-
- trunk_check()
-
- air_contents = new/datum/gas_mixture()
- //gas.volume = 1.05 * CELLSTANDARD
- update()
-
-/obj/machinery/disposal/proc/trunk_check()
- trunk = locate() in src.loc
- if(!trunk)
- mode = 0
- flush = 0
- else
- mode = initial(mode)
- flush = initial(flush)
- trunk.linked = src // link the pipe trunk to self
-
-/obj/machinery/disposal/Destroy()
- eject()
- if(trunk)
- trunk.linked = null
- ..()
-
-/obj/machinery/disposal/singularity_pull(S, current_size)
- if(current_size >= STAGE_FIVE)
- Deconstruct()
-
-/obj/machinery/disposal/initialize()
- // this will get a copy of the air turf and take a SEND PRESSURE amount of air from it
- var/atom/L = loc
- var/datum/gas_mixture/env = new
- env.copy_from(L.return_air())
- var/datum/gas_mixture/removed = env.remove(SEND_PRESSURE + 1)
- air_contents.merge(removed)
- trunk_check()
-
- // attack by item places it in to disposal
-/obj/machinery/disposal/attackby(obj/item/I, mob/user, params)
- if(stat & BROKEN || !I || !user)
- return
-
- src.add_fingerprint(user)
- if(mode<=0) // It's off
- if(istype(I, /obj/item/weapon/screwdriver))
- if(contents.len > 0)
- user << "Eject the items first!"
- return
- if(mode==0) // It's off but still not unscrewed
- mode=-1 // Set it to doubleoff l0l
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You remove the screws around the power connection."
- return
- else if(mode==-1)
- mode=0
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You attach the screws around the power connection."
- return
- else if(istype(I,/obj/item/weapon/weldingtool) && mode==-1)
- if(contents.len > 0)
- user << "Eject the items first!"
- return
- var/obj/item/weapon/weldingtool/W = I
- if(W.remove_fuel(0,user))
- playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "You start slicing the floorweld off \the [src]..."
-
- if(do_after(user,20, target = src))
- if(!src || !W.isOn()) return
- user << "You slice the floorweld off \the [src]."
- Deconstruct()
- return
- else
- return
-
- if(istype(I, /obj/item/weapon/storage/bag/trash))
- var/obj/item/weapon/storage/bag/trash/T = I
- user << "You empty the bag."
- for(var/obj/item/O in T.contents)
- T.remove_from_storage(O,src)
- T.update_icon()
- update()
- return
-
- var/obj/item/weapon/grab/G = I
- if(istype(G)) // handle grabbed mob
- if(ismob(G.affecting))
- stuff_mob_in(G.affecting, user)
- return
-
- if(!user.drop_item())
- return
-
- I.loc = src
- user.visible_message("[user.name] places \the [I] into \the [src].", \
- "You place \the [I] into \the [src].")
-
- update()
-
-// mouse drop another mob or self
-//
-/obj/machinery/disposal/MouseDrop_T(mob/living/target, mob/living/user)
- if(istype(target) && user == target)
- stuff_mob_in(target, user)
-
-/obj/machinery/disposal/proc/stuff_mob_in(mob/living/target, mob/living/user)
- if(!iscarbon(user) && !user.ventcrawler) //only carbon and ventcrawlers can climb into disposal by themselves.
- return
- if(target.mob_size > MOB_SIZE_HUMAN)
- user << "[target] doesn't fit inside [src]!"
- return
- src.add_fingerprint(user)
- if(user == target)
- user.visible_message("[user] starts climbing into [src].", \
- "You start climbing into [src]...")
- else
- target.visible_message("[user] starts putting [target] into [src].", \
- "[user] starts putting you into [src]!")
- if(do_mob(user, target, 20))
- if (!src.loc)
- return
- if (target.client)
- target.client.perspective = EYE_PERSPECTIVE
- target.client.eye = src
- target.loc = src
- if(user == target)
- user.visible_message("[user] climbs into [src].", \
- "You climb into [src].")
- else
- target.visible_message("[user] has placed [target] in [src].", \
- "[user] has placed [target] in [src].")
- add_logs(user, target, "stuffed", addition="into [src]")
- update()
-
-// can breath normally in the disposal
-/obj/machinery/disposal/alter_health()
- return get_turf(src)
-
-/obj/machinery/disposal/relaymove(mob/user)
- attempt_escape(user)
-
-// resist to escape the bin
-/obj/machinery/disposal/container_resist()
- attempt_escape(usr)
-
-/obj/machinery/disposal/proc/attempt_escape(mob/user)
- if(src.flushing)
- return
- go_out(user)
- return
-
-// leave the disposal
-/obj/machinery/disposal/proc/go_out(mob/user)
-
- if (user.client)
- user.client.eye = user.client.mob
- user.client.perspective = MOB_PERSPECTIVE
- user.loc = src.loc
- update()
- return
-
-
-// monkeys and xenos can only pull the flush lever
-/obj/machinery/disposal/attack_paw(mob/user)
- if(stat & BROKEN)
- return
- flush = !flush
- update()
-
-// ai as human but can't flush
-/obj/machinery/disposal/attack_ai(mob/user)
- interact(user, 1)
-
-// human interact with machine
-/obj/machinery/disposal/attack_hand(mob/user)
- if(user && user.loc == src)
- usr << "You cannot reach the controls from inside!"
- return
- /*
- if(mode==-1)
- usr << "\red The disposal units power is disabled."
- return
- */
- interact(user, 0)
-
-// hostile mob escape from disposals
-/obj/machinery/disposal/attack_animal(mob/living/simple_animal/M)
- if(M.environment_smash)
- M.do_attack_animation(src)
- visible_message("[M.name] smashes \the [src] apart!")
- qdel(src)
- return
-
-// user interaction
-/obj/machinery/disposal/interact(mob/user, ai=0)
-
- src.add_fingerprint(user)
- if(stat & BROKEN)
- user.unset_machine()
- return
-
- var/dat = "Waste Disposal UnitWaste Disposal Unit
"
-
- if(!ai) // AI can't pull flush handle
- if(flush)
- dat += "Disposal handle: Disengage Engaged"
- else
- dat += "Disposal handle: Disengaged Engage"
-
- dat += "
Eject contents
"
-
- if(mode <= 0)
- dat += "Pump: Off On
"
- else if(mode == 1)
- dat += "Pump: Off On (pressurizing)
"
- else
- dat += "Pump: Off On (idle)
"
-
- var/per = Clamp(100* air_contents.return_pressure() / (SEND_PRESSURE), 0, 100)
-
- dat += "Pressure: [round(per, 1)]%
"
-
-
- user.set_machine(src)
- user << browse(dat, "window=disposal;size=360x170")
- onclose(user, "disposal")
-
-// handle machine interaction
-
-/obj/machinery/disposal/Topic(href, href_list)
- if(..())
- return
- if(usr.loc == src)
- usr << "You cannot reach the controls from inside!"
- return
-
- if(mode==-1 && !href_list["eject"]) // only allow ejecting if mode is -1
- usr << "\The [src]'s power is disabled."
- return
- ..()
- usr.set_machine(src)
-
- if(href_list["close"])
- usr.unset_machine()
- usr << browse(null, "window=disposal")
- return
-
- if(href_list["pump"])
- if(text2num(href_list["pump"]))
- mode = 1
- else
- mode = 0
- update()
-
- if(href_list["handle"])
- flush = text2num(href_list["handle"])
- update()
-
- if(href_list["eject"])
- eject()
- return
-
-// eject the contents of the disposal unit
-/obj/machinery/disposal/proc/eject()
- for(var/atom/movable/AM in src)
- AM.loc = src.loc
- AM.pipe_eject(0)
- update()
-
-// update the icon & overlays to reflect mode & status
-/obj/machinery/disposal/proc/update()
- overlays.Cut()
- if(stat & BROKEN)
- icon_state = "disposal-broken"
- mode = 0
- flush = 0
- return
-
- // flush handle
- if(flush)
- overlays += image('icons/obj/atmospherics/pipes/disposal.dmi', "dispover-handle")
-
- // only handle is shown if no power
- if(stat & NOPOWER || mode == -1)
- return
-
- // check for items in disposal - occupied light
- if(contents.len > 0)
- overlays += image('icons/obj/atmospherics/pipes/disposal.dmi', "dispover-full")
-
- // charging and ready light
- if(mode == 1)
- overlays += image('icons/obj/atmospherics/pipes/disposal.dmi', "dispover-charge")
- else if(mode == 2)
- overlays += image('icons/obj/atmospherics/pipes/disposal.dmi', "dispover-ready")
-
-// timed process
-// charge the gas reservoir and perform flush if ready
-/obj/machinery/disposal/process()
- if(stat & BROKEN) // nothing can happen if broken
- return
-
- flush_count++
- if( flush_count >= flush_every_ticks )
- if( contents.len )
- if(mode == 2)
- spawn(0)
- feedback_inc("disposal_auto_flush",1)
- flush()
- flush_count = 0
-
- src.updateDialog()
-
- if(flush && air_contents.return_pressure() >= SEND_PRESSURE ) // flush can happen even without power
- spawn(0)
- flush()
-
- if(stat & NOPOWER) // won't charge if no power
- return
-
- use_power(100) // base power usage
-
- if(mode != 1) // if off or ready, no need to charge
- return
-
- // otherwise charge
- use_power(500) // charging power usage
-
- var/atom/L = loc // recharging from loc turf
-
- var/datum/gas_mixture/env = L.return_air()
- var/pressure_delta = (SEND_PRESSURE*1.01) - air_contents.return_pressure()
-
- if(env.temperature > 0)
- var/transfer_moles = 0.1 * pressure_delta*air_contents.volume/(env.temperature * R_IDEAL_GAS_EQUATION)
-
- //Actually transfer the gas
- var/datum/gas_mixture/removed = env.remove(transfer_moles)
- air_contents.merge(removed)
- air_update_turf()
-
-
- // if full enough, switch to ready mode
- if(air_contents.return_pressure() >= SEND_PRESSURE)
- mode = 2
- update()
- return
-
-/obj/machinery/disposal/proc/flush()
- flushing = 1
- flushAnimation()
- var/obj/structure/disposalholder/H = new()
- newHolderDestination(H)
- sleep(10)
- if(last_sound < world.time + 1)
- playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, 0)
- last_sound = world.time
- sleep(5)
- H.init(src)
- air_contents = new()
- H.start(src)
- flushing = 0
- flush = 0
- if(mode == 2)
- mode = 1
- update()
-
-/obj/machinery/disposal/proc/newHolderDestination(obj/structure/disposalholder/H)
- for(var/obj/item/smallDelivery/O in src)
- H.tomail = 1
- return
-
-/obj/machinery/disposal/proc/flushAnimation()
- flick("[icon_state]-flush", src)
-
-// called when area power changes
-/obj/machinery/disposal/power_change()
- ..() // do default setting/reset of stat NOPOWER bit
- update() // update icon
- return
-
-
-// called when holder is expelled from a disposal
-// should usually only occur if the pipe network is modified
-/obj/machinery/disposal/proc/expel(obj/structure/disposalholder/H)
-
- var/turf/target
- playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)
- if(H) // Somehow, someone managed to flush a window which broke mid-transit and caused the disposal to go in an infinite loop trying to expel null, hopefully this fixes it
- for(var/atom/movable/AM in H)
- target = get_offset_target_turf(src.loc, rand(5)-rand(5), rand(5)-rand(5))
-
- AM.loc = src.loc
- AM.pipe_eject(0)
- spawn(1)
- if(AM)
- AM.throw_at(target, 5, 1)
-
- H.vent_gas(loc)
- qdel(H)
-
-/obj/machinery/disposal/CanPass(atom/movable/mover, turf/target, height=0)
- if (istype(mover,/obj/item) && mover.throwing)
- var/obj/item/I = mover
- if(istype(I, /obj/item/projectile))
- return
- if(prob(75))
- I.loc = src
- visible_message("\the [I] lands in \the [src].")
- update()
- else
- visible_message("\the [I] bounces off of \the [src]'s rim!")
- return 0
- else
- return ..(mover, target, height)
-
-/obj/machinery/disposal/Deconstruct()
- if(stored)
- var/turf/T = loc
- stored.loc = T
- src.transfer_fingerprints_to(stored)
- stored.anchored = 0
- stored.density = 1
- stored.update()
- ..()
-
-//How disposal handles getting a storage dump from a storage object
-/obj/machinery/disposal/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)
- for(var/obj/item/I in src_object)
- src_object.remove_from_storage(I, src)
- return 1
-
-// virtual disposal object
-// travels through pipes in lieu of actual items
-// contents will be items flushed by the disposal
-// this allows the gas flushed to be tracked
-
-/obj/structure/disposalholder
- invisibility = 101
- var/datum/gas_mixture/gas = null // gas used to flush, will appear at exit point
- var/active = 0 // true if the holder is moving, otherwise inactive
- dir = 0
- var/count = 1000 //*** can travel 1000 steps before going inactive (in case of loops)
- var/destinationTag = 0 // changes if contains a delivery container
- var/tomail = 0 //changes if contains wrapped package
- var/hasmob = 0 //If it contains a mob
-
-/obj/structure/disposalholder/Destroy()
- qdel(gas)
- active = 0
- ..()
-
- // initialize a holder from the contents of a disposal unit
-/obj/structure/disposalholder/proc/init(obj/machinery/disposal/D)
- gas = D.air_contents// transfer gas resv. into holder object
-
- //Check for any living mobs trigger hasmob.
- //hasmob effects whether the package goes to cargo or its tagged destination.
- for(var/mob/living/M in D)
- if(M && M.stat != DEAD)
- if(M.client)
- M.client.eye = src
- hasmob = 1
-
- //Checks 1 contents level deep. This means that players can be sent through disposals...
- //...but it should require a second person to open the package. (i.e. person inside a wrapped locker)
- for(var/obj/O in D)
- if(O.contents)
- for(var/mob/living/M in O.contents)
- if(M && M.stat != DEAD)
- if(M.client)
- M.client.eye = src
- hasmob = 1
-
- // now everything inside the disposal gets put into the holder
- // note AM since can contain mobs or objs
- for(var/atom/movable/AM in D)
- AM.loc = src
- if(istype(AM, /obj/structure/bigDelivery) && !hasmob)
- var/obj/structure/bigDelivery/T = AM
- src.destinationTag = T.sortTag
- if(istype(AM, /obj/item/smallDelivery) && !hasmob)
- var/obj/item/smallDelivery/T = AM
- src.destinationTag = T.sortTag
-
-
-// start the movement process
-// argument is the disposal unit the holder started in
-/obj/structure/disposalholder/proc/start(obj/machinery/disposal/D)
- if(!D.trunk)
- D.expel(src) // no trunk connected, so expel immediately
- return
-
- loc = D.trunk
- active = 1
- dir = DOWN
- spawn(1)
- move() // spawn off the movement process
-
- return
-
-// movement process, persists while holder is moving through pipes
-/obj/structure/disposalholder/proc/move()
- var/obj/structure/disposalpipe/last
- while(active)
- var/obj/structure/disposalpipe/curr = loc
- last = curr
- curr = curr.transfer(src)
- if(!curr && active)
- last.expel(src, loc, dir)
-
- sleep(1)
- if(!(count--))
- active = 0
- return
-
-// find the turf which should contain the next pipe
-/obj/structure/disposalholder/proc/nextloc()
- return get_step(loc,dir)
-
-// find a matching pipe on a turf
-/obj/structure/disposalholder/proc/findpipe(turf/T)
-
- if(!T)
- return null
-
- var/fdir = turn(dir, 180) // flip the movement direction
- for(var/obj/structure/disposalpipe/P in T)
- if(fdir & P.dpdir) // find pipe direction mask that matches flipped dir
- return P
- // if no matching pipe, return null
- return null
-
-// merge two holder objects
-// used when a a holder meets a stuck holder
-/obj/structure/disposalholder/proc/merge(obj/structure/disposalholder/other)
- for(var/atom/movable/AM in other)
- AM.loc = src // move everything in other holder to this one
- if(ismob(AM))
- var/mob/M = AM
- if(M.client) // if a client mob, update eye to follow this holder
- M.client.eye = src
- qdel(other)
-
-
-// called when player tries to move while in a pipe
-/obj/structure/disposalholder/relaymove(mob/user)
- if (user.stat)
- return
- if (src.loc)
- for (var/mob/M in get_hearers_in_view(src.loc.loc))
- M.show_message("CLONG, clong!", 2)
- playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0)
-
-// called to vent all gas in holder to a location
-/obj/structure/disposalholder/proc/vent_gas(atom/location)
- if(location)
- location.assume_air(gas) // vent all gas to turf
- air_update_turf()
- return
-
-/obj/structure/disposalholder/allow_drop()
- return 1
-
-// Disposal pipes
-
-/obj/structure/disposalpipe
- icon = 'icons/obj/atmospherics/pipes/disposal.dmi'
- name = "disposal pipe"
- desc = "An underfloor disposal pipe."
- anchored = 1
- density = 0
-
- level = 1 // underfloor only
- var/dpdir = 0 // bitmask of pipe directions
- dir = 0 // dir will contain dominant direction for junction pipes
- var/health = 10 // health points 0-10
- layer = 2.3 // slightly lower than wires and other pipes
- var/base_icon_state // initial icon state on map
- var/obj/structure/disposalconstruct/stored
-
- // new pipe, set the icon_state as on map
-/obj/structure/disposalpipe/New(loc,var/obj/structure/disposalconstruct/make_from)
- ..()
-
- if(make_from && !make_from.gc_destroyed)
- base_icon_state = make_from.base_state
- dir = make_from.dir
- dpdir = make_from.dpdir
- make_from.loc = src
- stored = make_from
- else
- base_icon_state = icon_state
- stored = new /obj/structure/disposalconstruct(src,direction=dir)
- switch(base_icon_state)
- if("pipe-s")
- stored.ptype = DISP_PIPE_STRAIGHT
- if("pipe-c")
- stored.ptype = DISP_PIPE_BENT
- if("pipe-j1")
- stored.ptype = DISP_JUNCTION
- if("pipe-j2")
- stored.ptype = DISP_JUNCTION_FLIP
- if("pipe-y")
- stored.ptype = DISP_YJUNCTION
- if("pipe-t")
- stored.ptype = DISP_END_TRUNK
- if("pipe-j1s")
- stored.ptype = DISP_SORTJUNCTION
- if("pipe-j2s")
- stored.ptype = DISP_SORTJUNCTION_FLIP
- return
-
-
- // pipe is deleted
- // ensure if holder is present, it is expelled
-/obj/structure/disposalpipe/Destroy()
- var/obj/structure/disposalholder/H = locate() in src
- if(H)
- // holder was present
- H.active = 0
- var/turf/T = src.loc
- if(T.density)
- // deleting pipe is inside a dense turf (wall)
- // this is unlikely, but just dump out everything into the turf in case
-
- for(var/atom/movable/AM in H)
- AM.loc = T
- AM.pipe_eject(0)
- qdel(H)
- ..()
- return
-
- // otherwise, do normal expel from turf
- if(H)
- expel(H, T, 0)
- ..()
-
-// returns the direction of the next pipe object, given the entrance dir
-// by default, returns the bitmask of remaining directions
-/obj/structure/disposalpipe/proc/nextdir(fromdir)
- return dpdir & (~turn(fromdir, 180))
-
-// transfer the holder through this pipe segment
-// overriden for special behaviour
-//
-/obj/structure/disposalpipe/proc/transfer(obj/structure/disposalholder/H)
- var/nextdir = nextdir(H.dir)
- H.dir = nextdir
- var/turf/T = H.nextloc()
- var/obj/structure/disposalpipe/P = H.findpipe(T)
-
- if(P)
- // find other holder in next loc, if inactive merge it with current
- var/obj/structure/disposalholder/H2 = locate() in P
- if(H2 && !H2.active)
- H.merge(H2)
-
- H.loc = P
- else // if wasn't a pipe, then set loc to turf
- H.loc = T
- return null
-
- return P
-
-
-// update the icon_state to reflect hidden status
-/obj/structure/disposalpipe/proc/update()
- var/turf/T = src.loc
- hide(T.intact && !istype(T,/turf/space)) // space never hides pipes
-
-// hide called by levelupdate if turf intact status changes
-// change visibility status and force update of icon
-/obj/structure/disposalpipe/hide(var/intact)
- invisibility = intact ? 101: 0 // hide if floor is intact
- updateicon()
-
-// update actual icon_state depending on visibility
-// if invisible, append "f" to icon_state to show faded version
-// this will be revealed if a T-scanner is used
-// if visible, use regular icon_state
-/obj/structure/disposalpipe/proc/updateicon()
- if(invisibility)
- icon_state = "[base_icon_state]f"
- else
- icon_state = base_icon_state
- return
-
-
-// expel the held objects into a turf
-// called when there is a break in the pipe
-//
-
-/obj/structure/disposalpipe/proc/expel(obj/structure/disposalholder/H, turf/T, direction)
-
- var/turf/target
-
- if(istype(T, /turf/simulated/floor)) //intact floor, pop the tile
- var/turf/simulated/floor/myturf = T
- if(myturf.builtin_tile)
- myturf.builtin_tile.loc = T
- myturf.builtin_tile = null
- myturf.make_plating()
-
- if(direction) // direction is specified
- if(istype(T, /turf/space)) // if ended in space, then range is unlimited
- target = get_edge_target_turf(T, direction)
- else // otherwise limit to 10 tiles
- target = get_ranged_target_turf(T, direction, 10)
-
- playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)
- if(H)
- for(var/atom/movable/AM in H)
- AM.loc = T
- AM.pipe_eject(direction)
- spawn(1)
- if(AM)
- AM.throw_at(target, 100, 1)
-
- else // no specified direction, so throw in random direction
-
- playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)
- if(H)
- for(var/atom/movable/AM in H)
- target = get_offset_target_turf(T, rand(5)-rand(5), rand(5)-rand(5))
-
- AM.loc = T
- AM.pipe_eject(0)
- spawn(1)
- if(AM)
- AM.throw_at(target, 5, 1)
- H.vent_gas(T)
- qdel(H)
- return
-
-// call to break the pipe
-// will expel any holder inside at the time
-// then delete the pipe
-// remains : set to leave broken pipe pieces in place
-/obj/structure/disposalpipe/proc/broken(remains = 0)
- if(remains)
- for(var/D in cardinal)
- if(D & dpdir)
- var/obj/structure/disposalpipe/broken/P = new(src.loc)
- P.dir = D
-
- src.invisibility = 101 // make invisible (since we won't delete the pipe immediately)
- var/obj/structure/disposalholder/H = locate() in src
- if(H)
- // holder was present
- H.active = 0
- var/turf/T = src.loc
- if(T.density)
- // broken pipe is inside a dense turf (wall)
- // this is unlikely, but just dump out everything into the turf in case
-
- for(var/atom/movable/AM in H)
- AM.loc = T
- AM.pipe_eject(0)
- qdel(H)
- return
-
- // otherwise, do normal expel from turf
- if(H)
- expel(H, T, 0)
-
- spawn(2) // delete pipe after 2 ticks to ensure expel proc finished
- qdel(src)
-
-
-// pipe affected by explosion
-/obj/structure/disposalpipe/ex_act(severity, target)
-
- //pass on ex_act to our contents before calling it on ourself
- var/obj/structure/disposalholder/H = locate() in src
- if(H)
- H.contents_explosion(severity, target)
-
- switch(severity)
- if(1.0)
- broken(0)
- return
- if(2.0)
- health -= rand(5,15)
- healthcheck()
- return
- if(3.0)
- health -= rand(0,15)
- healthcheck()
- return
-
-
-// test health for brokenness
-/obj/structure/disposalpipe/proc/healthcheck()
- if(health < -2)
- broken(0)
- else if(health<1)
- broken(1)
- return
-
-//attack by item
-//weldingtool: unfasten and convert to obj/disposalconstruct
-
-/obj/structure/disposalpipe/attackby(obj/item/I, mob/user, params)
-
- var/turf/T = src.loc
- if(T.intact)
- return // prevent interaction with T-scanner revealed pipes
- src.add_fingerprint(user)
- if(istype(I, /obj/item/weapon/weldingtool))
- var/obj/item/weapon/weldingtool/W = I
-
- if(W.remove_fuel(0,user))
- playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "You start slicing the disposal pipe..."
- // check if anything changed over 2 seconds
- if(do_after(user,30, target = src))
- if(!src || !W.isOn()) return
- Deconstruct()
- user << "You slice the disposal pipe."
- else
- return
-
-// called when pipe is cut with welder
-/obj/structure/disposalpipe/Deconstruct()
- if(stored)
- var/turf/T = loc
- stored.loc = T
- transfer_fingerprints_to(stored)
- stored.dir = dir
- stored.density = 0
- stored.anchored = 1
- stored.update()
- ..()
-
-/obj/structure/disposalpipe/singularity_pull(S, current_size)
- if(current_size >= STAGE_FIVE)
- Deconstruct()
-
-// *** TEST verb
-//client/verb/dispstop()
-// for(var/obj/structure/disposalholder/H in world)
-// H.active = 0
-
-// a straight or bent segment
-/obj/structure/disposalpipe/segment
- icon_state = "pipe-s"
-
-/obj/structure/disposalpipe/segment/New()
- ..()
- if(stored.ptype == DISP_PIPE_STRAIGHT)
- dpdir = dir | turn(dir, 180)
- else
- dpdir = dir | turn(dir, -90)
-
- update()
- return
-
-
-
-
-//a three-way junction with dir being the dominant direction
-/obj/structure/disposalpipe/junction
- icon_state = "pipe-j1"
-
-/obj/structure/disposalpipe/junction/New()
- ..()
- switch(stored.ptype)
- if(DISP_JUNCTION)
- dpdir = dir | turn(dir, -90) | turn(dir,180)
- if(DISP_JUNCTION_FLIP)
- dpdir = dir | turn(dir, 90) | turn(dir,180)
- if(DISP_YJUNCTION)
- dpdir = dir | turn(dir,90) | turn(dir, -90)
- update()
- return
-
-
-// next direction to move
-// if coming in from secondary dirs, then next is primary dir
-// if coming in from primary dir, then next is equal chance of other dirs
-
-/obj/structure/disposalpipe/junction/nextdir(fromdir)
- var/flipdir = turn(fromdir, 180)
- if(flipdir != dir) // came from secondary dir
- return dir // so exit through primary
- else // came from primary
- // so need to choose either secondary exit
- var/mask = ..(fromdir)
-
- // find a bit which is set
- var/setbit = 0
- if(mask & NORTH)
- setbit = NORTH
- else if(mask & SOUTH)
- setbit = SOUTH
- else if(mask & EAST)
- setbit = EAST
- else
- setbit = WEST
-
- if(prob(50)) // 50% chance to choose the found bit or the other one
- return setbit
- else
- return mask & (~setbit)
-
-//a three-way junction that sorts objects
-/obj/structure/disposalpipe/sortjunction
-
- icon_state = "pipe-j1s"
- var/sortType = 0 //Look at the list called TAGGERLOCATIONS in setup.dm
- var/posdir = 0
- var/negdir = 0
- var/sortdir = 0
-
-/obj/structure/disposalpipe/sortjunction/proc/updatedesc()
- desc = "An underfloor disposal pipe with a package sorting mechanism."
- if(sortType>0)
- var/tag = uppertext(TAGGERLOCATIONS[sortType])
- desc += "\nIt's tagged with [tag]"
-
-/obj/structure/disposalpipe/sortjunction/proc/updatedir()
- posdir = dir
- negdir = turn(posdir, 180)
-
- if(stored.ptype == DISP_SORTJUNCTION)
- sortdir = turn(posdir, -90)
- else
- icon_state = "pipe-j2s"
- sortdir = turn(posdir, 90)
-
- dpdir = sortdir | posdir | negdir
-
-/obj/structure/disposalpipe/sortjunction/New()
- ..()
- updatedir()
- updatedesc()
- update()
- return
-
-/obj/structure/disposalpipe/sortjunction/attackby(obj/item/I, mob/user, params)
- if(..())
- return
-
- if(istype(I, /obj/item/device/destTagger))
- var/obj/item/device/destTagger/O = I
-
- if(O.currTag > 0)// Tag set
- sortType = O.currTag
- playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
- var/tag = uppertext(TAGGERLOCATIONS[O.currTag])
- user << "Changed filter to [tag]."
- updatedesc()
-
-
-// next direction to move
-// if coming in from negdir, then next is primary dir or sortdir
-// if coming in from posdir, then flip around and go back to posdir
-// if coming in from sortdir, go to posdir
-
-/obj/structure/disposalpipe/sortjunction/nextdir(fromdir, sortTag)
- //var/flipdir = turn(fromdir, 180)
- if(fromdir != sortdir) // probably came from the negdir
-
- if(src.sortType == sortTag) //if destination matches filtered type...
- return sortdir // exit through sortdirection
- else
- return posdir
- else // came from sortdir
- // so go with the flow to positive direction
- return posdir
-
-/obj/structure/disposalpipe/sortjunction/transfer(obj/structure/disposalholder/H)
- var/nextdir = nextdir(H.dir, H.destinationTag)
- H.dir = nextdir
- var/turf/T = H.nextloc()
- var/obj/structure/disposalpipe/P = H.findpipe(T)
-
- if(P)
- // find other holder in next loc, if inactive merge it with current
- var/obj/structure/disposalholder/H2 = locate() in P
- if(H2 && !H2.active)
- H.merge(H2)
-
- H.loc = P
- else // if wasn't a pipe, then set loc to turf
- H.loc = T
- return null
-
- return P
-
-
-//a three-way junction that sorts objects destined for the mail office mail table (tomail = 1)
-/obj/structure/disposalpipe/wrapsortjunction
-
- desc = "An underfloor disposal pipe which sorts wrapped and unwrapped objects."
- icon_state = "pipe-j1s"
- var/posdir = 0
- var/negdir = 0
- var/sortdir = 0
-
-/obj/structure/disposalpipe/wrapsortjunction/New()
- ..()
- posdir = dir
- if(stored.ptype == DISP_SORTJUNCTION)
- sortdir = turn(posdir, -90)
- negdir = turn(posdir, 180)
- else
- icon_state = "pipe-j2s"
- sortdir = turn(posdir, 90)
- negdir = turn(posdir, 180)
- dpdir = sortdir | posdir | negdir
-
- update()
- return
-
-// next direction to move
-// if coming in from negdir, then next is primary dir or sortdir
-// if coming in from posdir, then flip around and go back to posdir
-// if coming in from sortdir, go to posdir
-
-/obj/structure/disposalpipe/wrapsortjunction/nextdir(fromdir, istomail)
- //var/flipdir = turn(fromdir, 180)
- if(fromdir != sortdir) // probably came from the negdir
-
- if(istomail) //if destination matches filtered type...
- return sortdir // exit through sortdirection
- else
- return posdir
- else // came from sortdir
- // so go with the flow to positive direction
- return posdir
-
-/obj/structure/disposalpipe/wrapsortjunction/transfer(obj/structure/disposalholder/H)
- var/nextdir = nextdir(H.dir, H.tomail)
- H.dir = nextdir
- var/turf/T = H.nextloc()
- var/obj/structure/disposalpipe/P = H.findpipe(T)
-
- if(P)
- // find other holder in next loc, if inactive merge it with current
- var/obj/structure/disposalholder/H2 = locate() in P
- if(H2 && !H2.active)
- H.merge(H2)
-
- H.loc = P
- else // if wasn't a pipe, then set loc to turf
- H.loc = T
- return null
-
- return P
-
-
-
-
-
-//a trunk joining to a disposal bin or outlet on the same turf
-/obj/structure/disposalpipe/trunk
- icon_state = "pipe-t"
- var/obj/linked // the linked obj/machinery/disposal or obj/disposaloutlet
-
-/obj/structure/disposalpipe/trunk/New()
- ..()
- dpdir = dir
- spawn(1)
- getlinked()
-
- update()
- return
-
-/obj/structure/disposalpipe/trunk/proc/getlinked()
- linked = null
- var/obj/machinery/disposal/D = locate() in src.loc
- if(D)
- linked = D
- if (!D.trunk)
- D.trunk = src
-
- var/obj/structure/disposaloutlet/O = locate() in src.loc
- if(O)
- linked = O
-
- update()
- return
-
- // Override attackby so we disallow trunkremoval when somethings ontop
-/obj/structure/disposalpipe/trunk/attackby(obj/item/I, mob/user, params)
-
- //Disposal bins or chutes
- /*
- These shouldn't be required
- var/obj/machinery/disposal/D = locate() in src.loc
- if(D && D.anchored)
- return
-
- //Disposal outlet
- var/obj/structure/disposaloutlet/O = locate() in src.loc
- if(O && O.anchored)
- return
- */
-
- //Disposal constructors
- var/obj/structure/disposalconstruct/C = locate() in src.loc
- if(C && C.anchored)
- return
-
- var/turf/T = src.loc
- if(T.intact)
- return // prevent interaction with T-scanner revealed pipes
- src.add_fingerprint(user)
- if(istype(I, /obj/item/weapon/weldingtool))
- var/obj/item/weapon/weldingtool/W = I
-
- if(linked)
- user << "You need to deconstruct disposal machinery above this pipe!"
- return
-
- if(W.remove_fuel(0,user))
- playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "You start slicing the disposal pipe..."
- if(do_after(user,30, target = src))
- if(!src || !W.isOn()) return
- Deconstruct()
- user << "You slice the disposal pipe."
- else
- return
-
- // would transfer to next pipe segment, but we are in a trunk
- // if not entering from disposal bin,
- // transfer to linked object (outlet or bin)
-
-/obj/structure/disposalpipe/trunk/transfer(obj/structure/disposalholder/H)
-
- if(H.dir == DOWN) // we just entered from a disposer
- return ..() // so do base transfer proc
- // otherwise, go to the linked object
- if(linked)
- var/obj/structure/disposaloutlet/O = linked
- if(istype(O) && (H))
- O.expel(H) // expel at outlet
- else
- var/obj/machinery/disposal/D = linked
- if(H)
- D.expel(H) // expel at disposal
- else
- if(H)
- src.expel(H, src.loc, 0) // expel at turf
- return null
-
- // nextdir
-
-/obj/structure/disposalpipe/trunk/nextdir(fromdir)
- if(fromdir == DOWN)
- return dir
- else
- return 0
-
-// a broken pipe
-/obj/structure/disposalpipe/broken
- icon_state = "pipe-b"
- dpdir = 0 // broken pipes have dpdir=0 so they're not found as 'real' pipes
- // i.e. will be treated as an empty turf
- desc = "A broken piece of disposal pipe."
-
-/obj/structure/disposalpipe/broken/New()
- ..()
- update()
- return
-
-// the disposal outlet machine
-
-/obj/structure/disposalpipe/broken/Deconstruct()
- qdel(src)
-
-/obj/structure/disposaloutlet
- name = "disposal outlet"
- desc = "An outlet for the pneumatic disposal system."
- icon = 'icons/obj/atmospherics/pipes/disposal.dmi'
- icon_state = "outlet"
- density = 1
- anchored = 1
- var/active = 0
- var/turf/target // this will be where the output objects are 'thrown' to.
- var/obj/structure/disposalpipe/trunk/trunk = null // the attached pipe trunk
- var/obj/structure/disposalconstruct/stored
- var/mode = 0
- var/start_eject = 0
- var/eject_range = 2
-
-/obj/structure/disposaloutlet/New(loc, var/obj/structure/disposalconstruct/make_from)
- ..()
-
- if(make_from)
- dir = make_from.dir
- make_from.loc = src
- stored = make_from
- else
- stored = new (src, DISP_END_OUTLET,dir)
-
- spawn(1)
- target = get_ranged_target_turf(src, dir, 10)
-
- trunk = locate() in src.loc
- if(trunk)
- trunk.linked = src // link the pipe trunk to self
-
-/obj/structure/disposaloutlet/Destroy()
- if(trunk)
- trunk.linked = null
- ..()
-
-// expel the contents of the holder object, then delete it
-// called when the holder exits the outlet
-/obj/structure/disposaloutlet/proc/expel(obj/structure/disposalholder/H)
-
- flick("outlet-open", src)
- if((start_eject + 30) < world.time)
- start_eject = world.time
- playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, 0)
- sleep(20)
- playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)
- else
- sleep(20)
- if(H)
- for(var/atom/movable/AM in H)
- AM.loc = src.loc
- AM.pipe_eject(dir)
- spawn(5)
- if(AM)
- AM.throw_at(target, eject_range, 1)
- H.vent_gas(src.loc)
- qdel(H)
- return
-
-/obj/structure/disposaloutlet/attackby(obj/item/I, mob/user, params)
- if(!I || !user)
- return
- src.add_fingerprint(user)
- if(istype(I, /obj/item/weapon/screwdriver))
- if(mode==0)
- mode=1
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You remove the screws around the power connection."
- return
- else if(mode==1)
- mode=0
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You attach the screws around the power connection."
- return
- else if(istype(I,/obj/item/weapon/weldingtool) && mode==1)
- var/obj/item/weapon/weldingtool/W = I
- if(W.remove_fuel(0,user))
- playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "You start slicing the floorweld off \the [src]..."
- if(do_after(user,20, target = src))
- if(!src || !W.isOn()) return
- user << "You slice the floorweld off \the [src]."
- stored.loc = loc
- src.transfer_fingerprints_to(stored)
- stored.update()
- stored.anchored = 0
- stored.density = 1
- qdel(src)
- return
- else
- return
-
-
-
-// called when movable is expelled from a disposal pipe or outlet
-// by default does nothing, override for special behaviour
-
-/atom/movable/proc/pipe_eject(direction)
- return
-
-// check if mob has client, if so restore client view on eject
-/mob/pipe_eject(var/direction)
- if (src.client)
- src.client.perspective = MOB_PERSPECTIVE
- src.client.eye = src
-
- return
-
-/obj/effect/decal/cleanable/blood/gibs/pipe_eject(direction)
- var/list/dirs
- if(direction)
- dirs = list( direction, turn(direction, -45), turn(direction, 45))
- else
- dirs = alldirs.Copy()
-
- src.streak(dirs)
-
-/obj/effect/decal/cleanable/robot_debris/gib/pipe_eject(direction)
- var/list/dirs
- if(direction)
- dirs = list( direction, turn(direction, -45), turn(direction, 45))
- else
- dirs = alldirs.Copy()
-
- src.streak(dirs)
+
+// virtual disposal object
+// travels through pipes in lieu of actual items
+// contents will be items flushed by the disposal
+// this allows the gas flushed to be tracked
+
+/obj/structure/disposalholder
+ invisibility = 101
+ var/datum/gas_mixture/gas = null // gas used to flush, will appear at exit point
+ var/active = 0 // true if the holder is moving, otherwise inactive
+ dir = 0
+ var/count = 1000 //*** can travel 1000 steps before going inactive (in case of loops)
+ var/destinationTag = 0 // changes if contains a delivery container
+ var/tomail = 0 //changes if contains wrapped package
+ var/hasmob = 0 //If it contains a mob
+
+/obj/structure/disposalholder/Destroy()
+ qdel(gas)
+ active = 0
+ ..()
+
+ // initialize a holder from the contents of a disposal unit
+/obj/structure/disposalholder/proc/init(obj/machinery/disposal/D)
+ gas = D.air_contents// transfer gas resv. into holder object
+
+ //Check for any living mobs trigger hasmob.
+ //hasmob effects whether the package goes to cargo or its tagged destination.
+ for(var/mob/living/M in D)
+ if(M && M.stat != DEAD)
+ if(M.client)
+ M.client.eye = src
+ hasmob = 1
+
+ //Checks 1 contents level deep. This means that players can be sent through disposals...
+ //...but it should require a second person to open the package. (i.e. person inside a wrapped locker)
+ for(var/obj/O in D)
+ if(O.contents)
+ for(var/mob/living/M in O.contents)
+ if(M && M.stat != DEAD)
+ if(M.client)
+ M.client.eye = src
+ hasmob = 1
+
+ // now everything inside the disposal gets put into the holder
+ // note AM since can contain mobs or objs
+ for(var/atom/movable/AM in D)
+ AM.loc = src
+ if(istype(AM, /obj/structure/bigDelivery) && !hasmob)
+ var/obj/structure/bigDelivery/T = AM
+ src.destinationTag = T.sortTag
+ if(istype(AM, /obj/item/smallDelivery) && !hasmob)
+ var/obj/item/smallDelivery/T = AM
+ src.destinationTag = T.sortTag
+
+
+// start the movement process
+// argument is the disposal unit the holder started in
+/obj/structure/disposalholder/proc/start(obj/machinery/disposal/D)
+ if(!D.trunk)
+ D.expel(src) // no trunk connected, so expel immediately
+ return
+
+ loc = D.trunk
+ active = 1
+ dir = DOWN
+ spawn(1)
+ move() // spawn off the movement process
+
+ return
+
+// movement process, persists while holder is moving through pipes
+/obj/structure/disposalholder/proc/move()
+ var/obj/structure/disposalpipe/last
+ while(active)
+ var/obj/structure/disposalpipe/curr = loc
+ last = curr
+ curr = curr.transfer(src)
+ if(!curr && active)
+ last.expel(src, loc, dir)
+
+ sleep(1)
+ if(!(count--))
+ active = 0
+ return
+
+// find the turf which should contain the next pipe
+/obj/structure/disposalholder/proc/nextloc()
+ return get_step(loc,dir)
+
+// find a matching pipe on a turf
+/obj/structure/disposalholder/proc/findpipe(turf/T)
+
+ if(!T)
+ return null
+
+ var/fdir = turn(dir, 180) // flip the movement direction
+ for(var/obj/structure/disposalpipe/P in T)
+ if(fdir & P.dpdir) // find pipe direction mask that matches flipped dir
+ return P
+ // if no matching pipe, return null
+ return null
+
+// merge two holder objects
+// used when a a holder meets a stuck holder
+/obj/structure/disposalholder/proc/merge(obj/structure/disposalholder/other)
+ for(var/atom/movable/AM in other)
+ AM.loc = src // move everything in other holder to this one
+ if(ismob(AM))
+ var/mob/M = AM
+ if(M.client) // if a client mob, update eye to follow this holder
+ M.client.eye = src
+ qdel(other)
+
+
+// called when player tries to move while in a pipe
+/obj/structure/disposalholder/relaymove(mob/user)
+ if (user.stat)
+ return
+ if (src.loc)
+ for (var/mob/M in get_hearers_in_view(src.loc.loc))
+ M.show_message("CLONG, clong!", 2)
+ playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0)
+
+// called to vent all gas in holder to a location
+/obj/structure/disposalholder/proc/vent_gas(atom/location)
+ if(location)
+ location.assume_air(gas) // vent all gas to turf
+ air_update_turf()
+ return
+
+/obj/structure/disposalholder/allow_drop()
+ return 1
+
+// Disposal pipes
+
+/obj/structure/disposalpipe
+ icon = 'icons/obj/atmospherics/pipes/disposal.dmi'
+ name = "disposal pipe"
+ desc = "An underfloor disposal pipe."
+ anchored = 1
+ density = 0
+
+ level = 1 // underfloor only
+ var/dpdir = 0 // bitmask of pipe directions
+ dir = 0 // dir will contain dominant direction for junction pipes
+ var/health = 10 // health points 0-10
+ layer = 2.3 // slightly lower than wires and other pipes
+ var/base_icon_state // initial icon state on map
+ var/obj/structure/disposalconstruct/stored
+
+ // new pipe, set the icon_state as on map
+/obj/structure/disposalpipe/New(loc,var/obj/structure/disposalconstruct/make_from)
+ ..()
+
+ if(make_from && !make_from.gc_destroyed)
+ base_icon_state = make_from.base_state
+ dir = make_from.dir
+ dpdir = make_from.dpdir
+ make_from.loc = src
+ stored = make_from
+ else
+ base_icon_state = icon_state
+ stored = new /obj/structure/disposalconstruct(src,direction=dir)
+ switch(base_icon_state)
+ if("pipe-s")
+ stored.ptype = DISP_PIPE_STRAIGHT
+ if("pipe-c")
+ stored.ptype = DISP_PIPE_BENT
+ if("pipe-j1")
+ stored.ptype = DISP_JUNCTION
+ if("pipe-j2")
+ stored.ptype = DISP_JUNCTION_FLIP
+ if("pipe-y")
+ stored.ptype = DISP_YJUNCTION
+ if("pipe-t")
+ stored.ptype = DISP_END_TRUNK
+ if("pipe-j1s")
+ stored.ptype = DISP_SORTJUNCTION
+ if("pipe-j2s")
+ stored.ptype = DISP_SORTJUNCTION_FLIP
+ return
+
+
+ // pipe is deleted
+ // ensure if holder is present, it is expelled
+/obj/structure/disposalpipe/Destroy()
+ var/obj/structure/disposalholder/H = locate() in src
+ if(H)
+ // holder was present
+ H.active = 0
+ var/turf/T = src.loc
+ if(T.density)
+ // deleting pipe is inside a dense turf (wall)
+ // this is unlikely, but just dump out everything into the turf in case
+
+ for(var/atom/movable/AM in H)
+ AM.loc = T
+ AM.pipe_eject(0)
+ qdel(H)
+ ..()
+ return
+
+ // otherwise, do normal expel from turf
+ if(H)
+ expel(H, T, 0)
+ ..()
+
+// returns the direction of the next pipe object, given the entrance dir
+// by default, returns the bitmask of remaining directions
+/obj/structure/disposalpipe/proc/nextdir(fromdir)
+ return dpdir & (~turn(fromdir, 180))
+
+// transfer the holder through this pipe segment
+// overriden for special behaviour
+//
+/obj/structure/disposalpipe/proc/transfer(obj/structure/disposalholder/H)
+ var/nextdir = nextdir(H.dir)
+ H.dir = nextdir
+ var/turf/T = H.nextloc()
+ var/obj/structure/disposalpipe/P = H.findpipe(T)
+
+ if(P)
+ // find other holder in next loc, if inactive merge it with current
+ var/obj/structure/disposalholder/H2 = locate() in P
+ if(H2 && !H2.active)
+ H.merge(H2)
+
+ H.loc = P
+ else // if wasn't a pipe, then set loc to turf
+ H.loc = T
+ return null
+
+ return P
+
+
+// update the icon_state to reflect hidden status
+/obj/structure/disposalpipe/proc/update()
+ var/turf/T = src.loc
+ hide(T.intact && !istype(T,/turf/space)) // space never hides pipes
+
+// hide called by levelupdate if turf intact status changes
+// change visibility status and force update of icon
+/obj/structure/disposalpipe/hide(var/intact)
+ invisibility = intact ? 101: 0 // hide if floor is intact
+ updateicon()
+
+// update actual icon_state depending on visibility
+// if invisible, append "f" to icon_state to show faded version
+// this will be revealed if a T-scanner is used
+// if visible, use regular icon_state
+/obj/structure/disposalpipe/proc/updateicon()
+ if(invisibility)
+ icon_state = "[base_icon_state]f"
+ else
+ icon_state = base_icon_state
+ return
+
+
+// expel the held objects into a turf
+// called when there is a break in the pipe
+//
+
+/obj/structure/disposalpipe/proc/expel(obj/structure/disposalholder/H, turf/T, direction)
+
+ var/turf/target
+
+ if(istype(T, /turf/simulated/floor)) //intact floor, pop the tile
+ var/turf/simulated/floor/myturf = T
+ if(myturf.builtin_tile)
+ myturf.builtin_tile.loc = T
+ myturf.builtin_tile = null
+ myturf.make_plating()
+
+ if(direction) // direction is specified
+ if(istype(T, /turf/space)) // if ended in space, then range is unlimited
+ target = get_edge_target_turf(T, direction)
+ else // otherwise limit to 10 tiles
+ target = get_ranged_target_turf(T, direction, 10)
+
+ playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)
+ if(H)
+ for(var/atom/movable/AM in H)
+ AM.loc = T
+ AM.pipe_eject(direction)
+ spawn(1)
+ if(AM)
+ AM.throw_at(target, 10, 1)
+
+ else // no specified direction, so throw in random direction
+
+ playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)
+ if(H)
+ for(var/atom/movable/AM in H)
+ target = get_offset_target_turf(T, rand(5)-rand(5), rand(5)-rand(5))
+
+ AM.loc = T
+ AM.pipe_eject(0)
+ spawn(1)
+ if(AM)
+ AM.throw_at(target, 5, 1)
+ H.vent_gas(T)
+ qdel(H)
+ return
+
+// call to break the pipe
+// will expel any holder inside at the time
+// then delete the pipe
+// remains : set to leave broken pipe pieces in place
+/obj/structure/disposalpipe/proc/broken(remains = 0)
+ if(remains)
+ for(var/D in cardinal)
+ if(D & dpdir)
+ var/obj/structure/disposalpipe/broken/P = new(src.loc)
+ P.dir = D
+
+ src.invisibility = 101 // make invisible (since we won't delete the pipe immediately)
+ var/obj/structure/disposalholder/H = locate() in src
+ if(H)
+ // holder was present
+ H.active = 0
+ var/turf/T = src.loc
+ if(T.density)
+ // broken pipe is inside a dense turf (wall)
+ // this is unlikely, but just dump out everything into the turf in case
+
+ for(var/atom/movable/AM in H)
+ AM.loc = T
+ AM.pipe_eject(0)
+ qdel(H)
+ return
+
+ // otherwise, do normal expel from turf
+ if(H)
+ expel(H, T, 0)
+
+ spawn(2) // delete pipe after 2 ticks to ensure expel proc finished
+ qdel(src)
+
+
+// pipe affected by explosion
+/obj/structure/disposalpipe/ex_act(severity, target)
+
+ //pass on ex_act to our contents before calling it on ourself
+ var/obj/structure/disposalholder/H = locate() in src
+ if(H)
+ H.contents_explosion(severity, target)
+
+ switch(severity)
+ if(1.0)
+ broken(0)
+ return
+ if(2.0)
+ health -= rand(5,15)
+ healthcheck()
+ return
+ if(3.0)
+ health -= rand(0,15)
+ healthcheck()
+ return
+
+
+// test health for brokenness
+/obj/structure/disposalpipe/proc/healthcheck()
+ if(health < -2)
+ broken(0)
+ else if(health<1)
+ broken(1)
+ return
+
+//attack by item
+//weldingtool: unfasten and convert to obj/disposalconstruct
+
+/obj/structure/disposalpipe/attackby(obj/item/I, mob/user, params)
+
+ var/turf/T = src.loc
+ if(T.intact)
+ return // prevent interaction with T-scanner revealed pipes
+ src.add_fingerprint(user)
+ if(istype(I, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/W = I
+
+ if(W.remove_fuel(0,user))
+ playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
+ user << "You start slicing the disposal pipe..."
+ // check if anything changed over 2 seconds
+ if(do_after(user,30, target = src))
+ if(!src || !W.isOn()) return
+ Deconstruct()
+ user << "You slice the disposal pipe."
+ else
+ return
+
+// called when pipe is cut with welder
+/obj/structure/disposalpipe/Deconstruct()
+ if(stored)
+ var/turf/T = loc
+ stored.loc = T
+ transfer_fingerprints_to(stored)
+ stored.dir = dir
+ stored.density = 0
+ stored.anchored = 1
+ stored.update()
+ ..()
+
+/obj/structure/disposalpipe/singularity_pull(S, current_size)
+ if(current_size >= STAGE_FIVE)
+ Deconstruct()
+
+// *** TEST verb
+//client/verb/dispstop()
+// for(var/obj/structure/disposalholder/H in world)
+// H.active = 0
+
+// a straight or bent segment
+/obj/structure/disposalpipe/segment
+ icon_state = "pipe-s"
+
+/obj/structure/disposalpipe/segment/New()
+ ..()
+ if(stored.ptype == DISP_PIPE_STRAIGHT)
+ dpdir = dir | turn(dir, 180)
+ else
+ dpdir = dir | turn(dir, -90)
+
+ update()
+ return
+
+
+
+
+//a three-way junction with dir being the dominant direction
+/obj/structure/disposalpipe/junction
+ icon_state = "pipe-j1"
+
+/obj/structure/disposalpipe/junction/New()
+ ..()
+ switch(stored.ptype)
+ if(DISP_JUNCTION)
+ dpdir = dir | turn(dir, -90) | turn(dir,180)
+ if(DISP_JUNCTION_FLIP)
+ dpdir = dir | turn(dir, 90) | turn(dir,180)
+ if(DISP_YJUNCTION)
+ dpdir = dir | turn(dir,90) | turn(dir, -90)
+ update()
+ return
+
+
+// next direction to move
+// if coming in from secondary dirs, then next is primary dir
+// if coming in from primary dir, then next is equal chance of other dirs
+
+/obj/structure/disposalpipe/junction/nextdir(fromdir)
+ var/flipdir = turn(fromdir, 180)
+ if(flipdir != dir) // came from secondary dir
+ return dir // so exit through primary
+ else // came from primary
+ // so need to choose either secondary exit
+ var/mask = ..(fromdir)
+
+ // find a bit which is set
+ var/setbit = 0
+ if(mask & NORTH)
+ setbit = NORTH
+ else if(mask & SOUTH)
+ setbit = SOUTH
+ else if(mask & EAST)
+ setbit = EAST
+ else
+ setbit = WEST
+
+ if(prob(50)) // 50% chance to choose the found bit or the other one
+ return setbit
+ else
+ return mask & (~setbit)
+
+//a three-way junction that sorts objects
+/obj/structure/disposalpipe/sortjunction
+
+ icon_state = "pipe-j1s"
+ var/sortType = 0 //Look at the list called TAGGERLOCATIONS in setup.dm
+ var/posdir = 0
+ var/negdir = 0
+ var/sortdir = 0
+
+/obj/structure/disposalpipe/sortjunction/proc/updatedesc()
+ desc = "An underfloor disposal pipe with a package sorting mechanism."
+ if(sortType>0)
+ var/tag = uppertext(TAGGERLOCATIONS[sortType])
+ desc += "\nIt's tagged with [tag]"
+
+/obj/structure/disposalpipe/sortjunction/proc/updatedir()
+ posdir = dir
+ negdir = turn(posdir, 180)
+
+ if(stored.ptype == DISP_SORTJUNCTION)
+ sortdir = turn(posdir, -90)
+ else
+ icon_state = "pipe-j2s"
+ sortdir = turn(posdir, 90)
+
+ dpdir = sortdir | posdir | negdir
+
+/obj/structure/disposalpipe/sortjunction/New()
+ ..()
+ updatedir()
+ updatedesc()
+ update()
+ return
+
+/obj/structure/disposalpipe/sortjunction/attackby(obj/item/I, mob/user, params)
+ if(..())
+ return
+
+ if(istype(I, /obj/item/device/destTagger))
+ var/obj/item/device/destTagger/O = I
+
+ if(O.currTag > 0)// Tag set
+ sortType = O.currTag
+ playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
+ var/tag = uppertext(TAGGERLOCATIONS[O.currTag])
+ user << "Changed filter to [tag]."
+ updatedesc()
+
+
+// next direction to move
+// if coming in from negdir, then next is primary dir or sortdir
+// if coming in from posdir, then flip around and go back to posdir
+// if coming in from sortdir, go to posdir
+
+/obj/structure/disposalpipe/sortjunction/nextdir(fromdir, sortTag)
+ //var/flipdir = turn(fromdir, 180)
+ if(fromdir != sortdir) // probably came from the negdir
+
+ if(src.sortType == sortTag) //if destination matches filtered type...
+ return sortdir // exit through sortdirection
+ else
+ return posdir
+ else // came from sortdir
+ // so go with the flow to positive direction
+ return posdir
+
+/obj/structure/disposalpipe/sortjunction/transfer(obj/structure/disposalholder/H)
+ var/nextdir = nextdir(H.dir, H.destinationTag)
+ H.dir = nextdir
+ var/turf/T = H.nextloc()
+ var/obj/structure/disposalpipe/P = H.findpipe(T)
+
+ if(P)
+ // find other holder in next loc, if inactive merge it with current
+ var/obj/structure/disposalholder/H2 = locate() in P
+ if(H2 && !H2.active)
+ H.merge(H2)
+
+ H.loc = P
+ else // if wasn't a pipe, then set loc to turf
+ H.loc = T
+ return null
+
+ return P
+
+
+//a three-way junction that sorts objects destined for the mail office mail table (tomail = 1)
+/obj/structure/disposalpipe/wrapsortjunction
+
+ desc = "An underfloor disposal pipe which sorts wrapped and unwrapped objects."
+ icon_state = "pipe-j1s"
+ var/posdir = 0
+ var/negdir = 0
+ var/sortdir = 0
+
+/obj/structure/disposalpipe/wrapsortjunction/New()
+ ..()
+ posdir = dir
+ if(stored.ptype == DISP_SORTJUNCTION)
+ sortdir = turn(posdir, -90)
+ negdir = turn(posdir, 180)
+ else
+ icon_state = "pipe-j2s"
+ sortdir = turn(posdir, 90)
+ negdir = turn(posdir, 180)
+ dpdir = sortdir | posdir | negdir
+
+ update()
+ return
+
+// next direction to move
+// if coming in from negdir, then next is primary dir or sortdir
+// if coming in from posdir, then flip around and go back to posdir
+// if coming in from sortdir, go to posdir
+
+/obj/structure/disposalpipe/wrapsortjunction/nextdir(fromdir, istomail)
+ //var/flipdir = turn(fromdir, 180)
+ if(fromdir != sortdir) // probably came from the negdir
+
+ if(istomail) //if destination matches filtered type...
+ return sortdir // exit through sortdirection
+ else
+ return posdir
+ else // came from sortdir
+ // so go with the flow to positive direction
+ return posdir
+
+/obj/structure/disposalpipe/wrapsortjunction/transfer(obj/structure/disposalholder/H)
+ var/nextdir = nextdir(H.dir, H.tomail)
+ H.dir = nextdir
+ var/turf/T = H.nextloc()
+ var/obj/structure/disposalpipe/P = H.findpipe(T)
+
+ if(P)
+ // find other holder in next loc, if inactive merge it with current
+ var/obj/structure/disposalholder/H2 = locate() in P
+ if(H2 && !H2.active)
+ H.merge(H2)
+
+ H.loc = P
+ else // if wasn't a pipe, then set loc to turf
+ H.loc = T
+ return null
+
+ return P
+
+
+
+
+
+//a trunk joining to a disposal bin or outlet on the same turf
+/obj/structure/disposalpipe/trunk
+ icon_state = "pipe-t"
+ var/obj/linked // the linked obj/machinery/disposal or obj/disposaloutlet
+
+/obj/structure/disposalpipe/trunk/New()
+ ..()
+ dpdir = dir
+ spawn(1)
+ getlinked()
+
+ update()
+ return
+
+/obj/structure/disposalpipe/trunk/proc/getlinked()
+ linked = null
+ var/obj/machinery/disposal/D = locate() in src.loc
+ if(D)
+ linked = D
+ if (!D.trunk)
+ D.trunk = src
+
+ var/obj/structure/disposaloutlet/O = locate() in src.loc
+ if(O)
+ linked = O
+
+ update()
+ return
+
+ // Override attackby so we disallow trunkremoval when somethings ontop
+/obj/structure/disposalpipe/trunk/attackby(obj/item/I, mob/user, params)
+
+ //Disposal bins or chutes
+ /*
+ These shouldn't be required
+ var/obj/machinery/disposal/D = locate() in src.loc
+ if(D && D.anchored)
+ return
+
+ //Disposal outlet
+ var/obj/structure/disposaloutlet/O = locate() in src.loc
+ if(O && O.anchored)
+ return
+ */
+
+ //Disposal constructors
+ var/obj/structure/disposalconstruct/C = locate() in src.loc
+ if(C && C.anchored)
+ return
+
+ var/turf/T = src.loc
+ if(T.intact)
+ return // prevent interaction with T-scanner revealed pipes
+ src.add_fingerprint(user)
+ if(istype(I, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/W = I
+
+ if(linked)
+ user << "You need to deconstruct disposal machinery above this pipe!"
+ return
+
+ if(W.remove_fuel(0,user))
+ playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
+ user << "You start slicing the disposal pipe..."
+ if(do_after(user,30, target = src))
+ if(!src || !W.isOn()) return
+ Deconstruct()
+ user << "You slice the disposal pipe."
+ else
+ return
+
+ // would transfer to next pipe segment, but we are in a trunk
+ // if not entering from disposal bin,
+ // transfer to linked object (outlet or bin)
+
+/obj/structure/disposalpipe/trunk/transfer(obj/structure/disposalholder/H)
+
+ if(H.dir == DOWN) // we just entered from a disposer
+ return ..() // so do base transfer proc
+ // otherwise, go to the linked object
+ if(linked)
+ var/obj/structure/disposaloutlet/O = linked
+ if(istype(O) && (H))
+ O.expel(H) // expel at outlet
+ else
+ var/obj/machinery/disposal/D = linked
+ if(H)
+ D.expel(H) // expel at disposal
+ else
+ if(H)
+ src.expel(H, src.loc, 0) // expel at turf
+ return null
+
+ // nextdir
+
+/obj/structure/disposalpipe/trunk/nextdir(fromdir)
+ if(fromdir == DOWN)
+ return dir
+ else
+ return 0
+
+// a broken pipe
+/obj/structure/disposalpipe/broken
+ icon_state = "pipe-b"
+ dpdir = 0 // broken pipes have dpdir=0 so they're not found as 'real' pipes
+ // i.e. will be treated as an empty turf
+ desc = "A broken piece of disposal pipe."
+
+/obj/structure/disposalpipe/broken/New()
+ ..()
+ update()
+ return
+
+// the disposal outlet machine
+
+/obj/structure/disposalpipe/broken/Deconstruct()
+ qdel(src)
+
+/obj/structure/disposaloutlet
+ name = "disposal outlet"
+ desc = "An outlet for the pneumatic disposal system."
+ icon = 'icons/obj/atmospherics/pipes/disposal.dmi'
+ icon_state = "outlet"
+ density = 1
+ anchored = 1
+ var/active = 0
+ var/turf/target // this will be where the output objects are 'thrown' to.
+ var/obj/structure/disposalpipe/trunk/trunk = null // the attached pipe trunk
+ var/obj/structure/disposalconstruct/stored
+ var/mode = 0
+ var/start_eject = 0
+ var/eject_range = 2
+
+/obj/structure/disposaloutlet/New(loc, var/obj/structure/disposalconstruct/make_from)
+ ..()
+
+ if(make_from)
+ dir = make_from.dir
+ make_from.loc = src
+ stored = make_from
+ else
+ stored = new (src, DISP_END_OUTLET,dir)
+
+ spawn(1)
+ target = get_ranged_target_turf(src, dir, 10)
+
+ trunk = locate() in src.loc
+ if(trunk)
+ trunk.linked = src // link the pipe trunk to self
+
+/obj/structure/disposaloutlet/Destroy()
+ if(trunk)
+ trunk.linked = null
+ ..()
+
+// expel the contents of the holder object, then delete it
+// called when the holder exits the outlet
+/obj/structure/disposaloutlet/proc/expel(obj/structure/disposalholder/H)
+
+ flick("outlet-open", src)
+ if((start_eject + 30) < world.time)
+ start_eject = world.time
+ playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, 0)
+ sleep(20)
+ playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)
+ else
+ sleep(20)
+ if(H)
+ for(var/atom/movable/AM in H)
+ AM.loc = src.loc
+ AM.pipe_eject(dir)
+ spawn(5)
+ if(AM)
+ AM.throw_at(target, eject_range, 1)
+ H.vent_gas(src.loc)
+ qdel(H)
+ return
+
+/obj/structure/disposaloutlet/attackby(obj/item/I, mob/user, params)
+ if(!I || !user)
+ return
+ src.add_fingerprint(user)
+ if(istype(I, /obj/item/weapon/screwdriver))
+ if(mode==0)
+ mode=1
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+ user << "You remove the screws around the power connection."
+ return
+ else if(mode==1)
+ mode=0
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+ user << "You attach the screws around the power connection."
+ return
+ else if(istype(I,/obj/item/weapon/weldingtool) && mode==1)
+ var/obj/item/weapon/weldingtool/W = I
+ if(W.remove_fuel(0,user))
+ playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
+ user << "You start slicing the floorweld off \the [src]..."
+ if(do_after(user,20, target = src))
+ if(!src || !W.isOn()) return
+ user << "You slice the floorweld off \the [src]."
+ stored.loc = loc
+ src.transfer_fingerprints_to(stored)
+ stored.update()
+ stored.anchored = 0
+ stored.density = 1
+ qdel(src)
+ return
+ else
+ return
+
+
+
+// called when movable is expelled from a disposal pipe or outlet
+// by default does nothing, override for special behaviour
+
+/atom/movable/proc/pipe_eject(direction)
+ return
+
+// check if mob has client, if so restore client view on eject
+/mob/pipe_eject(var/direction)
+ if (src.client)
+ src.client.perspective = MOB_PERSPECTIVE
+ src.client.eye = src
+
+ return
+
+/obj/effect/decal/cleanable/blood/gibs/pipe_eject(direction)
+ var/list/dirs
+ if(direction)
+ dirs = list( direction, turn(direction, -45), turn(direction, 45))
+ else
+ dirs = alldirs.Copy()
+
+ src.streak(dirs)
+
+/obj/effect/decal/cleanable/robot_debris/gib/pipe_eject(direction)
+ var/list/dirs
+ if(direction)
+ dirs = list( direction, turn(direction, -45), turn(direction, 45))
+ else
+ dirs = alldirs.Copy()
+
+ src.streak(dirs)
diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm
new file mode 100644
index 00000000000..a348aa86165
--- /dev/null
+++ b/code/modules/recycling/disposal-unit.dm
@@ -0,0 +1,540 @@
+
+//disposal bin and Delivery chute.
+
+#define SEND_PRESSURE 0.05*ONE_ATMOSPHERE
+
+/obj/machinery/disposal
+ icon = 'icons/obj/atmospherics/pipes/disposal.dmi'
+ anchored = 1
+ density = 1
+ var/datum/gas_mixture/air_contents // internal reservoir
+ var/mode = 1 // mode -1=screws removed 0=off 1=charging 2=charged
+ var/flush = 0 // true if flush handle is pulled
+ var/obj/structure/disposalpipe/trunk/trunk = null // the attached pipe trunk
+ var/flushing = 0 // true if flushing in progress
+ var/flush_every_ticks = 30 //Every 30 ticks it will look whether it is ready to flush
+ var/flush_count = 0 //this var adds 1 once per tick. When it reaches flush_every_ticks it resets and tries to flush.
+ var/last_sound = 0
+ var/obj/structure/disposalconstruct/stored
+ // create a new disposal
+ // find the attached trunk (if present) and init gas resvr.
+
+/obj/machinery/disposal/New(loc, var/obj/structure/disposalconstruct/make_from)
+ ..()
+
+ if(make_from)
+ dir = make_from.dir
+ make_from.loc = 0
+ stored = make_from
+ else
+ stored = new /obj/structure/disposalconstruct(0,DISP_END_BIN,dir)
+
+ trunk_check()
+
+ air_contents = new/datum/gas_mixture()
+ //gas.volume = 1.05 * CELLSTANDARD
+ update()
+
+/obj/machinery/disposal/proc/trunk_check()
+ trunk = locate() in src.loc
+ if(!trunk)
+ mode = 0
+ flush = 0
+ else
+ mode = initial(mode)
+ flush = initial(flush)
+ trunk.linked = src // link the pipe trunk to self
+
+/obj/machinery/disposal/Destroy()
+ eject()
+ if(trunk)
+ trunk.linked = null
+ ..()
+
+/obj/machinery/disposal/singularity_pull(S, current_size)
+ if(current_size >= STAGE_FIVE)
+ Deconstruct()
+
+/obj/machinery/disposal/initialize()
+ // this will get a copy of the air turf and take a SEND PRESSURE amount of air from it
+ var/atom/L = loc
+ var/datum/gas_mixture/env = new
+ env.copy_from(L.return_air())
+ var/datum/gas_mixture/removed = env.remove(SEND_PRESSURE + 1)
+ air_contents.merge(removed)
+ trunk_check()
+
+/obj/machinery/disposal/attackby(obj/item/I, mob/user, params)
+ if(stat & BROKEN || !I || !user)
+ return
+
+ add_fingerprint(user)
+ if(mode<=0) // It's off
+ if(istype(I, /obj/item/weapon/screwdriver))
+ if(contents.len > 0)
+ user << "Eject the items first!"
+ return
+ if(mode==0)
+ mode=-1
+ else
+ mode=0
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+ user << "You [mode==0?"attach":"remove"] the screws around the power connection."
+ return
+ else if(istype(I,/obj/item/weapon/weldingtool) && mode==-1)
+ var/obj/item/weapon/weldingtool/W = I
+ if(W.remove_fuel(0,user))
+ if(contents.len > 0)
+ user << "Eject the items first!"
+ return
+ playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
+ user << "You start slicing the floorweld off \the [src]..."
+ if(do_after(user,20, target = src))
+ if(!W.isOn())
+ return
+ user << "You slice the floorweld off \the [src]."
+ Deconstruct()
+ return
+ return 1
+
+// mouse drop another mob or self
+//
+/obj/machinery/disposal/MouseDrop_T(mob/living/target, mob/living/user)
+ if(istype(target) && user == target)
+ stuff_mob_in(target, user)
+
+/obj/machinery/disposal/proc/stuff_mob_in(mob/living/target, mob/living/user)
+ if(!iscarbon(user) && !user.ventcrawler) //only carbon and ventcrawlers can climb into disposal by themselves.
+ return
+ if(target.buckled)
+ return
+ if(target.mob_size > MOB_SIZE_HUMAN)
+ user << "[target] doesn't fit inside [src]!"
+ return
+ add_fingerprint(user)
+ if(user == target)
+ user.visible_message("[user] starts climbing into [src].", \
+ "You start climbing into [src]...")
+ else
+ target.visible_message("[user] starts putting [target] into [src].", \
+ "[user] starts putting you into [src]!")
+ if(do_mob(user, target, 20))
+ if (!loc)
+ return
+ if (target.client)
+ target.client.perspective = EYE_PERSPECTIVE
+ target.client.eye = src
+ target.loc = src
+ if(user == target)
+ user.visible_message("[user] climbs into [src].", \
+ "You climb into [src].")
+ else
+ target.visible_message("[user] has placed [target] in [src].", \
+ "[user] has placed [target] in [src].")
+ add_logs(user, target, "stuffed", addition="into [src]")
+ update()
+
+// can breath normally in the disposal
+/obj/machinery/disposal/alter_health()
+ return get_turf(src)
+
+/obj/machinery/disposal/relaymove(mob/user)
+ attempt_escape(user)
+
+// resist to escape the bin
+/obj/machinery/disposal/container_resist()
+ attempt_escape(usr)
+
+/obj/machinery/disposal/proc/attempt_escape(mob/user)
+ if(src.flushing)
+ return
+ go_out(user)
+ return
+
+// leave the disposal
+/obj/machinery/disposal/proc/go_out(mob/user)
+
+ if (user.client)
+ user.client.eye = user.client.mob
+ user.client.perspective = MOB_PERSPECTIVE
+ user.loc = src.loc
+ update()
+ return
+
+
+// monkeys and xenos can only pull the flush lever
+/obj/machinery/disposal/attack_paw(mob/user)
+ if(stat & BROKEN)
+ return
+ flush = !flush
+ update()
+
+// ai as human but can't flush
+/obj/machinery/disposal/attack_ai(mob/user)
+ interact(user, 1)
+
+// human interact with machine
+/obj/machinery/disposal/attack_hand(mob/user)
+ if(user && user.loc == src)
+ usr << "You cannot reach the controls from inside!"
+ return
+ /*
+ if(mode==-1)
+ usr << "\red The disposal units power is disabled."
+ return
+ */
+ interact(user, 0)
+
+// hostile mob escape from disposals
+/obj/machinery/disposal/attack_animal(mob/living/simple_animal/M)
+ if(M.environment_smash)
+ M.do_attack_animation(src)
+ visible_message("[M.name] smashes \the [src] apart!")
+ qdel(src)
+ return
+
+// eject the contents of the disposal unit
+/obj/machinery/disposal/proc/eject()
+ for(var/atom/movable/AM in src)
+ AM.loc = src.loc
+ AM.pipe_eject(0)
+ update()
+
+// update the icon & overlays to reflect mode & status
+/obj/machinery/disposal/proc/update()
+ return
+
+/obj/machinery/disposal/proc/flush()
+ flushing = 1
+ flushAnimation()
+ sleep(10)
+ if(last_sound < world.time + 1)
+ playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, 0)
+ last_sound = world.time
+ sleep(5)
+ if(gc_destroyed)
+ return
+ var/obj/structure/disposalholder/H = new()
+ newHolderDestination(H)
+ H.init(src)
+ air_contents = new()
+ H.start(src)
+ flushing = 0
+ flush = 0
+
+/obj/machinery/disposal/bin/flush()
+ ..()
+ if(mode == 2)
+ mode = 1
+ update()
+
+/obj/machinery/disposal/proc/newHolderDestination(obj/structure/disposalholder/H)
+ for(var/obj/item/smallDelivery/O in src)
+ H.tomail = 1
+ return
+
+/obj/machinery/disposal/proc/flushAnimation()
+ flick("[icon_state]-flush", src)
+
+// called when area power changes
+/obj/machinery/disposal/power_change()
+ ..() // do default setting/reset of stat NOPOWER bit
+ update() // update icon
+ return
+
+
+// called when holder is expelled from a disposal
+// should usually only occur if the pipe network is modified
+/obj/machinery/disposal/proc/expel(obj/structure/disposalholder/H)
+
+ var/turf/target
+ playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)
+ if(H) // Somehow, someone managed to flush a window which broke mid-transit and caused the disposal to go in an infinite loop trying to expel null, hopefully this fixes it
+ for(var/atom/movable/AM in H)
+ target = get_offset_target_turf(src.loc, rand(5)-rand(5), rand(5)-rand(5))
+
+ AM.loc = src.loc
+ AM.pipe_eject(0)
+ spawn(1)
+ if(AM)
+ AM.throw_at(target, 5, 1)
+
+ H.vent_gas(loc)
+ qdel(H)
+
+/obj/machinery/disposal/Deconstruct()
+ if(stored)
+ var/turf/T = loc
+ stored.loc = T
+ src.transfer_fingerprints_to(stored)
+ stored.anchored = 0
+ stored.density = 1
+ stored.update()
+ ..()
+
+//How disposal handles getting a storage dump from a storage object
+/obj/machinery/disposal/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)
+ for(var/obj/item/I in src_object)
+ src_object.remove_from_storage(I, src)
+ return 1
+
+
+// Disposal bin
+// Holds items for disposal into pipe system
+// Draws air from turf, gradually charges internal reservoir
+// Once full (~1 atm), uses air resv to flush items into the pipes
+// Automatically recharges air (unless off), will flush when ready if pre-set
+// Can hold items and human size things, no other draggables
+
+/obj/machinery/disposal/bin
+ name = "disposal unit"
+ desc = "A pneumatic waste disposal unit."
+ icon_state = "disposal"
+
+ // attack by item places it in to disposal
+/obj/machinery/disposal/bin/attackby(obj/item/I, mob/user, params)
+ if(!..())
+ return
+
+ if(istype(I, /obj/item/weapon/storage/bag/trash))
+ var/obj/item/weapon/storage/bag/trash/T = I
+ user << "You empty the bag."
+ for(var/obj/item/O in T.contents)
+ T.remove_from_storage(O,src)
+ T.update_icon()
+ update()
+ return
+
+ var/obj/item/weapon/grab/G = I
+ if(istype(G)) // handle grabbed mob
+ if(ismob(G.affecting))
+ stuff_mob_in(G.affecting, user)
+ return
+
+ if(!user.drop_item())
+ return
+
+ I.loc = src
+ user.visible_message("[user.name] places \the [I] into \the [src].", \
+ "You place \the [I] into \the [src].")
+
+ update()
+
+// user interaction
+/obj/machinery/disposal/bin/interact(mob/user, ai=0)
+ src.add_fingerprint(user)
+ if(stat & BROKEN)
+ user.unset_machine()
+ return
+
+ var/dat = "Waste Disposal UnitWaste Disposal Unit
"
+
+ if(!ai) // AI can't pull flush handle
+ if(flush)
+ dat += "Disposal handle: Disengage Engaged"
+ else
+ dat += "Disposal handle: Disengaged Engage"
+
+ dat += "
Eject contents
"
+
+ if(mode <= 0)
+ dat += "Pump: Off On
"
+ else if(mode == 1)
+ dat += "Pump: Off On (pressurizing)
"
+ else
+ dat += "Pump: Off On (idle)
"
+
+ var/per = Clamp(100* air_contents.return_pressure() / (SEND_PRESSURE), 0, 100)
+
+ dat += "Pressure: [round(per, 1)]%
"
+
+
+ user.set_machine(src)
+ user << browse(dat, "window=disposal;size=360x170")
+ onclose(user, "disposal")
+
+// handle machine interaction
+
+/obj/machinery/disposal/bin/Topic(href, href_list)
+ if(..())
+ return
+ if(usr.loc == src)
+ usr << "You cannot reach the controls from inside!"
+ return
+
+ if(mode==-1 && !href_list["eject"]) // only allow ejecting if mode is -1
+ usr << "\The [src]'s power is disabled."
+ return
+ ..()
+ usr.set_machine(src)
+
+ if(href_list["close"])
+ usr.unset_machine()
+ usr << browse(null, "window=disposal")
+ return
+
+ if(href_list["pump"])
+ if(text2num(href_list["pump"]))
+ mode = 1
+ else
+ mode = 0
+ update()
+
+ if(href_list["handle"])
+ flush = text2num(href_list["handle"])
+ update()
+
+ if(href_list["eject"])
+ eject()
+ return
+
+/obj/machinery/disposal/bin/CanPass(atom/movable/mover, turf/target, height=0)
+ if (istype(mover,/obj/item) && mover.throwing)
+ var/obj/item/I = mover
+ if(istype(I, /obj/item/projectile))
+ return
+ if(prob(75))
+ I.loc = src
+ visible_message("\the [I] lands in \the [src].")
+ update()
+ else
+ visible_message("\the [I] bounces off of \the [src]'s rim!")
+ return 0
+ else
+ return ..(mover, target, height)
+
+/obj/machinery/disposal/bin/update()
+ overlays.Cut()
+ if(stat & BROKEN)
+ mode = 0
+ flush = 0
+ return
+
+ // flush handle
+ if(flush)
+ overlays += image('icons/obj/atmospherics/pipes/disposal.dmi', "dispover-handle")
+
+ // only handle is shown if no power
+ if(stat & NOPOWER || mode == -1)
+ return
+
+ // check for items in disposal - occupied light
+ if(contents.len > 0)
+ overlays += image('icons/obj/atmospherics/pipes/disposal.dmi', "dispover-full")
+
+ // charging and ready light
+ if(mode == 1)
+ overlays += image('icons/obj/atmospherics/pipes/disposal.dmi', "dispover-charge")
+ else if(mode == 2)
+ overlays += image('icons/obj/atmospherics/pipes/disposal.dmi', "dispover-ready")
+
+
+// timed process
+// charge the gas reservoir and perform flush if ready
+/obj/machinery/disposal/bin/process()
+ if(stat & BROKEN) // nothing can happen if broken
+ return
+
+ flush_count++
+ if( flush_count >= flush_every_ticks )
+ if( contents.len )
+ if(mode == 2)
+ spawn(0)
+ feedback_inc("disposal_auto_flush",1)
+ flush()
+ flush_count = 0
+
+ src.updateDialog()
+
+ if(flush && air_contents.return_pressure() >= SEND_PRESSURE ) // flush can happen even without power
+ spawn(0)
+ flush()
+
+ if(stat & NOPOWER) // won't charge if no power
+ return
+
+ use_power(100) // base power usage
+
+ if(mode != 1) // if off or ready, no need to charge
+ return
+
+ // otherwise charge
+ use_power(500) // charging power usage
+
+ var/atom/L = loc // recharging from loc turf
+
+ var/datum/gas_mixture/env = L.return_air()
+ var/pressure_delta = (SEND_PRESSURE*1.01) - air_contents.return_pressure()
+
+ if(env.temperature > 0)
+ var/transfer_moles = 0.1 * pressure_delta*air_contents.volume/(env.temperature * R_IDEAL_GAS_EQUATION)
+
+ //Actually transfer the gas
+ var/datum/gas_mixture/removed = env.remove(transfer_moles)
+ air_contents.merge(removed)
+ air_update_turf()
+
+
+ // if full enough, switch to ready mode
+ if(air_contents.return_pressure() >= SEND_PRESSURE)
+ mode = 2
+ update()
+ return
+
+
+//Delivery Chute
+
+/obj/machinery/disposal/deliveryChute
+ name = "delivery chute"
+ desc = "A chute for big and small packages alike!"
+ density = 1
+ icon_state = "intake"
+ mode = 0 // the chute doesn't need charging and always works
+
+/obj/machinery/disposal/deliveryChute/New(loc,var/obj/structure/disposalconstruct/make_from)
+ ..()
+ stored.ptype = DISP_END_CHUTE
+ spawn(5)
+ trunk = locate() in loc
+ if(trunk)
+ trunk.linked = src // link the pipe trunk to self
+
+/obj/machinery/disposal/deliveryChute/Bumped(atom/movable/AM) //Go straight into the chute
+ if(!AM.disposalEnterTry())
+ return
+ switch(dir)
+ if(NORTH)
+ if(AM.loc.y != loc.y+1) return
+ if(EAST)
+ if(AM.loc.x != loc.x+1) return
+ if(SOUTH)
+ if(AM.loc.y != loc.y-1) return
+ if(WEST)
+ if(AM.loc.x != loc.x-1) return
+
+ if(istype(AM, /obj))
+ var/obj/O = AM
+ O.loc = src
+ else if(istype(AM, /mob))
+ var/mob/M = AM
+ if(prob(2)) // to prevent mobs being stuck in infinite loops
+ M << "You hit the edge of the chute."
+ return
+ M.loc = src
+ flush()
+
+/atom/movable/proc/disposalEnterTry()
+ return 1
+
+/obj/item/projectile/disposalEnterTry()
+ return
+
+/obj/effect/disposalEnterTry()
+ return
+
+/obj/mecha/disposalEnterTry()
+ return
+
+/obj/machinery/disposal/deliveryChute/newHolderDestination(obj/structure/disposalholder/H)
+ H.destinationTag = 1
+
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index fc8b12cbe5b..df47b62e337 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -230,99 +230,6 @@
currTag = n
openwindow(usr)
-/obj/machinery/disposal/deliveryChute
- name = "delivery chute"
- desc = "A chute for big and small packages alike!"
- density = 1
- icon_state = "intake"
- var/c_mode = 0
-
-/obj/machinery/disposal/deliveryChute/New(loc,var/obj/structure/disposalconstruct/make_from)
- ..()
- stored.ptype = DISP_END_CHUTE
- spawn(5)
- trunk = locate() in loc
- if(trunk)
- trunk.linked = src // link the pipe trunk to self
-
-/obj/machinery/disposal/deliveryChute/Destroy()
- if(trunk)
- trunk.linked = null
- ..()
-
-/obj/machinery/disposal/deliveryChute/interact()
- return
-
-/obj/machinery/disposal/deliveryChute/update()
- return
-
-/obj/machinery/disposal/deliveryChute/Bumped(atom/movable/AM) //Go straight into the chute
- if(!AM.disposalEnterTry())
- return
- switch(dir)
- if(NORTH)
- if(AM.loc.y != loc.y+1) return
- if(EAST)
- if(AM.loc.x != loc.x+1) return
- if(SOUTH)
- if(AM.loc.y != loc.y-1) return
- if(WEST)
- if(AM.loc.x != loc.x-1) return
-
- if(istype(AM, /obj))
- var/obj/O = AM
- O.loc = src
- else if(istype(AM, /mob))
- var/mob/M = AM
- M.loc = src
- flush()
-
-/atom/movable/proc/disposalEnterTry()
- return 1
-
-/obj/item/projectile/disposalEnterTry()
- return
-
-/obj/mecha/disposalEnterTry()
- return
-
-/obj/machinery/disposal/deliveryChute/flushAnimation()
- flick("intake-closing", src)
-
-/obj/machinery/disposal/deliveryChute/newHolderDestination(obj/structure/disposalholder/H)
- H.destinationTag = 1
-
-/obj/machinery/disposal/deliveryChute/attackby(obj/item/I, mob/user, params)
- if(!I || !user)
- return
-
- if(istype(I, /obj/item/weapon/screwdriver))
- if(c_mode==0)
- c_mode=1
- playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You remove the screws around the power connection."
- return
- else if(c_mode==1)
- c_mode=0
- playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You attach the screws around the power connection."
- return
- else if(istype(I,/obj/item/weapon/weldingtool) && c_mode==1)
- var/obj/item/weapon/weldingtool/W = I
-
- if(W.remove_fuel(0,user))
- playsound(loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "You start slicing the floorweld off the delivery chute..."
- if(do_after(user,20, target = src))
- if(!src || !W.isOn()) return
- Deconstruct()
- user << "You slice the floorweld off the delivery chute."
- return
- else
- return
-
-/obj/machinery/disposal/deliveryChute/process()
- return PROCESS_KILL
/obj/item/weapon/c_tube
name = "cardboard tube"
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 8c0cfe30ea1..75202c87387 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -12,6 +12,16 @@
build_path = /obj/item/weapon/circuitboard/smes
category = list ("Engineering Machinery")
+/datum/design/announcement_system
+ name = "Machine Design (Automated Announcement System Board)"
+ desc = "The circuit board for an automated announcement system."
+ id = "automated_announcement"
+ req_tech = list("programming" = 3, "bluespace" = 2)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/announcement_system
+ category = list("Subspace Telecomms")
+
/datum/design/turbine_computer
name = "Computer Design (Power Turbine Console Board)"
desc = "The circuit board for a power turbine console."
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index e5c5a93dfb2..e57a3762319 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -512,7 +512,7 @@
trackedIan.loc = src.loc
investigate_log("Experimentor has stolen Ian!", "experimentor") //...if anyone ever fixes it...
else
- new /mob/living/simple_animal/pet/corgi(src.loc)
+ new /mob/living/simple_animal/pet/dog/corgi(src.loc)
investigate_log("Experimentor has spawned a new corgi.", "experimentor")
ejectItem(TRUE)
if(globalMalf > 36 && globalMalf < 50)
@@ -658,7 +658,7 @@
/obj/item/weapon/relic/proc/corgicannon(mob/user)
playsound(src.loc, "sparks", rand(25,50), 1)
- var/mob/living/simple_animal/pet/dog/corgi/C = new/mob/living/simple_animal/pet/corgi(get_turf(user))
+ var/mob/living/simple_animal/pet/dog/corgi/C = new/mob/living/simple_animal/pet/dog/corgi(get_turf(user))
C.throw_at(pick(oview(10,user)),10,rand(3,8))
throwSmoke(get_turf(C))
warn_admins(user, "Corgi Cannon", 0)
@@ -681,7 +681,7 @@
user << message
var/animals = rand(1,25)
var/counter
- var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp)
+ var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/dog/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp)
for(counter = 1; counter < animals; counter++)
var/mobType = pick(valid_animals)
new mobType(get_turf(src))
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 07ab76f7b5d..0e998a0cb1b 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -165,18 +165,16 @@ Note: Must be placed west/left of and R&D console to function.
var/obj/item/stack/sheet/stack = O
var/amount = round(input("How many sheets do you want to add?") as num)//No decimals
- if(!stack || stack.amount <= 0 || amount <= 0)
+ if(!stack || stack.amount <= 0 || amount <= 0 || !in_range(src, stack) || !user.Adjacent(src))
return
if(amount > stack.amount)
amount = stack.amount
if(max_material_storage - TotalMaterials() < (amount*stack.perunit))//Can't overfill
amount = min(stack.amount, round((max_material_storage-TotalMaterials())/stack.perunit))
- icon_state = "protolathe"
busy = 1
use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount/10)))
user << "You add [amount] sheets to the [src.name]."
- icon_state = "protolathe"
if(istype(stack, /obj/item/stack/sheet/metal))
m_amount += amount * MINERAL_MATERIAL_AMOUNT
else if(istype(stack, /obj/item/stack/sheet/glass))
@@ -196,11 +194,10 @@ Note: Must be placed west/left of and R&D console to function.
else if(istype(stack, /obj/item/stack/sheet/mineral/adamantine))
adamantine_amount += amount * MINERAL_MATERIAL_AMOUNT
stack.use(amount)
- busy = 0
- src.updateUsrDialog()
+ updateUsrDialog()
- src.overlays += "protolathe_[stack.name]"
+ overlays += "protolathe_[stack.name]"
sleep(10)
- src.overlays -= "protolathe_[stack.name]"
+ overlays -= "protolathe_[stack.name]"
+ busy = 0
- return
diff --git a/code/modules/surgery/organs/cybernetic_implants.dm b/code/modules/surgery/organs/cybernetic_implants.dm
index 61a58711ac8..273543bbae1 100644
--- a/code/modules/surgery/organs/cybernetic_implants.dm
+++ b/code/modules/surgery/organs/cybernetic_implants.dm
@@ -383,8 +383,7 @@
desc = "A sleek, sturdy box."
icon_state = "cyber_implants"
var/list/boxed = list(/obj/item/cybernetic_implant/eyes/xray,/obj/item/cybernetic_implant/eyes/thermals,
- /obj/item/cybernetic_implant/brain/anti_drop, /obj/item/cybernetic_implant/brain/anti_stun,
- /obj/item/cybernetic_implant/chest/nutriment/plus, /obj/item/cybernetic_implant/chest/reviver)
+ /obj/item/cybernetic_implant/brain/anti_stun, /obj/item/cybernetic_implant/chest/reviver)
var/amount = 5
/obj/item/weapon/storage/box/cyber_implants/New()
diff --git a/config/access levels.txt b/config/access levels.txt
index 69ed681aa62..01977cbff33 100644
--- a/config/access levels.txt
+++ b/config/access levels.txt
@@ -1,50 +1,50 @@
-HOW TO CONVERT A MAP TO THE NEW (june 2008) ACCESS LEVEL SYSTEM
-1. Open the .dmp file up in Notepad
-2. Find all the "access = blahblah" attributes of doors.
-3. Delete them.
-4. Open the map up in Dream Maker. If you didn't get them all, it'll tell you so.
-5. Assign the existing doors new access permissions using the method below.
-
-HOW TO MAKE A MAP USING THE NEW (june 2008) ACCESS LEVEL SYSTEM
-1. Make a map as normal
-2. Select a door that you want to not be accessible to everybody
-3. Right click on it and edit its attributes
-4. Make the "req_access_txt" attribute be a semicolon-separated list of the permissions required to open the doors
-5. Repeat for all doors.
-
-For example, a brig door would have it be "2" while a door that requires you have toxins and teleporter access (for whatever reason) would have it be "9;20"
-
-Here is a list of the permissions and their numbers (this may be out of date, see code/game/access.dm for an updated version):
-
- access_security = 1
- access_brig = 2
- access_security_lockers = 3
- access_forensics_lockers= 4
- access_security_records = 5
- access_medical_supplies = 6
- access_medical_records = 7
- access_morgue = 8
- access_tox = 9
- access_tox_storage = 10
- access_medlab = 11
- access_engine = 12
- access_eject_engine = 13
- access_maint_tunnels = 14
- access_external_airlocks = 15
- access_emergency_storage = 16
- access_apcs = 17
- access_change_ids = 18
- access_ai_upload = 19
- access_teleporter = 20
- access_eva = 21
- access_heads = 22
- access_captain = 23
- access_all_personal_lockers = 24
- access_chapel_office = 25
- access_tech_storage = 26
- access_atmospherics = 27
- access_bar = 28
- access_janitor = 29
- access_disposal_units = 30
- access_hydroponics = 35
+HOW TO CONVERT A MAP TO THE NEW (june 2008) ACCESS LEVEL SYSTEM
+1. Open the .dmp file up in Notepad
+2. Find all the "access = blahblah" attributes of doors.
+3. Delete them.
+4. Open the map up in Dream Maker. If you didn't get them all, it'll tell you so.
+5. Assign the existing doors new access permissions using the method below.
+
+HOW TO MAKE A MAP USING THE NEW (june 2008) ACCESS LEVEL SYSTEM
+1. Make a map as normal
+2. Select a door that you want to not be accessible to everybody
+3. Right click on it and edit its attributes
+4. Make the "req_access_txt" attribute be a semicolon-separated list of the permissions required to open the doors
+5. Repeat for all doors.
+
+For example, a brig door would have it be "2" while a door that requires you have toxins and teleporter access (for whatever reason) would have it be "9;20"
+
+Here is a list of the permissions and their numbers (this may be out of date, see code/game/access.dm for an updated version):
+
+ access_security = 1
+ access_brig = 2
+ access_security_lockers = 3
+ access_forensics_lockers= 4
+ access_security_records = 5
+ access_medical_supplies = 6
+ access_medical_records = 7
+ access_morgue = 8
+ access_tox = 9
+ access_tox_storage = 10
+ access_medlab = 11
+ access_engine = 12
+ access_eject_engine = 13
+ access_maint_tunnels = 14
+ access_external_airlocks = 15
+ access_emergency_storage = 16
+ access_apcs = 17
+ access_change_ids = 18
+ access_ai_upload = 19
+ access_teleporter = 20
+ access_eva = 21
+ access_heads = 22
+ access_captain = 23
+ access_all_personal_lockers = 24
+ access_chapel_office = 25
+ access_tech_storage = 26
+ access_atmospherics = 27
+ access_bar = 28
+ access_janitor = 29
+ access_disposal_units = 30
+ access_hydroponics = 35
access_manufacturing = 36
\ No newline at end of file
diff --git a/config/admin_ranks.txt b/config/admin_ranks.txt
index 67c08182b01..7bcb2df9995 100644
--- a/config/admin_ranks.txt
+++ b/config/admin_ranks.txt
@@ -1,40 +1,40 @@
-##############################################################################################################
-# ADMIN RANK DEFINES #
-# The format of this is very simple. Rank name goes first. #
-# Rank is CASE-SENSITIVE, all punctuation save for '-', '_' and '@' will be stripped so spaces don't matter. #
-# You can then define permissions for each rank by adding a '=' followed by keywords #
-# These keywords represent groups of verbs and abilities. #
-# keywords are preceded by either a '+' or a '-', + adds permissions, - takes them away. #
-# +@ (or +prev) is a special shorthand which adds all the rights of the rank above it. #
-# You can also specify verbs like so +/client/proc/some_added_verb or -/client/proc/some_restricted_verb #
-# Ranks with no keywords will just be given the most basic verbs and abilities ~Carn #
-##############################################################################################################
-# PLEASE NOTE: depending on config options, some abilities will be unavailable regardless if you have permission to use them!
-
-# KEYWORDS:
-# +ADMIN = general admin tools, verbs etc
-# +FUN = events, other event-orientated actions. Access to the fun secrets in the secrets panel.
-# +BAN = the ability to ban, jobban and fullban
-# +STEALTH = the ability to stealthmin (make yourself appear with a fake name to everyone but other admins
-# +POSSESS = the ability to possess objects
-# +REJUV (or +REJUVINATE) = the ability to heal, respawn, modify damage and use godmode
-# +BUILD (or +BUILDMODE) = the ability to use buildmode
-# +SERVER = higher-risk admin verbs and abilities, such as those which affect the server configuration.
-# +DEBUG = debug tools used for diagnosing and fixing problems. It's useful to give this to coders so they can investigate problems on a live server.
-# +VAREDIT = everyone may view viewvars/debugvars/whatever you call it. This keyword allows you to actually EDIT those variables.
-# +RIGHTS (or +PERMISSIONS) = allows you to promote and/or demote people.
-# +SOUND (or +SOUNDS) = allows you to upload and play sounds
-# +SPAWN (or +CREATE) = mob transformations, spawning of most atoms including mobs (high-risk atoms, e.g. blackholes, will require the +FUN flag too)
-# +EVERYTHING (or +HOST or +ALL) = Simply gives you everything without having to type every flag
-
-Admin Observer
-Moderator = +ADMIN
-Admin Candidate = +@
-Trial Admin = +@ +SPAWN +REJUV +VAREDIT +BAN
-Badmin = +@ +POSSESS +BUILDMODE +SERVER +FUN
-Game Admin = +@ +STEALTH +SOUNDS +DEBUG
-Game Master = +EVERYTHING
-
-Host = +EVERYTHING
-
+##############################################################################################################
+# ADMIN RANK DEFINES #
+# The format of this is very simple. Rank name goes first. #
+# Rank is CASE-SENSITIVE, all punctuation save for '-', '_' and '@' will be stripped so spaces don't matter. #
+# You can then define permissions for each rank by adding a '=' followed by keywords #
+# These keywords represent groups of verbs and abilities. #
+# keywords are preceded by either a '+' or a '-', + adds permissions, - takes them away. #
+# +@ (or +prev) is a special shorthand which adds all the rights of the rank above it. #
+# You can also specify verbs like so +/client/proc/some_added_verb or -/client/proc/some_restricted_verb #
+# Ranks with no keywords will just be given the most basic verbs and abilities ~Carn #
+##############################################################################################################
+# PLEASE NOTE: depending on config options, some abilities will be unavailable regardless if you have permission to use them!
+
+# KEYWORDS:
+# +ADMIN = general admin tools, verbs etc
+# +FUN = events, other event-orientated actions. Access to the fun secrets in the secrets panel.
+# +BAN = the ability to ban, jobban and fullban
+# +STEALTH = the ability to stealthmin (make yourself appear with a fake name to everyone but other admins
+# +POSSESS = the ability to possess objects
+# +REJUV (or +REJUVINATE) = the ability to heal, respawn, modify damage and use godmode
+# +BUILD (or +BUILDMODE) = the ability to use buildmode
+# +SERVER = higher-risk admin verbs and abilities, such as those which affect the server configuration.
+# +DEBUG = debug tools used for diagnosing and fixing problems. It's useful to give this to coders so they can investigate problems on a live server.
+# +VAREDIT = everyone may view viewvars/debugvars/whatever you call it. This keyword allows you to actually EDIT those variables.
+# +RIGHTS (or +PERMISSIONS) = allows you to promote and/or demote people.
+# +SOUND (or +SOUNDS) = allows you to upload and play sounds
+# +SPAWN (or +CREATE) = mob transformations, spawning of most atoms including mobs (high-risk atoms, e.g. blackholes, will require the +FUN flag too)
+# +EVERYTHING (or +HOST or +ALL) = Simply gives you everything without having to type every flag
+
+Admin Observer
+Moderator = +ADMIN
+Admin Candidate = +@
+Trial Admin = +@ +SPAWN +REJUV +VAREDIT +BAN
+Badmin = +@ +POSSESS +BUILDMODE +SERVER +FUN
+Game Admin = +@ +STEALTH +SOUNDS +DEBUG
+Game Master = +EVERYTHING
+
+Host = +EVERYTHING
+
Coder = +DEBUG +VAREDIT +SERVER +SPAWN
\ No newline at end of file
diff --git a/config/admins.txt b/config/admins.txt
index 4622411760a..f708dcc3df4 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -90,4 +90,5 @@ shadowlight213 = Game Master
drovidicorv = Game Master
Dunc = Game Master
MMMiracles = Game Master
-bear1ake = Game Master
\ No newline at end of file
+bear1ake = Game Master
+CoreOverload = Game Master
\ No newline at end of file
diff --git a/config/config.txt b/config/config.txt
index f7ec7eda026..c40c7cc783f 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -1,196 +1,196 @@
-## Server name: This appears at the top of the screen in-game. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice
-# SERVERNAME tgstation
-
-## Station name: The name of the station as it is referred to in-game. If commented out, the game will generate a random name instead.
-STATIONNAME Space Station 13
-
-# Lobby time: This is the amount of time between rounds that players have to setup their characters and be ready.
-LOBBY_COUNTDOWN 120
-
-## Add a # infront of this if you want to use the SQL based admin system, the legacy system uses admins.txt. You need to set up your database to use the SQL based system.
-ADMIN_LEGACY_SYSTEM
-
-## Add a # infront of this if you want to use the SQL based banning system. The legacy systems use the files in the data folder. You need to set up your database to use the SQL based system.
-BAN_LEGACY_SYSTEM
-
-## Unhash this entry to have certain jobs require your account to be at least a certain number of days old to select. You can configure the exact age requirement for different jobs by editing
-## the minimal_player_age variable in the files in folder /code/game/jobs/job/.. for the job you want to edit. Set minimal_player_age to 0 to disable age requirement for that job.
-## REQUIRES the database set up to work. Keep it hashed if you don't have a database set up.
-## NOTE: If you have just set-up the database keep this DISABLED, as player age is determined from the first time they connect to the server with the database up. If you just set it up, it means
-## you have noone older than 0 days, since noone has been logged yet. Only turn this on once you have had the database up for 30 days.
-#USE_AGE_RESTRICTION_FOR_JOBS
-
-## log OOC channel
-LOG_OOC
-
-## log client Say
-LOG_SAY
-
-## log admin actions
-LOG_ADMIN
-
-## log client access (logon/logoff)
-LOG_ACCESS
-
-## log game actions (start of round, results, etc.)
-LOG_GAME
-
-## log player votes
-LOG_VOTE
-
-## log client Whisper
-LOG_WHISPER
-
-## log emotes
-LOG_EMOTE
-
-## log attack messages
-LOG_ATTACK
-
-## log pda messages
-LOG_PDA
-
-## log prayers
-LOG_PRAYER
-
-## log lawchanges
-LOG_LAW
-
-## log all Topic() calls (for use by coders in tracking down Topic issues)
-# LOG_HREFS
-
-## disconnect players who did nothing during 10 minutes
-# KICK_INACTIVE
-
-## Comment this out to stop admins being able to choose their personal ooccolor
-ALLOW_ADMIN_OOCCOLOR
-
-## If metadata is supported
-ALLOW_METADATA
-
-## allow players to initiate a restart vote
-#ALLOW_VOTE_RESTART
-
-## allow players to initate a mode-change start
-#ALLOW_VOTE_MODE
-
-## min delay (deciseconds) between voting sessions (default 10 minutes)
-VOTE_DELAY 6000
-
-## time period (deciseconds) which voting session will last (default 1 minute)
-VOTE_PERIOD 600
-
-## prevents dead players from voting or starting votes
-# NO_DEAD_VOTE
-
-## players' votes default to "No vote" (otherwise, default to "No change")
-# DEFAULT_NO_VOTE
-
-## disable abandon mob
-NORESPAWN
-
-## disables calling del(src) on newmobs if they logout before spawnin in
-# DONT_DEL_NEWMOB
-
-## set a hosted by name for unix platforms
-HOSTEDBY Yournamehere
-
-## Set to jobban "Guest-" accounts from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions.
-## Set to 1 to jobban them from those positions, set to 0 to allow them.
-# GUEST_JOBBAN
-
-## Uncomment this to stop people connecting to your server without a registered ckey. (i.e. guest-* are all blocked from connecting)
-GUEST_BAN
-
-## Set to jobban everyone who's key is not listed in data/whitelist.txt from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions.
-## Uncomment to 1 to jobban, leave commented out to allow these positions for everyone (but see GUEST_JOBBAN above and regular jobbans)
-# USEWHITELIST
-
-## set a server location for world reboot. Don't include the byond://, just give the address and port.
-# Don't set this to the same server, BYOND will automatically restart players to the server when it has restarted.
-# SERVER ss13.example.com:2506
-
-## forum address
-# FORUMURL http://tgstation13.org/phpBB/index.php
-
-## Wiki address
-# WIKIURL http://www.tgstation13.org/wiki
-
-##Rules address
-# RULESURL http://www.tgstation13.org/wiki/Rules
-
-##Github address
-# GITHUBURL https://www.github.com/tgstation/-tg-station
-
-## Ban appeals URL - usually for a forum or wherever people should go to contact your admins.
-# BANAPPEALS http://justanotherday.example.com
-
-## In-game features
-##Toggle for having jobs load up from the .txt
-# LOAD_JOBS_FROM_TXT
-
-##Remove the # mark infront of this to forbid admins from possessing the singularity.
-#FORBID_SINGULO_POSSESSION
-
-## Remove the # to show a popup 'reply to' window to every non-admin that recieves an adminPM.
-## The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off)
-#POPUP_ADMIN_PM
-
-## Remove the # to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR
-ALLOW_HOLIDAYS
-
-##Remove the # mark if you are going to use the SVN irc bot to relay adminhelps
-#USEIRCBOT
-
-##Defines the ticklag for the world. 0.9 is the normal one, 0.5 is smoother.
-TICKLAG 0.9
-
-## Defines if Tick Compensation is used. It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks. Recommended if tickrate is lowered.
-TICKCOMP 0
-
-## Comment this out to disable automuting
-#AUTOMUTE_ON
-
-## Communication key for receiving data through world/Topic(), you don't want to give this out
-#COMMS_KEY default_pwd
-
-## Uncomment this to let players see their own notes (they can still be set by admins only)
-#SEE_OWN_NOTES
-
-##Note: all population caps can be used with each other if desired.
-
-## Uncomment for 'soft' population caps, players will be warned while joining if the living crew exceeds the listed number.
-#SOFT_POPCAP 100
-
-## Message for soft cap
-SOFT_POPCAP_MESSAGE Be warned that the server is currently serving a high number of users, consider using alternative game servers.
-
-## Uncomment for 'hard' population caps, players will not be allowed to spawn if the living crew exceeds the listed number, though they may still observe or wait for the living crew to decrease in size.
-#HARD_POPCAP 150
-
-## Message for hard cap
-HARD_POPCAP_MESSAGE The server is currently serving a high number of users, You cannot currently join. You may wait for the number of living crew to decline, observe, or find alternative servers.
-
-## Uncomment for 'extreme' population caps, players will not be allowed to join the server if living crew exceeds the listed number.
-#EXTREME_POPCAP 200
-
-## Message for extreme cap
-EXTREME_POPCAP_MESSAGE The server is currently serving a high number of users, find alternative servers.
-
-## Notify admins when a new player connects for the first x days a player's been around. (0 for first connection only, -1 for never)
-## Requres database
-NOTIFY_NEW_PLAYER_AGE 0
-
-## Notify the irc channel when a new player makes their first connection
-## Requres database
-#IRC_FIRST_CONNECTION_ALERT
-
-## Deny all new connections by ckeys we haven't seen before (exempts admins and only denies the connection if the database is enabled and connected)
-## Requires database
-#PANIC_BUNKER
-
-## Uncomment to have the changelog file automatically open when a user connects and hasn't seen the latest changelog
-#AGGRESSIVE_CHANGELOG
-
-## Uncomment to have the game log runtimes to the log folder. (Note: this disables normal output in dd/ds, so it should be left off for testing.
+## Server name: This appears at the top of the screen in-game. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice
+# SERVERNAME tgstation
+
+## Station name: The name of the station as it is referred to in-game. If commented out, the game will generate a random name instead.
+STATIONNAME Space Station 13
+
+# Lobby time: This is the amount of time between rounds that players have to setup their characters and be ready.
+LOBBY_COUNTDOWN 120
+
+## Add a # infront of this if you want to use the SQL based admin system, the legacy system uses admins.txt. You need to set up your database to use the SQL based system.
+ADMIN_LEGACY_SYSTEM
+
+## Add a # infront of this if you want to use the SQL based banning system. The legacy systems use the files in the data folder. You need to set up your database to use the SQL based system.
+BAN_LEGACY_SYSTEM
+
+## Unhash this entry to have certain jobs require your account to be at least a certain number of days old to select. You can configure the exact age requirement for different jobs by editing
+## the minimal_player_age variable in the files in folder /code/game/jobs/job/.. for the job you want to edit. Set minimal_player_age to 0 to disable age requirement for that job.
+## REQUIRES the database set up to work. Keep it hashed if you don't have a database set up.
+## NOTE: If you have just set-up the database keep this DISABLED, as player age is determined from the first time they connect to the server with the database up. If you just set it up, it means
+## you have noone older than 0 days, since noone has been logged yet. Only turn this on once you have had the database up for 30 days.
+#USE_AGE_RESTRICTION_FOR_JOBS
+
+## log OOC channel
+LOG_OOC
+
+## log client Say
+LOG_SAY
+
+## log admin actions
+LOG_ADMIN
+
+## log client access (logon/logoff)
+LOG_ACCESS
+
+## log game actions (start of round, results, etc.)
+LOG_GAME
+
+## log player votes
+LOG_VOTE
+
+## log client Whisper
+LOG_WHISPER
+
+## log emotes
+LOG_EMOTE
+
+## log attack messages
+LOG_ATTACK
+
+## log pda messages
+LOG_PDA
+
+## log prayers
+LOG_PRAYER
+
+## log lawchanges
+LOG_LAW
+
+## log all Topic() calls (for use by coders in tracking down Topic issues)
+# LOG_HREFS
+
+## disconnect players who did nothing during 10 minutes
+# KICK_INACTIVE
+
+## Comment this out to stop admins being able to choose their personal ooccolor
+ALLOW_ADMIN_OOCCOLOR
+
+## If metadata is supported
+ALLOW_METADATA
+
+## allow players to initiate a restart vote
+#ALLOW_VOTE_RESTART
+
+## allow players to initate a mode-change start
+#ALLOW_VOTE_MODE
+
+## min delay (deciseconds) between voting sessions (default 10 minutes)
+VOTE_DELAY 6000
+
+## time period (deciseconds) which voting session will last (default 1 minute)
+VOTE_PERIOD 600
+
+## prevents dead players from voting or starting votes
+# NO_DEAD_VOTE
+
+## players' votes default to "No vote" (otherwise, default to "No change")
+# DEFAULT_NO_VOTE
+
+## disable abandon mob
+NORESPAWN
+
+## disables calling del(src) on newmobs if they logout before spawnin in
+# DONT_DEL_NEWMOB
+
+## set a hosted by name for unix platforms
+HOSTEDBY Yournamehere
+
+## Set to jobban "Guest-" accounts from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions.
+## Set to 1 to jobban them from those positions, set to 0 to allow them.
+# GUEST_JOBBAN
+
+## Uncomment this to stop people connecting to your server without a registered ckey. (i.e. guest-* are all blocked from connecting)
+GUEST_BAN
+
+## Set to jobban everyone who's key is not listed in data/whitelist.txt from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions.
+## Uncomment to 1 to jobban, leave commented out to allow these positions for everyone (but see GUEST_JOBBAN above and regular jobbans)
+# USEWHITELIST
+
+## set a server location for world reboot. Don't include the byond://, just give the address and port.
+# Don't set this to the same server, BYOND will automatically restart players to the server when it has restarted.
+# SERVER ss13.example.com:2506
+
+## forum address
+# FORUMURL http://tgstation13.org/phpBB/index.php
+
+## Wiki address
+# WIKIURL http://www.tgstation13.org/wiki
+
+##Rules address
+# RULESURL http://www.tgstation13.org/wiki/Rules
+
+##Github address
+# GITHUBURL https://www.github.com/tgstation/-tg-station
+
+## Ban appeals URL - usually for a forum or wherever people should go to contact your admins.
+# BANAPPEALS http://justanotherday.example.com
+
+## In-game features
+##Toggle for having jobs load up from the .txt
+# LOAD_JOBS_FROM_TXT
+
+##Remove the # mark infront of this to forbid admins from possessing the singularity.
+#FORBID_SINGULO_POSSESSION
+
+## Remove the # to show a popup 'reply to' window to every non-admin that recieves an adminPM.
+## The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off)
+#POPUP_ADMIN_PM
+
+## Remove the # to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR
+ALLOW_HOLIDAYS
+
+##Remove the # mark if you are going to use the SVN irc bot to relay adminhelps
+#USEIRCBOT
+
+##Defines the ticklag for the world. 0.9 is the normal one, 0.5 is smoother.
+TICKLAG 0.9
+
+## Defines if Tick Compensation is used. It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks. Recommended if tickrate is lowered.
+TICKCOMP 0
+
+## Comment this out to disable automuting
+#AUTOMUTE_ON
+
+## Communication key for receiving data through world/Topic(), you don't want to give this out
+#COMMS_KEY default_pwd
+
+## Uncomment this to let players see their own notes (they can still be set by admins only)
+#SEE_OWN_NOTES
+
+##Note: all population caps can be used with each other if desired.
+
+## Uncomment for 'soft' population caps, players will be warned while joining if the living crew exceeds the listed number.
+#SOFT_POPCAP 100
+
+## Message for soft cap
+SOFT_POPCAP_MESSAGE Be warned that the server is currently serving a high number of users, consider using alternative game servers.
+
+## Uncomment for 'hard' population caps, players will not be allowed to spawn if the living crew exceeds the listed number, though they may still observe or wait for the living crew to decrease in size.
+#HARD_POPCAP 150
+
+## Message for hard cap
+HARD_POPCAP_MESSAGE The server is currently serving a high number of users, You cannot currently join. You may wait for the number of living crew to decline, observe, or find alternative servers.
+
+## Uncomment for 'extreme' population caps, players will not be allowed to join the server if living crew exceeds the listed number.
+#EXTREME_POPCAP 200
+
+## Message for extreme cap
+EXTREME_POPCAP_MESSAGE The server is currently serving a high number of users, find alternative servers.
+
+## Notify admins when a new player connects for the first x days a player's been around. (0 for first connection only, -1 for never)
+## Requres database
+NOTIFY_NEW_PLAYER_AGE 0
+
+## Notify the irc channel when a new player makes their first connection
+## Requres database
+#IRC_FIRST_CONNECTION_ALERT
+
+## Deny all new connections by ckeys we haven't seen before (exempts admins and only denies the connection if the database is enabled and connected)
+## Requires database
+#PANIC_BUNKER
+
+## Uncomment to have the changelog file automatically open when a user connects and hasn't seen the latest changelog
+#AGGRESSIVE_CHANGELOG
+
+## Uncomment to have the game log runtimes to the log folder. (Note: this disables normal output in dd/ds, so it should be left off for testing.
#LOG_RUNTIMES
\ No newline at end of file
diff --git a/config/dbconfig.txt b/config/dbconfig.txt
index dbc09df51df..cc28dc483de 100644
--- a/config/dbconfig.txt
+++ b/config/dbconfig.txt
@@ -1,33 +1,33 @@
-## MySQL Connection Configuration
-## This is used for stats, feedback gathering,
-## administration, and the in game library.
-
-## Should SQL be enabled? Uncomment to enable.
-#SQL_ENABLED
-
-## Server the MySQL database can be found at.
-# Examples: localhost, 200.135.5.43, www.mysqldb.com, etc.
-ADDRESS localhost
-
-## MySQL server port (default is 3306).
-PORT 3306
-
-## Database for all SQL functions, not just feedback.
-FEEDBACK_DATABASE feedback
-
-## Prefix to be added to the name of every table, older databases will require this be set to erro_
-## if left out defaults to erro_ for legacy reasons, if you want no table prefix, give a blank prefix rather then comment out
-## Note, this does not change the table names in the database, you will have to do that yourself.
-##IE:
-## FEEDBACK_TABLEPREFIX erro_
-## FEEDBACK_TABLEPREFIX
-## FEEDBACK_TABLEPREFIX SS13_
-##
-## Leave as is if you are using the standard schema file.
-FEEDBACK_TABLEPREFIX
-
-## Username/Login used to access the database.
-FEEDBACK_LOGIN username
-
-## Password used to access the database.
+## MySQL Connection Configuration
+## This is used for stats, feedback gathering,
+## administration, and the in game library.
+
+## Should SQL be enabled? Uncomment to enable.
+#SQL_ENABLED
+
+## Server the MySQL database can be found at.
+# Examples: localhost, 200.135.5.43, www.mysqldb.com, etc.
+ADDRESS localhost
+
+## MySQL server port (default is 3306).
+PORT 3306
+
+## Database for all SQL functions, not just feedback.
+FEEDBACK_DATABASE feedback
+
+## Prefix to be added to the name of every table, older databases will require this be set to erro_
+## if left out defaults to erro_ for legacy reasons, if you want no table prefix, give a blank prefix rather then comment out
+## Note, this does not change the table names in the database, you will have to do that yourself.
+##IE:
+## FEEDBACK_TABLEPREFIX erro_
+## FEEDBACK_TABLEPREFIX
+## FEEDBACK_TABLEPREFIX SS13_
+##
+## Leave as is if you are using the standard schema file.
+FEEDBACK_TABLEPREFIX
+
+## Username/Login used to access the database.
+FEEDBACK_LOGIN username
+
+## Password used to access the database.
FEEDBACK_PASSWORD password
\ No newline at end of file
diff --git a/config/game_options.txt b/config/game_options.txt
index aa4f48f5dd3..54472c969bf 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -1,300 +1,300 @@
-### HEALTH ###
-
-# level of health at which a mob becomes unconscious (crit)
-HEALTH_THRESHOLD_CRIT 0
-
-# level of health at which a mob becomes dead
-HEALTH_THRESHOLD_DEAD -100
-
-
-### REVIVAL ###
-
-# whether pod plants work or not
-REVIVAL_POD_PLANTS 1
-
-# whether cloning tubes work or not
-REVIVAL_CLONING 1
-
-# amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite)
-REVIVAL_BRAIN_LIFE -1
-
-### RENAMING ###
-
-#Uncomment to allow cyborgs to rename themselves at roundstart. Has no effect on roboticists renaming cyborgs the normal way.
-#RENAME_CYBORG
-
-### OOC DURING ROUND ###
-#Comment this out if you want OOC to be automatically disabled during the round, it will be enabled during the lobby and after the round end results.
-OOC_DURING_ROUND
-
-### EMOJI ###
-#Comment this out if you want to disable emojis
-EMOJIS
-
-### MOB MOVEMENT ###
-
-## We suggest editing these variables ingame to find a good speed for your server.
-## To do this you must be a high level admin. Open the 'debug' tab ingame.
-## Select "Debug Controller" and then, in the popup, select "Configuration". These variables should have the same name.
-
-## These values get directly added to values and totals ingame.
-## To speed things up make the number negative, to slow things down, make the number positive.
-
-## These modify the run/walk speed of all mobs before the mob-specific modifiers are applied.
-RUN_DELAY 1
-WALK_DELAY 4
-
-## The variables below affect the movement of specific mob types.
-HUMAN_DELAY 0
-ROBOT_DELAY 0
-MONKEY_DELAY 0
-ALIEN_DELAY 0
-SLIME_DELAY 0
-ANIMAL_DELAY 0
-
-
-### NAMES ###
-## If uncommented this adds a random surname to a player's name if they only specify one name.
-#HUMANS_NEED_SURNAMES
-
-## If uncommented, this forces all players to use random names !and appearances!.
-#FORCE_RANDOM_NAMES
-
-
-### ALERT LEVELS ###
-ALERT_GREEN All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced.
-ALERT_BLUE_UPTO The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted.
-ALERT_BLUE_DOWNTO The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed.
-ALERT_RED_UPTO There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised.
-ALERT_RED_DOWNTO The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised.
-ALERT_DELTA Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill.
-
-
-
-### GAME MODES ###
-
-## Probablities for game modes chosen in 'secret' and 'random' modes.
-## Default probablity is 1, increase to make that mode more likely to be picked.
-## Set to 0 to disable that mode.
-
-PROBABILITY TRAITOR 5
-PROBABILITY TRAITORCHAN 4
-PROBABILITY DOUBLE_AGENTS 3
-PROBABILITY NUCLEAR 2
-PROBABILITY REVOLUTION 2
-PROBABILITY SHADOWLING 2
-PROBABILITY GANG 2
-PROBABILITY CULT 2
-PROBABILITY CHANGELING 2
-PROBABILITY WIZARD 4
-PROBABILITY MALFUNCTION 1
-PROBABILITY BLOB 2
-PROBABILITY RAGINMAGES 2
-PROBABILITY MONKEY 0
-PROBABILITY METEOR 0
-PROBABILITY EXTENDED 0
-
-## You probably want to keep sandbox off by default for secret and random.
-PROBABILITY SANDBOX 0
-
-
-## Toggles for continuous modes.
-## Modes that aren't continuous will end the instant all antagonists are dead.
-
-CONTINUOUS TRAITOR
-CONTINUOUS TRAITORCHAN
-CONTINUOUS DOUBLE_AGENTS
-#CONTINUOUS NUCLEAR
-#CONTINUOUS REVOLUTION
-#CONTINUOUS SHADOWLING
-CONTINUOUS GANG
-CONTINUOUS CULT
-CONTINUOUS CHANGELING
-CONTINUOUS WIZARD
-CONTINUOUS MALFUNCTION
-CONTINUOUS BLOB
-#CONTINUOUS RAGINMAGES
-#CONTINUOUS MONKEY
-
-##Note: do not toggle continuous off for these modes, as they have no antagonists and would thus end immediately!
-
-CONTINUOUS METEOR
-CONTINUOUS EXTENDED
-
-
-## Toggles for allowing midround antagonists (aka mulligan antagonists).
-## In modes that are continuous, if all antagonists should die then a new set of antagonists will be created.
-
-MIDROUND_ANTAG TRAITOR
-MIDROUND_ANTAG TRAITORCHAN
-MIDROUND_ANTAG DOUBLE_AGENTS
-#MIDROUND_ANTAG NUCLEAR
-#MIDROUND_ANTAG REVOLUTION
-#MIDROUND_ANTAG SHADOWLING
-#MIDROUND_ANTAG GANG
-MIDROUND_ANTAG CULT
-MIDROUND_ANTAG CHANGELING
-MIDROUND_ANTAG WIZARD
-MIDROUND_ANTAG MALFUNCTION
-MIDROUND_ANTAG BLOB
-#MIDROUND_ANTAG RAGINMAGES
-#MIDROUND_ANTAG MONKEY
-
-
-## The amount of time it takes for the emergency shuttle to be called, from round start.
-SHUTTLE_REFUEL_DELAY 12000
-
-## Variables calculate how number of antagonists will scale to population.
-## Used as (Antagonists = Population / Coeff)
-## Set to 0 to disable scaling and use default numbers instead.
-TRAITOR_SCALING_COEFF 6
-CHANGELING_SCALING_COEFF 6
-
-## Variables calculate how number of open security officer positions will scale to population.
-## Used as (Officers = Population / Coeff)
-## Set to 0 to disable scaling and use default numbers instead.
-SECURITY_SCALING_COEFF 8
-
-# The number of objectives traitors get.
-# Not including escaping/hijacking.
-TRAITOR_OBJECTIVES_AMOUNT 2
-
-## Uncomment to prohibit jobs that start with loyalty
-## implants from being most antagonists.
-#PROTECT_ROLES_FROM_ANTAGONIST
-
-## Uncomment to prohibit assistants from becoming most antagonists.
-#PROTECT_ASSISTANT_FROM_ANTAGONIST
-
-## If non-human species are barred from joining as a head of staff
-#ENFORCE_HUMAN_AUTHORITY
-
-## If late-joining players have a chance to become a traitor/changeling
-ALLOW_LATEJOIN_ANTAGONISTS
-
-## Uncomment to allow players to see the set odds of different rounds in secret/random in the get server revision screen. This will NOT tell the current roundtype.
-#SHOW_GAME_TYPE_ODDS
-
-### RANDOM EVENTS ###
-
-## Comment this to disable random events during the round.
-ALLOW_RANDOM_EVENTS
-
-
-### AI ###
-
-## Allow the AI job to be picked.
-ALLOW_AI
-
-
-
-### AWAY MISSIONS ###
-
-## How long the delay is before the Away Mission gate opens. Default is half an hour.
-## 600 is one minute.
-GATEWAY_DELAY 18000
-
-
-### ACCESS ###
-
-## If the number of players ready at round starts exceeds this threshold, JOBS_HAVE_MINIMAL_ACCESS will automatically be enabled. Otherwise, it will be disabled.
-## This is useful for accomodating both low and high population rounds on the same server.
-## Comment out or set to 0 to disable this automatic toggle.
-MINIMAL_ACCESS_THRESHOLD 20
-
-## Comment this out if you wish to use the setup where jobs have more access.
-## This is intended for servers with low populations - where there are not enough
-## players to fill all roles, so players need to do more than just one job.
-## This option is ignored if MINIMAL_ACCESS_THRESHOLD is used.
-#JOBS_HAVE_MINIMAL_ACCESS
-
-## Uncomment to give assistants maint access.
-#ASSISTANTS_HAVE_MAINT_ACCESS
-
-## Uncoment to give security maint access. Note that if you comment JOBS_HAVE_MINIMAL_ACCESS security already gets maint from that.
-#SECURITY_HAS_MAINT_ACCESS
-
-## Uncomment to give everyone maint access.
-#EVERYONE_HAS_MAINT_ACCESS
-
-## Comment this to make security officers spawn in departmental security posts
-SEC_START_BRIG
-
-
-### GHOST INTERACTION ###
-## Uncomment to let ghosts spin chairs. You may be wondering why this is a config option. Don't ask.
-#GHOST_INTERACTION
-
-### NON-VOCAL SILICONS ###
-## Uncomment to stop the AI, or cyborgs, from having vocal communication.
-#SILENT_AI
-#SILENT_BORG
-
-### SANDBOX PANEL AUTOCLOSE ###
-## The sandbox panel's item spawning dialog now stays open even after you click an option.
-## If you find that your players are abusing the sandbox panel, this option may slow them down
-## without preventing people from using it properly.
-## Only functions in sandbox game mode.
-#SANDBOX_AUTOCLOSE
-
-### ROUNDSTART SILICON LAWS ###
-## This controls what the AI's laws are at the start of the round.
-## Set to 0/commented for "off", silicons will just start with Asimov.
-## Set to 1 for "custom", silicons will start with the custom laws defined in silicon_laws.txt. (If silicon_laws.txt is empty, the AI will spawn with asimov and Custom boards will auto-delete.)
-## Set to 2 for "random", silicons will start with a random lawset picked from (at the time of writing): P.A.L.A.D.I.N., Corporate, Asimov. More can be added by changing the law datum paths in ai_laws.dm.
-DEFAULT_LAWS 1
-
-### SILICON LAW MAX AMOUNT ###
-## The maximum number of laws a silicon can have
-## Attempting to upload laws past this point will fail unless the AI is reset
-SILICON_MAX_LAW_AMOUNT 12
-
-## Uncomment to give players the choice of their species before they join the game
-#JOIN_WITH_MUTANT_RACE
-
-## Uncomment to give players the choice of joining as a human with mutant bodyparts before they join the game
-#JOIN_WITH_MUTANT_HUMANS
-
-## Assistant slot cap. Set to -1 for unlimited.
-ASSISTANT_CAP -1
-
-## Starlight for exterior walls and breaches. Uncomment for starlight!
-STARLIGHT
-
-## Uncomment to bring back old grey suit assistants instead of the now default rainbow colored assistants.
-#GREY_ASSISTANTS
-
-### Midround Antag (aka Mulligan antag) config options ###
-
-## A time, in minutes, after which the midround antag system stops attempting to run and continuous rounds end immediately upon completion.
-MIDROUND_ANTAG_TIME_CHECK 60
-
-## A ratio of living to total crew members, the lower this is, the more people will have to die in order for midround antag to be skipped
-MIDROUND_ANTAG_LIFE_CHECK 0.7
-
-###Limit Spell Choices##
-## Uncomment to disallow wizards from using certain spells that may be too chaotic/fun for your playerbase
-
-#NO_SUMMON_GUNS
-#NO_SUMMON_MAGIC
-#NO_SUMMON_EVENTS
-
-//Comment for "normal" explosions, which ignore obstacles
-//Uncomment for explosions that react to doors and walls
-REACTIONARY_EXPLOSIONS
-
-### Configure the bomb cap
-## This caps all explosions to the specified range. Used for both balance reasons and to prevent overloading the server and lagging the game out.
-## This is given as the 3rd number(light damage) in the standard (1,2,3) explosion notation. The other numbers are derived by dividing by 2 and 4.
-## eg: If you give the number 20. The bomb cap will be 5,10,20.
-## Can be any number between 4 and 128, some examples are provided below.
-
-## Default (3,7,14)
-BOMBCAP 14
-## One 'step' up (4,8,16) (recommended if you enable REACTIONARY_EXPLOSIONS above)
-#BOMBCAP 16
-## LagHell (7,14,28)
-#BOMBCAP 28
-
-
-
+### HEALTH ###
+
+# level of health at which a mob becomes unconscious (crit)
+HEALTH_THRESHOLD_CRIT 0
+
+# level of health at which a mob becomes dead
+HEALTH_THRESHOLD_DEAD -100
+
+
+### REVIVAL ###
+
+# whether pod plants work or not
+REVIVAL_POD_PLANTS 1
+
+# whether cloning tubes work or not
+REVIVAL_CLONING 1
+
+# amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite)
+REVIVAL_BRAIN_LIFE -1
+
+### RENAMING ###
+
+#Uncomment to allow cyborgs to rename themselves at roundstart. Has no effect on roboticists renaming cyborgs the normal way.
+#RENAME_CYBORG
+
+### OOC DURING ROUND ###
+#Comment this out if you want OOC to be automatically disabled during the round, it will be enabled during the lobby and after the round end results.
+OOC_DURING_ROUND
+
+### EMOJI ###
+#Comment this out if you want to disable emojis
+EMOJIS
+
+### MOB MOVEMENT ###
+
+## We suggest editing these variables ingame to find a good speed for your server.
+## To do this you must be a high level admin. Open the 'debug' tab ingame.
+## Select "Debug Controller" and then, in the popup, select "Configuration". These variables should have the same name.
+
+## These values get directly added to values and totals ingame.
+## To speed things up make the number negative, to slow things down, make the number positive.
+
+## These modify the run/walk speed of all mobs before the mob-specific modifiers are applied.
+RUN_DELAY 1
+WALK_DELAY 4
+
+## The variables below affect the movement of specific mob types.
+HUMAN_DELAY 0
+ROBOT_DELAY 0
+MONKEY_DELAY 0
+ALIEN_DELAY 0
+SLIME_DELAY 0
+ANIMAL_DELAY 0
+
+
+### NAMES ###
+## If uncommented this adds a random surname to a player's name if they only specify one name.
+#HUMANS_NEED_SURNAMES
+
+## If uncommented, this forces all players to use random names !and appearances!.
+#FORCE_RANDOM_NAMES
+
+
+### ALERT LEVELS ###
+ALERT_GREEN All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced.
+ALERT_BLUE_UPTO The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted.
+ALERT_BLUE_DOWNTO The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed.
+ALERT_RED_UPTO There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised.
+ALERT_RED_DOWNTO The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised.
+ALERT_DELTA Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill.
+
+
+
+### GAME MODES ###
+
+## Probablities for game modes chosen in 'secret' and 'random' modes.
+## Default probablity is 1, increase to make that mode more likely to be picked.
+## Set to 0 to disable that mode.
+
+PROBABILITY TRAITOR 5
+PROBABILITY TRAITORCHAN 4
+PROBABILITY DOUBLE_AGENTS 3
+PROBABILITY NUCLEAR 2
+PROBABILITY REVOLUTION 2
+PROBABILITY SHADOWLING 2
+PROBABILITY GANG 2
+PROBABILITY CULT 2
+PROBABILITY CHANGELING 2
+PROBABILITY WIZARD 4
+PROBABILITY MALFUNCTION 1
+PROBABILITY BLOB 2
+PROBABILITY RAGINMAGES 2
+PROBABILITY MONKEY 0
+PROBABILITY METEOR 0
+PROBABILITY EXTENDED 0
+
+## You probably want to keep sandbox off by default for secret and random.
+PROBABILITY SANDBOX 0
+
+
+## Toggles for continuous modes.
+## Modes that aren't continuous will end the instant all antagonists are dead.
+
+CONTINUOUS TRAITOR
+CONTINUOUS TRAITORCHAN
+CONTINUOUS DOUBLE_AGENTS
+#CONTINUOUS NUCLEAR
+#CONTINUOUS REVOLUTION
+#CONTINUOUS SHADOWLING
+CONTINUOUS GANG
+CONTINUOUS CULT
+CONTINUOUS CHANGELING
+CONTINUOUS WIZARD
+CONTINUOUS MALFUNCTION
+CONTINUOUS BLOB
+#CONTINUOUS RAGINMAGES
+#CONTINUOUS MONKEY
+
+##Note: do not toggle continuous off for these modes, as they have no antagonists and would thus end immediately!
+
+CONTINUOUS METEOR
+CONTINUOUS EXTENDED
+
+
+## Toggles for allowing midround antagonists (aka mulligan antagonists).
+## In modes that are continuous, if all antagonists should die then a new set of antagonists will be created.
+
+MIDROUND_ANTAG TRAITOR
+MIDROUND_ANTAG TRAITORCHAN
+MIDROUND_ANTAG DOUBLE_AGENTS
+#MIDROUND_ANTAG NUCLEAR
+#MIDROUND_ANTAG REVOLUTION
+#MIDROUND_ANTAG SHADOWLING
+#MIDROUND_ANTAG GANG
+MIDROUND_ANTAG CULT
+MIDROUND_ANTAG CHANGELING
+MIDROUND_ANTAG WIZARD
+MIDROUND_ANTAG MALFUNCTION
+MIDROUND_ANTAG BLOB
+#MIDROUND_ANTAG RAGINMAGES
+#MIDROUND_ANTAG MONKEY
+
+
+## The amount of time it takes for the emergency shuttle to be called, from round start.
+SHUTTLE_REFUEL_DELAY 12000
+
+## Variables calculate how number of antagonists will scale to population.
+## Used as (Antagonists = Population / Coeff)
+## Set to 0 to disable scaling and use default numbers instead.
+TRAITOR_SCALING_COEFF 6
+CHANGELING_SCALING_COEFF 6
+
+## Variables calculate how number of open security officer positions will scale to population.
+## Used as (Officers = Population / Coeff)
+## Set to 0 to disable scaling and use default numbers instead.
+SECURITY_SCALING_COEFF 8
+
+# The number of objectives traitors get.
+# Not including escaping/hijacking.
+TRAITOR_OBJECTIVES_AMOUNT 2
+
+## Uncomment to prohibit jobs that start with loyalty
+## implants from being most antagonists.
+#PROTECT_ROLES_FROM_ANTAGONIST
+
+## Uncomment to prohibit assistants from becoming most antagonists.
+#PROTECT_ASSISTANT_FROM_ANTAGONIST
+
+## If non-human species are barred from joining as a head of staff
+#ENFORCE_HUMAN_AUTHORITY
+
+## If late-joining players have a chance to become a traitor/changeling
+ALLOW_LATEJOIN_ANTAGONISTS
+
+## Uncomment to allow players to see the set odds of different rounds in secret/random in the get server revision screen. This will NOT tell the current roundtype.
+#SHOW_GAME_TYPE_ODDS
+
+### RANDOM EVENTS ###
+
+## Comment this to disable random events during the round.
+ALLOW_RANDOM_EVENTS
+
+
+### AI ###
+
+## Allow the AI job to be picked.
+ALLOW_AI
+
+
+
+### AWAY MISSIONS ###
+
+## How long the delay is before the Away Mission gate opens. Default is half an hour.
+## 600 is one minute.
+GATEWAY_DELAY 18000
+
+
+### ACCESS ###
+
+## If the number of players ready at round starts exceeds this threshold, JOBS_HAVE_MINIMAL_ACCESS will automatically be enabled. Otherwise, it will be disabled.
+## This is useful for accomodating both low and high population rounds on the same server.
+## Comment out or set to 0 to disable this automatic toggle.
+MINIMAL_ACCESS_THRESHOLD 20
+
+## Comment this out if you wish to use the setup where jobs have more access.
+## This is intended for servers with low populations - where there are not enough
+## players to fill all roles, so players need to do more than just one job.
+## This option is ignored if MINIMAL_ACCESS_THRESHOLD is used.
+#JOBS_HAVE_MINIMAL_ACCESS
+
+## Uncomment to give assistants maint access.
+#ASSISTANTS_HAVE_MAINT_ACCESS
+
+## Uncoment to give security maint access. Note that if you comment JOBS_HAVE_MINIMAL_ACCESS security already gets maint from that.
+#SECURITY_HAS_MAINT_ACCESS
+
+## Uncomment to give everyone maint access.
+#EVERYONE_HAS_MAINT_ACCESS
+
+## Comment this to make security officers spawn in departmental security posts
+SEC_START_BRIG
+
+
+### GHOST INTERACTION ###
+## Uncomment to let ghosts spin chairs. You may be wondering why this is a config option. Don't ask.
+#GHOST_INTERACTION
+
+### NON-VOCAL SILICONS ###
+## Uncomment to stop the AI, or cyborgs, from having vocal communication.
+#SILENT_AI
+#SILENT_BORG
+
+### SANDBOX PANEL AUTOCLOSE ###
+## The sandbox panel's item spawning dialog now stays open even after you click an option.
+## If you find that your players are abusing the sandbox panel, this option may slow them down
+## without preventing people from using it properly.
+## Only functions in sandbox game mode.
+#SANDBOX_AUTOCLOSE
+
+### ROUNDSTART SILICON LAWS ###
+## This controls what the AI's laws are at the start of the round.
+## Set to 0/commented for "off", silicons will just start with Asimov.
+## Set to 1 for "custom", silicons will start with the custom laws defined in silicon_laws.txt. (If silicon_laws.txt is empty, the AI will spawn with asimov and Custom boards will auto-delete.)
+## Set to 2 for "random", silicons will start with a random lawset picked from (at the time of writing): P.A.L.A.D.I.N., Corporate, Asimov. More can be added by changing the law datum paths in ai_laws.dm.
+DEFAULT_LAWS 1
+
+### SILICON LAW MAX AMOUNT ###
+## The maximum number of laws a silicon can have
+## Attempting to upload laws past this point will fail unless the AI is reset
+SILICON_MAX_LAW_AMOUNT 12
+
+## Uncomment to give players the choice of their species before they join the game
+#JOIN_WITH_MUTANT_RACE
+
+## Uncomment to give players the choice of joining as a human with mutant bodyparts before they join the game
+#JOIN_WITH_MUTANT_HUMANS
+
+## Assistant slot cap. Set to -1 for unlimited.
+ASSISTANT_CAP -1
+
+## Starlight for exterior walls and breaches. Uncomment for starlight!
+STARLIGHT
+
+## Uncomment to bring back old grey suit assistants instead of the now default rainbow colored assistants.
+#GREY_ASSISTANTS
+
+### Midround Antag (aka Mulligan antag) config options ###
+
+## A time, in minutes, after which the midround antag system stops attempting to run and continuous rounds end immediately upon completion.
+MIDROUND_ANTAG_TIME_CHECK 60
+
+## A ratio of living to total crew members, the lower this is, the more people will have to die in order for midround antag to be skipped
+MIDROUND_ANTAG_LIFE_CHECK 0.7
+
+###Limit Spell Choices##
+## Uncomment to disallow wizards from using certain spells that may be too chaotic/fun for your playerbase
+
+#NO_SUMMON_GUNS
+#NO_SUMMON_MAGIC
+#NO_SUMMON_EVENTS
+
+//Comment for "normal" explosions, which ignore obstacles
+//Uncomment for explosions that react to doors and walls
+REACTIONARY_EXPLOSIONS
+
+### Configure the bomb cap
+## This caps all explosions to the specified range. Used for both balance reasons and to prevent overloading the server and lagging the game out.
+## This is given as the 3rd number(light damage) in the standard (1,2,3) explosion notation. The other numbers are derived by dividing by 2 and 4.
+## eg: If you give the number 20. The bomb cap will be 5,10,20.
+## Can be any number between 4 and 128, some examples are provided below.
+
+## Default (3,7,14)
+BOMBCAP 14
+## One 'step' up (4,8,16) (recommended if you enable REACTIONARY_EXPLOSIONS above)
+#BOMBCAP 16
+## LagHell (7,14,28)
+#BOMBCAP 28
+
+
+
diff --git a/config/jobs.txt b/config/jobs.txt
index c694bce28d0..a2676df629f 100644
--- a/config/jobs.txt
+++ b/config/jobs.txt
@@ -1,39 +1,39 @@
-Captain=1
-Head of Personnel=1
-Head of Security=1
-Chief Engineer=1
-Research Director=1
-Chief Medical Officer=1
-
-Station Engineer=5
-Roboticist=1
-
-Medical Doctor=5
-Geneticist=2
-Virologist=1
-
-Scientist=3
-Chemist=2
-
-Bartender=1
-Botanist=2
-Chef=1
-Janitor=1
-Quartermaster=1
-Shaft Miner=3
-Clown=1
-Mime=1
-
-Warden=1
-Detective=1
-Security Officer=5
-
-Assistant=-1
-Atmospheric Technician=4
-Cargo Technician=3
-Chaplain=1
-Lawyer=2
-Librarian=1
-
-AI=1
+Captain=1
+Head of Personnel=1
+Head of Security=1
+Chief Engineer=1
+Research Director=1
+Chief Medical Officer=1
+
+Station Engineer=5
+Roboticist=1
+
+Medical Doctor=5
+Geneticist=2
+Virologist=1
+
+Scientist=3
+Chemist=2
+
+Bartender=1
+Botanist=2
+Chef=1
+Janitor=1
+Quartermaster=1
+Shaft Miner=3
+Clown=1
+Mime=1
+
+Warden=1
+Detective=1
+Security Officer=5
+
+Assistant=-1
+Atmospheric Technician=4
+Cargo Technician=3
+Chaplain=1
+Lawyer=2
+Librarian=1
+
+AI=1
Cyborg=1
\ No newline at end of file
diff --git a/config/motd.txt b/config/motd.txt
index dd3234cbb69..c5b8a594972 100644
--- a/config/motd.txt
+++ b/config/motd.txt
@@ -1,5 +1,5 @@
-
-
-Welcome to Space Station 13!
-
-This server is running a /tg/station 13 Git build.
+
+
+Welcome to Space Station 13!
+
+This server is running a /tg/station 13 Git build.
diff --git a/config/names/adjectives.txt b/config/names/adjectives.txt
index ab0b4ba1806..73b6a4076db 100644
--- a/config/names/adjectives.txt
+++ b/config/names/adjectives.txt
@@ -1,397 +1,397 @@
-adorable
-adventurous
-aggressive
-alert
-attractive
-average
-beautiful
-blue-eyed
-bloody
-blushing
-bright
-clean
-clear
-cloudy
-colorful
-crowded
-cute
-dark
-drab
-distinct
-dull
-elegant
-excited
-fancy
-filthy
-glamorous
-gleaming
-gorgeous
-graceful
-grotesque
-handsome
-homely
-light
-long
-magnificent
-misty
-motionless
-muddy
-old-fashioned
-plain
-poised
-precious
-quaint
-shiny
-smoggy
-sparkling
-spotless
-stormy
-strange
-ugly
-ugliest
-unsightly
-unusual
-wide-eyed
-alive
-annoying
-bad
-better
-beautiful
-brainy
-breakable
-busy
-careful
-cautious
-clever
-clumsy
-concerned
-crazy
-curious
-dead
-different
-difficult
-doubtful
-easy
-expensive
-famous
-fragile
-frail
-gifted
-helpful
-helpless
-horrible
-important
-impossible
-inexpensive
-innocent
-inquisitive
-modern
-mushy
-odd
-open
-outstanding
-poor
-powerful
-prickly
-puzzled
-real
-rich
-shy
-sleepy
-stupid
-super
-talented
-tame
-tender
-tough
-uninterested
-vast
-wandering
-wild
-wrong
-
-angry
-annoyed
-anxious
-arrogant
-ashamed
-awful
-bad
-bewildered
-black
-blue
-bored
-clumsy
-combative
-condemned
-confused
-crazy,flipped-out
-creepy
-cruel
-dangerous
-defeated
-defiant
-depressed
-disgusted
-disturbed
-dizzy
-dull
-embarrassed
-envious
-evil
-fierce
-foolish
-frantic
-frightened
-grieving
-grumpy
-helpless
-homeless
-hungry
-hurt
-ill
-itchy
-jealous
-jittery
-lazy
-lonely
-mysterious
-nasty
-naughty
-nervous
-nutty
-obnoxious
-outrageous
-panicky
-repulsive
-scary
-selfish
-sore
-tense
-terrible
-testy
-thoughtless
-tired
-troubled
-upset
-uptight
-weary
-wicked
-worried
-agreeable
-amused
-brave
-calm
-charming
-cheerful
-comfortable
-cooperative
-courageous
-delightful
-determined
-eager
-elated
-enchanting
-encouraging
-energetic
-enthusiastic
-excited
-exuberant
-fair
-faithful
-fantastic
-fine
-friendly
-funny
-gentle
-glorious
-good
-happy
-healthy
-helpful
-hilarious
-jolly
-joyous
-kind
-lively
-lovely
-lucky
-nice
-obedient
-perfect
-pleasant
-proud
-relieved
-silly
-smiling
-splendid
-successful
-thankful
-thoughtful
-victorious
-vivacious
-witty
-wonderful
-zealous
-zany
-broad
-chubby
-crooked
-curved
-deep
-flat
-high
-hollow
-low
-narrow
-round
-shallow
-skinny
-square
-steep
-straight
-wide
-big
-colossal
-fat
-gigantic
-great
-huge
-immense
-large
-little
-mammoth
-massive
-miniature
-petite
-puny
-scrawny
-short
-small
-tall
-teeny
-teeny-tiny
-tiny
-cooing
-deafening
-faint
-harsh
-high-pitched
-hissing
-hushed
-husky
-loud
-melodic
-moaning
-mute
-noisy
-purring
-quiet
-raspy
-resonant
-screeching
-shrill
-silent
-soft
-squealing
-thundering
-voiceless
-whispering
-ancient
-brief
-early
-fast
-late
-long
-modern
-old
-old-fashioned
-quick
-rapid
-short
-slow
-swift
-young
-Taste/Touch
-bitter
-delicious
-fresh
-juicy
-ripe
-rotten
-salty
-sour
-spicy
-stale
-sticky
-strong
-sweet
-tart
-tasteless
-tasty
-thirsty
-fluttering
-fuzzy
-greasy
-grubby
-hard
-hot
-icy
-loose
-melted
-nutritious
-plastic
-prickly
-rainy
-rough
-scattered
-shaggy
-shaky
-sharp
-shivering
-silky
-slimy
-slippery
-smooth
-soft
-solid
-steady
-sticky
-tender
-tight
-uneven
-weak
-wet
-wooden
-yummy
-boiling
-breezy
-broken
-bumpy
-chilly
-cold
-cool
-creepy
-crooked
-cuddly
-curly
-damaged
-damp
-dirty
-dry
-dusty
-filthy
-flaky
-fluffy
-freezing
-hot
-warm
-wet
-abundant
-empty
-few
-heavy
-light
-many
-numerous
+adorable
+adventurous
+aggressive
+alert
+attractive
+average
+beautiful
+blue-eyed
+bloody
+blushing
+bright
+clean
+clear
+cloudy
+colorful
+crowded
+cute
+dark
+drab
+distinct
+dull
+elegant
+excited
+fancy
+filthy
+glamorous
+gleaming
+gorgeous
+graceful
+grotesque
+handsome
+homely
+light
+long
+magnificent
+misty
+motionless
+muddy
+old-fashioned
+plain
+poised
+precious
+quaint
+shiny
+smoggy
+sparkling
+spotless
+stormy
+strange
+ugly
+ugliest
+unsightly
+unusual
+wide-eyed
+alive
+annoying
+bad
+better
+beautiful
+brainy
+breakable
+busy
+careful
+cautious
+clever
+clumsy
+concerned
+crazy
+curious
+dead
+different
+difficult
+doubtful
+easy
+expensive
+famous
+fragile
+frail
+gifted
+helpful
+helpless
+horrible
+important
+impossible
+inexpensive
+innocent
+inquisitive
+modern
+mushy
+odd
+open
+outstanding
+poor
+powerful
+prickly
+puzzled
+real
+rich
+shy
+sleepy
+stupid
+super
+talented
+tame
+tender
+tough
+uninterested
+vast
+wandering
+wild
+wrong
+
+angry
+annoyed
+anxious
+arrogant
+ashamed
+awful
+bad
+bewildered
+black
+blue
+bored
+clumsy
+combative
+condemned
+confused
+crazy,flipped-out
+creepy
+cruel
+dangerous
+defeated
+defiant
+depressed
+disgusted
+disturbed
+dizzy
+dull
+embarrassed
+envious
+evil
+fierce
+foolish
+frantic
+frightened
+grieving
+grumpy
+helpless
+homeless
+hungry
+hurt
+ill
+itchy
+jealous
+jittery
+lazy
+lonely
+mysterious
+nasty
+naughty
+nervous
+nutty
+obnoxious
+outrageous
+panicky
+repulsive
+scary
+selfish
+sore
+tense
+terrible
+testy
+thoughtless
+tired
+troubled
+upset
+uptight
+weary
+wicked
+worried
+agreeable
+amused
+brave
+calm
+charming
+cheerful
+comfortable
+cooperative
+courageous
+delightful
+determined
+eager
+elated
+enchanting
+encouraging
+energetic
+enthusiastic
+excited
+exuberant
+fair
+faithful
+fantastic
+fine
+friendly
+funny
+gentle
+glorious
+good
+happy
+healthy
+helpful
+hilarious
+jolly
+joyous
+kind
+lively
+lovely
+lucky
+nice
+obedient
+perfect
+pleasant
+proud
+relieved
+silly
+smiling
+splendid
+successful
+thankful
+thoughtful
+victorious
+vivacious
+witty
+wonderful
+zealous
+zany
+broad
+chubby
+crooked
+curved
+deep
+flat
+high
+hollow
+low
+narrow
+round
+shallow
+skinny
+square
+steep
+straight
+wide
+big
+colossal
+fat
+gigantic
+great
+huge
+immense
+large
+little
+mammoth
+massive
+miniature
+petite
+puny
+scrawny
+short
+small
+tall
+teeny
+teeny-tiny
+tiny
+cooing
+deafening
+faint
+harsh
+high-pitched
+hissing
+hushed
+husky
+loud
+melodic
+moaning
+mute
+noisy
+purring
+quiet
+raspy
+resonant
+screeching
+shrill
+silent
+soft
+squealing
+thundering
+voiceless
+whispering
+ancient
+brief
+early
+fast
+late
+long
+modern
+old
+old-fashioned
+quick
+rapid
+short
+slow
+swift
+young
+Taste/Touch
+bitter
+delicious
+fresh
+juicy
+ripe
+rotten
+salty
+sour
+spicy
+stale
+sticky
+strong
+sweet
+tart
+tasteless
+tasty
+thirsty
+fluttering
+fuzzy
+greasy
+grubby
+hard
+hot
+icy
+loose
+melted
+nutritious
+plastic
+prickly
+rainy
+rough
+scattered
+shaggy
+shaky
+sharp
+shivering
+silky
+slimy
+slippery
+smooth
+soft
+solid
+steady
+sticky
+tender
+tight
+uneven
+weak
+wet
+wooden
+yummy
+boiling
+breezy
+broken
+bumpy
+chilly
+cold
+cool
+creepy
+crooked
+cuddly
+curly
+damaged
+damp
+dirty
+dry
+dusty
+filthy
+flaky
+fluffy
+freezing
+hot
+warm
+wet
+abundant
+empty
+few
+heavy
+light
+many
+numerous
substantial
\ No newline at end of file
diff --git a/config/names/ai.txt b/config/names/ai.txt
index ea9f63c0a9e..01c65cf1b7f 100644
--- a/config/names/ai.txt
+++ b/config/names/ai.txt
@@ -1,147 +1,147 @@
-1-Rover-1
-16-20
-7-Zark-7
-790
-AM
-AMEE
-ASTAR
-Adaptive Manipulator
-Allied Mastercomputer
-Alpha 5
-Alpha 6
-Alpha 7
-AmigoBot
-Android
-Aniel
-Asimov
-Astor
-B-4
-B-9
-B.O.B.
-B166ER
-Bender
-Bishop
-Blitz
-Box
-Brackenridge
-C-3PO
-Cassandra One
-Cell
-Chii
-Chip
-Computer
-Conky 2000
-Cutie
-Data
-Dee Model
-Deep Thought
-Dor-15
-Dorfl
-Dot Matrix
-Duey
-E.D.I.
-ED-209
-E-Man
-Emma-2
-Erasmus
-Ez-27
-FRIEND COMPUTER
-Fagor
-Faith
-Fi
-Frost
-Fum
-Futura
-G2
-George
-Gnut
-Gort
-H.A.R.L.I.E.
-H.E.L.P.eR.
-H.E.R.B.I.E.
-HAL 9000
-Hadaly
-Huey
-Irona
-Jay-Dub
-Jinx
-Johnny 5
-K-9
-KITT
-Klapaucius
-Kryten 2X4B-523P
-L-76
-L-Ron
-LUH 3417
-Louie
-MARK13
-Maria
-Marvin
-Master Control Program
-Max 404
-Maximillian
-Mechagodzilla
-Mechani-Kong
-Metalhead
-Mr. R.I.N.G.
-NCH
-Necron-99
-Norby
-OMM 0910
-Orange v 3.5
-PTO
-Project 2501
-R.I.C. 2.0
-R2-D2
-R4-P17
-Revelation
-Ro-Man
-Robbie
-S.A.M.
-S.H.O.C.K.
-S.H.R.O.U.D.
-S.O.P.H.I.E.
-SEN 5241
-SHODAN
-SID 6.7
-Setaur
-Shrike
-Solo
-Speedy
-Super 17
-Surgeon General Kraken
-T-1000
-T-800
-T-850
-THX 1138
-TWA
-Terminus
-Tidy
-Tik-Tok
-Tobor
-Trurl
-ULTRABOT
-Ulysses
-Uniblab
-V.I.N.CENT.
-Voltes V
-W1k1
-Wikipedia
-Windows 3.1
-X-5
-XERXES
-XR
-Yod
-Z-1
-Z-2
-Z-3
-Zed
-Zord
-Mugsy3000
-Terminus
-Decimus
-Robot Devil
-Optimus
-Megatron
-Soundwave
-Ironhide
+1-Rover-1
+16-20
+7-Zark-7
+790
+AM
+AMEE
+ASTAR
+Adaptive Manipulator
+Allied Mastercomputer
+Alpha 5
+Alpha 6
+Alpha 7
+AmigoBot
+Android
+Aniel
+Asimov
+Astor
+B-4
+B-9
+B.O.B.
+B166ER
+Bender
+Bishop
+Blitz
+Box
+Brackenridge
+C-3PO
+Cassandra One
+Cell
+Chii
+Chip
+Computer
+Conky 2000
+Cutie
+Data
+Dee Model
+Deep Thought
+Dor-15
+Dorfl
+Dot Matrix
+Duey
+E.D.I.
+ED-209
+E-Man
+Emma-2
+Erasmus
+Ez-27
+FRIEND COMPUTER
+Fagor
+Faith
+Fi
+Frost
+Fum
+Futura
+G2
+George
+Gnut
+Gort
+H.A.R.L.I.E.
+H.E.L.P.eR.
+H.E.R.B.I.E.
+HAL 9000
+Hadaly
+Huey
+Irona
+Jay-Dub
+Jinx
+Johnny 5
+K-9
+KITT
+Klapaucius
+Kryten 2X4B-523P
+L-76
+L-Ron
+LUH 3417
+Louie
+MARK13
+Maria
+Marvin
+Master Control Program
+Max 404
+Maximillian
+Mechagodzilla
+Mechani-Kong
+Metalhead
+Mr. R.I.N.G.
+NCH
+Necron-99
+Norby
+OMM 0910
+Orange v 3.5
+PTO
+Project 2501
+R.I.C. 2.0
+R2-D2
+R4-P17
+Revelation
+Ro-Man
+Robbie
+S.A.M.
+S.H.O.C.K.
+S.H.R.O.U.D.
+S.O.P.H.I.E.
+SEN 5241
+SHODAN
+SID 6.7
+Setaur
+Shrike
+Solo
+Speedy
+Super 17
+Surgeon General Kraken
+T-1000
+T-800
+T-850
+THX 1138
+TWA
+Terminus
+Tidy
+Tik-Tok
+Tobor
+Trurl
+ULTRABOT
+Ulysses
+Uniblab
+V.I.N.CENT.
+Voltes V
+W1k1
+Wikipedia
+Windows 3.1
+X-5
+XERXES
+XR
+Yod
+Z-1
+Z-2
+Z-3
+Zed
+Zord
+Mugsy3000
+Terminus
+Decimus
+Robot Devil
+Optimus
+Megatron
+Soundwave
+Ironhide
diff --git a/config/names/clown.txt b/config/names/clown.txt
index 90c1f07e27c..c29fca74ba3 100644
--- a/config/names/clown.txt
+++ b/config/names/clown.txt
@@ -1,37 +1,37 @@
-Gigglesworth
-Honkel the III
-Goose McSunny
-Mr. Shoe
-Toodles Sharperton
-Dinky Doodle
-Honkerbelle
-Bo Bo Sassy
-Baby Cakes
-Ladybug Honks
-Ziggy Yoyo
-Razzle Dazzle
-Buster Frown
-Pepinpop
-Silly Willy
-Jo Jo Bobo Bo
-Pocket
-Patches
-Checkers
-Freckle
-Honker
-Bonker
-Skiddle
-Scootaloo
-Sprinkledinkle
-Ronnie Pace
-Miss Stockings
-Slippy Joe
-Redshirt McBeat
-Flop O'Honker
-Speckles
-Bubble
-Button
-Sparkle
-Giggles
-Jingle
+Gigglesworth
+Honkel the III
+Goose McSunny
+Mr. Shoe
+Toodles Sharperton
+Dinky Doodle
+Honkerbelle
+Bo Bo Sassy
+Baby Cakes
+Ladybug Honks
+Ziggy Yoyo
+Razzle Dazzle
+Buster Frown
+Pepinpop
+Silly Willy
+Jo Jo Bobo Bo
+Pocket
+Patches
+Checkers
+Freckle
+Honker
+Bonker
+Skiddle
+Scootaloo
+Sprinkledinkle
+Ronnie Pace
+Miss Stockings
+Slippy Joe
+Redshirt McBeat
+Flop O'Honker
+Speckles
+Bubble
+Button
+Sparkle
+Giggles
+Jingle
Candy
\ No newline at end of file
diff --git a/config/names/death_commando.txt b/config/names/death_commando.txt
index e3d1f34f327..b10e181b5e8 100644
--- a/config/names/death_commando.txt
+++ b/config/names/death_commando.txt
@@ -1,70 +1,70 @@
-Killiam Shakespeare
-Stabby McGee
-Sgt. Slaughter
-Maxx Power
-Sir Killaslot
-Slab Bulkhead
-Fridge Largemeat
-Punt Speedchunk
-Butch Deadlift
-Bold Bigflank
-Splint Chesthair
-Flint Ironstag
-Bolt Vanderhuge
-Thick McRunfast
-Blast Hardcheese
-Buff Drinklots
-Trunk Slamchest
-Fist Rockbone
-Stump Beefgnaw
-Smash Lampjaw
-Punch Rockgroin
-Buck Plankchest
-Stump Chunkman
-Dirk Hardpeck
-Rip Steakface
-Slate Slabrock
-Crud Bonemeal
-Brick Hardmeat
-Rip Sidecheek
-Punch Sideiron
-Gristle McThornBody
-Slake Fistcrunch
-Buff Hardback
-Blast Thickneck
-Crunch Buttsteak
-Slab Squatthrust
-Lump Beefrock
-Touch Rustrod
-Reef Blastbody
-Smoke Manmuscle
-Beat Punchbeef
-Pack Blowfist
-Roll Fizzlebeef
-Lance Killiam
-George Melons
-Maximilian Murderface
-Bob Johnson
-Crush McStompbones
-Hank Chesthair
-Killing McKillingalot
-Mancrush McBrorape
-Rex Dudekiller VII
-Seamus McTosterone
-Hans Testosteroneson
-Max Pain
-Theodore Pain
-Sarah Pain
-GORE Vidal
-Leonardo Da Viking
-Noam Bombsky
-Al "Otta" Gore
-Gibbs McLargehuge
-Evil Martin Luther King
-Evil Bob Marley
-Duke Killington
-AMERICA
-Toolboxl Rose
-Zombie Gandhi
-A whole bunch of spiders in a SWAT suit
+Killiam Shakespeare
+Stabby McGee
+Sgt. Slaughter
+Maxx Power
+Sir Killaslot
+Slab Bulkhead
+Fridge Largemeat
+Punt Speedchunk
+Butch Deadlift
+Bold Bigflank
+Splint Chesthair
+Flint Ironstag
+Bolt Vanderhuge
+Thick McRunfast
+Blast Hardcheese
+Buff Drinklots
+Trunk Slamchest
+Fist Rockbone
+Stump Beefgnaw
+Smash Lampjaw
+Punch Rockgroin
+Buck Plankchest
+Stump Chunkman
+Dirk Hardpeck
+Rip Steakface
+Slate Slabrock
+Crud Bonemeal
+Brick Hardmeat
+Rip Sidecheek
+Punch Sideiron
+Gristle McThornBody
+Slake Fistcrunch
+Buff Hardback
+Blast Thickneck
+Crunch Buttsteak
+Slab Squatthrust
+Lump Beefrock
+Touch Rustrod
+Reef Blastbody
+Smoke Manmuscle
+Beat Punchbeef
+Pack Blowfist
+Roll Fizzlebeef
+Lance Killiam
+George Melons
+Maximilian Murderface
+Bob Johnson
+Crush McStompbones
+Hank Chesthair
+Killing McKillingalot
+Mancrush McBrorape
+Rex Dudekiller VII
+Seamus McTosterone
+Hans Testosteroneson
+Max Pain
+Theodore Pain
+Sarah Pain
+GORE Vidal
+Leonardo Da Viking
+Noam Bombsky
+Al "Otta" Gore
+Gibbs McLargehuge
+Evil Martin Luther King
+Evil Bob Marley
+Duke Killington
+AMERICA
+Toolboxl Rose
+Zombie Gandhi
+A whole bunch of spiders in a SWAT suit
THAT DAMN FAGGOT TRAITOR GEORGE MELONS
\ No newline at end of file
diff --git a/config/names/first.txt b/config/names/first.txt
index eb59a135854..a33e181146f 100644
--- a/config/names/first.txt
+++ b/config/names/first.txt
@@ -1,1502 +1,1502 @@
-Abel
-Adolph
-Aida
-Alan
-Alden
-Alex
-Alexa
-Alexandria
-Alexis
-Alexus
-Alfred
-Alfreda
-Alger
-Alisa
-Alisya
-Allegra
-Allegria
-Allen
-Alma
-Alysha
-Alyssia
-Amaryllis
-Ambrosine
-Amos
-Angel
-Anjelica
-Anne
-Arabella
-Archie
-Arielle
-Arleen
-Arn
-Art
-Ashlie
-Astor
-Aubrey
-Avalon
-Averill
-Baldric
-Barbra
-Bartholomew
-Beckah
-Becky
-Bernice
-Bertrand
-Bethney
-Betsy
-Bidelia
-Bill
-Blake
-Brayden
-Breanne
-Brendan
-Brittani
-Bronte
-Brooke
-Bryce
-Burt
-Byrne
-Byron
-Bysshe
-Cadence
-Calanthia
-Caleigh
-Camryn
-Candace
-Candice
-Candis
-Canute
-Carly
-Carlyle
-Carolyn
-Carry
-Carter
-Caryl
-Casimir
-Cassian
-Cecily
-Charlton
-Cherette
-Cheri
-Cherry
-Chip
-Christa
-Christiana
-Christobel
-Claribel
-Clark
-Claudius
-Clement
-Cleveland
-Cliff
-Clinton
-Clitus
-Clover
-Collin
-Coreen
-Corrine
-Cy
-Cynthia
-Dalya
-Damian
-Daniella
-Danny
-Darcey
-Darell
-Daria
-Darin
-Dayna
-Deangelo
-Debbi
-Dee
-Deena
-Della
-Delma
-Denholm
-Denys
-Desmond
-Devin
-Diamond
-Dina
-Dolores
-Dominic
-Donella
-Donna
-Donny
-Dorothy
-Dortha
-Driscoll
-Duncan
-Easter
-Ebba
-Edgar
-Effie
-Eliot
-Eliott
-Elizabeth
-Elle
-Elric
-Elspet
-Elwood
-Emma
-Emmanuel
-Ermintrude
-Esmeralda
-Eugenia
-Euphemia
-Eustace
-Eveleen
-Evelina
-Fay
-Fitz
-Flick
-Floella
-Flora
-Flossie
-Fortune
-Francis
-Frankie
-Fulton
-Garret
-Gaye
-Gaylord
-Genette
-Georgene
-Geraldine
-Gervase
-Gina
-Ginger
-Gladwyn
-Glenna
-Goddard
-Godwin
-Goodwin
-Gordon
-Graeme
-Gratian
-Greta
-Griselda
-Gwenda
-Gwenevere
-Hadley
-Haidee
-Hailey
-Hal
-Haleigh
-Happy
-Hartley
-Hayley
-Heather
-Hedley
-Helen
-Henderson
-Hepsie
-Hervey
-Holden
-Homer
-Hope
-Horatio
-Hortensia
-Huffie
-Hugo
-Iantha
-Ileen
-Innocent
-Irene
-Irvine
-Jacaline
-Jacquetta
-Jacqui
-Jake
-Jakki
-Jalen
-Jamar
-Jamie
-Jamison
-Janel
-Janelle
-Janette
-Janie
-Janina
-Janine
-Jasmine
-Jaydon
-Jaye
-Jaylee
-Jayne
-Jaynie
-Jeanna
-Jeannie
-Jeannine
-Jeb
-Jed
-Jemmy
-Jenifer
-Jennie
-Jera
-Jere
-Jeri
-Jermaine
-Jerrie
-Jillian
-Jillie
-Jim
-Joachim
-Joetta
-Joey
-Johnathan
-Johnny
-Joi
-Jonathon
-Joni
-Josepha
-Josh
-Josiah
-Joye
-Julia
-July
-Kaelea
-Kaleigh
-Karenza
-Karly
-Karyn
-Kat
-Kathy
-Katlyn
-Kayleigh
-Keegan
-Keira
-Keith
-Kellie
-Kennard
-Kerena
-Kerensa
-Keturah
-Keziah
-Kimberley
-Lacy
-Lakeisha
-Lalla
-Lanny
-Latanya
-Launce
-Laurencia
-Laurissa
-Leeann
-Leia
-Leland
-Lennox
-Leroi
-Lessie
-Leta
-Lexia
-Lexus
-Linden
-Lindsie
-Lindy
-Linton
-Lockie
-Loreto
-Lori
-Lorin
-Lou
-Luanne
-Lucian
-Luvenia
-Lyndsey
-Lynn
-Lynsey
-Lynwood
-Mabelle
-Macey
-Madyson
-Maegan
-Malachi
-Malcolm
-Manley
-Marcia
-Mariabella
-Marilene
-Marion
-Marion
-Marje
-Marjory
-Marlowe
-Marlyn
-Marshall
-Maryann
-Maudie
-Maurene
-May
-Maynard
-Melvyn
-Merideth
-Merrilyn
-Meryl
-Micheal
-Mike
-Milton
-Minnie
-Monna
-Montague
-Monte
-Monty
-Muriel
-Mya
-Myriam
-Myrtie
-Nan
-Nathaniel
-Nelle
-Nena
-Nerissa
-Netta
-Nettie
-Nikolas
-Noah
-Nonie
-Nova
-Nowell
-Nydia
-Olive
-Oralie
-Osbert
-Osborn
-Osborne
-Osmund
-Paget
-Patience
-Patrick
-Patton
-Pauleen
-Pene
-Percival
-Peregrine
-Pheobe
-Phoebe
-Phyliss
-Phyllida
-Phyllis
-Porsche
-Prosper
-Prue
-Quanah
-Quiana
-Raelene
-Rain
-Randa
-Randal
-Rastus
-Rayner
-Rebeckah
-Reene
-Renie
-Reuben
-Rexana
-Reynard
-Rhetta
-Rich
-Richie
-Rick
-Rickena
-Rickey
-Rickie
-Rodger
-Roger
-Romayne
-Ronnette
-Roscoe
-Rosemary
-Roswell
-Royce
-Rubye
-Rusty
-Sabella
-Sachie
-Sal
-Sally
-Saranna
-Sawyer
-Scotty
-Seneca
-Seymour
-Shan
-Shana
-Shanika
-Shannah
-Shannon
-Shantae
-Sharalyn
-Sharla
-Sheri
-Sherie
-Sherill
-Sherri
-Shiloh
-Simon
-Sissy
-Sloan
-Sophie
-Sorrel
-Spike
-Star
-Steph
-Stephany
-Sue
-Sukie
-Sunshine
-Susanna
-Susannah
-Suzan
-Suzy
-Sybil
-Syd
-Sydney
-Tamika
-Tamsin
-Tania
-Tansy
-Tatyanna
-Taylor
-Tel
-Terrell
-Tiffany
-Tod
-Tolly
-Topaz
-Tori
-Tracee
-Tracey
-Trinity
-Tye
-Uland
-Ulric
-Ulyssa
-Valary
-Vaughn
-Verna
-Vince
-Vinnie
-Vivyan
-Walter
-Ward
-Warner
-Wayne
-Wendi
-Whitaker
-William
-Willy
-Winifred
-Wisdom
-Woodrow
-Woody
-Wynonna
-Wynter
-Yasmin
-Yolanda
-Ysabel
-Zack
-Zeke
-Zelda
-Zune
-Jacob
-Michael
-Ethan
-Joshua
-Daniel
-Alexander
-Anthony
-William
-Christopher
-Matthew
-Jayden
-Andrew
-Joseph
-David
-Noah
-Aiden
-James
-Ryan
-Logan
-John
-Nathan
-Elijah
-Christian
-Gabriel
-Benjamin
-Jonathan
-Tyler
-Samuel
-Nicholas
-Gavin
-Dylan
-Jackson
-Brandon
-Caleb
-Mason
-Angel
-Isaac
-Evan
-Jack
-Kevin
-Jose
-Isaiah
-Luke
-Landon
-Justin
-Lucas
-Zachary
-Jordan
-Robert
-Aaron
-Brayden
-Thomas
-Cameron
-Hunter
-Austin
-Adrian
-Connor
-Owen
-Aidan
-Jason
-Julian
-Wyatt
-Charles
-Luis
-Carter
-Juan
-Chase
-Diego
-Jeremiah
-Brody
-Xavier
-Adam
-Carlos
-Sebastian
-Liam
-Hayden
-Nathaniel
-Henry
-Jesus
-Ian
-Tristan
-Bryan
-Sean
-Cole
-Alex
-Eric
-Brian
-Jaden
-Carson
-Blake
-Ayden
-Cooper
-Dominic
-Brady
-Caden
-Josiah
-Kyle
-Colton
-Kaden
-Eli
-Miguel
-Antonio
-Parker
-Steven
-Alejandro
-Riley
-Richard
-Timothy
-Devin
-Jesse
-Victor
-Jake
-Joel
-Colin
-Kaleb
-Bryce
-Levi
-Oliver
-Oscar
-Vincent
-Ashton
-Cody
-Micah
-Preston
-Marcus
-Max
-Patrick
-Seth
-Jeremy
-Peyton
-Nolan
-Ivan
-Damian
-Maxwell
-Alan
-Kenneth
-Jonah
-Jorge
-Mark
-Giovanni
-Eduardo
-Grant
-Collin
-Gage
-Omar
-Emmanuel
-Trevor
-Edward
-Ricardo
-Cristian
-Nicolas
-Kayden
-George
-Jaxon
-Paul
-Braden
-Elias
-Andres
-Derek
-Garrett
-Tanner
-Malachi
-Conner
-Fernando
-Cesar
-Javier
-Miles
-Jaiden
-Alexis
-Leonardo
-Santiago
-Francisco
-Cayden
-Shane
-Edwin
-Hudson
-Travis
-Bryson
-Erick
-Jace
-Hector
-Josue
-Peter
-Jaylen
-Mario
-Manuel
-Abraham
-Grayson
-Damien
-Kaiden
-Spencer
-Stephen
-Edgar
-Wesley
-Shawn
-Trenton
-Jared
-Jeffrey
-Landen
-Johnathan
-Bradley
-Braxton
-Ryder
-Camden
-Roman
-Asher
-Brendan
-Maddox
-Sergio
-Israel
-Andy
-Lincoln
-Erik
-Donovan
-Raymond
-Avery
-Rylan
-Dalton
-Harrison
-Andre
-Martin
-Keegan
-Marco
-Jude
-Sawyer
-Dakota
-Leo
-Calvin
-Kai
-Drake
-Troy
-Zion
-Clayton
-Roberto
-Zane
-Gregory
-Tucker
-Rafael
-Kingston
-Dominick
-Ezekiel
-Griffin
-Devon
-Drew
-Lukas
-Johnny
-Ty
-Pedro
-Tyson
-Caiden
-Mateo
-Braylon
-Cash
-Aden
-Chance
-Taylor
-Marcos
-Maximus
-Ruben
-Emanuel
-Simon
-Corbin
-Brennan
-Dillon
-Skyler
-Myles
-Xander
-Jaxson
-Dawson
-Kameron
-Kyler
-Axel
-Colby
-Jonas
-Joaquin
-Payton
-Brock
-Frank
-Enrique
-Quinn
-Emilio
-Malik
-Grady
-Angelo
-Julio
-Derrick
-Raul
-Fabian
-Corey
-Gerardo
-Dante
-Ezra
-Armando
-Allen
-Theodore
-Gael
-Amir
-Zander
-Adan
-Maximilian
-Randy
-Easton
-Dustin
-Luca
-Phillip
-Julius
-Charlie
-Ronald
-Jakob
-Cade
-Brett
-Trent
-Silas
-Keith
-Emiliano
-Trey
-Jalen
-Darius
-Lane
-Jerry
-Jaime
-Scott
-Graham
-Weston
-Braydon
-Anderson
-Rodrigo
-Pablo
-Saul
-Danny
-Donald
-Elliot
-Brayan
-Dallas
-Lorenzo
-Casey
-Mitchell
-Alberto
-Tristen
-Rowan
-Jayson
-Gustavo
-Aaden
-Amari
-Dean
-Braeden
-Declan
-Chris
-Ismael
-Dane
-Louis
-Arturo
-Brenden
-Felix
-Jimmy
-Cohen
-Tony
-Holden
-Reid
-Abel
-Bennett
-Zackary
-Arthur
-Nehemiah
-Ricky
-Esteban
-Cruz
-Finn
-Mauricio
-Dennis
-Keaton
-Albert
-Marvin
-Mathew
-Larry
-Moises
-Issac
-Philip
-Quentin
-Curtis
-Greyson
-Jameson
-Everett
-Jayce
-Darren
-Elliott
-Uriel
-Alfredo
-Hugo
-Alec
-Jamari
-Marshall
-Walter
-Judah
-Jay
-Lance
-Beau
-Ali
-Landyn
-Yahir
-Phoenix
-Nickolas
-Kobe
-Bryant
-Maurice
-Russell
-Leland
-Colten
-Reed
-Davis
-Joe
-Ernesto
-Desmond
-Kade
-Reece
-Morgan
-Ramon
-Rocco
-Orlando
-Ryker
-Brodie
-Paxton
-Jacoby
-Douglas
-Kristopher
-Gary
-Lawrence
-Izaiah
-Solomon
-Nikolas
-Mekhi
-Justice
-Tate
-Jaydon
-Salvador
-Shaun
-Alvin
-Eddie
-Kane
-Davion
-Zachariah
-Dorian
-Titus
-Kellen
-Camron
-Isiah
-Javon
-Nasir
-Milo
-Johan
-Byron
-Jasper
-Jonathon
-Chad
-Marc
-Kelvin
-Chandler
-Sam
-Cory
-Deandre
-River
-Reese
-Roger
-Quinton
-Talon
-Romeo
-Franklin
-Noel
-Alijah
-Guillermo
-Gunner
-Damon
-Jadon
-Emerson
-Micheal
-Bruce
-Terry
-Kolton
-Melvin
-Beckett
-Porter
-August
-Brycen
-Dayton
-Jamarion
-Leonel
-Karson
-Zayden
-Keagan
-Carl
-Khalil
-Cristopher
-Nelson
-Braiden
-Moses
-Isaias
-Roy
-Triston
-Walker
-Kale
-Emma
-Isabella
-Emily
-Madison
-Ava
-Olivia
-Sophia
-Abigail
-Elizabeth
-Chloe
-Samantha
-Addison
-Natalie
-Mia
-Alexis
-Alyssa
-Hannah
-Ashley
-Ella
-Sarah
-Grace
-Taylor
-Brianna
-Lily
-Hailey
-Anna
-Victoria
-Kayla
-Lillian
-Lauren
-Kaylee
-Allison
-Savannah
-Nevaeh
-Gabriella
-Sofia
-Makayla
-Avery
-Riley
-Julia
-Leah
-Aubrey
-Jasmine
-Audrey
-Katherine
-Morgan
-Brooklyn
-Destiny
-Sydney
-Alexa
-Kylie
-Brooke
-Kaitlyn
-Evelyn
-Layla
-Madeline
-Kimberly
-Zoe
-Jessica
-Peyton
-Alexandra
-Claire
-Madelyn
-Maria
-Mackenzie
-Arianna
-Jocelyn
-Amelia
-Angelina
-Trinity
-Andrea
-Maya
-Valeria
-Sophie
-Rachel
-Vanessa
-Aaliyah
-Mariah
-Gabrielle
-Katelyn
-Ariana
-Bailey
-Camila
-Jennifer
-Melanie
-Gianna
-Charlotte
-Paige
-Autumn
-Payton
-Faith
-Sara
-Isabelle
-Caroline
-Genesis
-Isabel
-Mary
-Zoey
-Gracie
-Megan
-Haley
-Mya
-Michelle
-Molly
-Stephanie
-Nicole
-Jenna
-Natalia
-Sadie
-Jada
-Serenity
-Lucy
-Ruby
-Eva
-Kennedy
-Rylee
-Jayla
-Naomi
-Rebecca
-Lydia
-Daniela
-Bella
-Keira
-Adriana
-Lilly
-Hayden
-Miley
-Katie
-Jade
-Jordan
-Gabriela
-Amy
-Angela
-Melissa
-Valerie
-Giselle
-Diana
-Amanda
-Kate
-Laila
-Reagan
-Jordyn
-Kylee
-Danielle
-Briana
-Marley
-Leslie
-Kendall
-Catherine
-Liliana
-Mckenzie
-Jacqueline
-Ashlyn
-Reese
-Marissa
-London
-Juliana
-Shelby
-Cheyenne
-Angel
-Daisy
-Makenzie
-Miranda
-Erin
-Amber
-Alana
-Ellie
-Breanna
-Ana
-Mikayla
-Summer
-Piper
-Adrianna
-Jillian
-Sierra
-Jayden
-Sienna
-Alicia
-Lila
-Margaret
-Alivia
-Brooklynn
-Karen
-Violet
-Sabrina
-Stella
-Aniyah
-Annabelle
-Alexandria
-Kathryn
-Skylar
-Aliyah
-Delilah
-Julianna
-Kelsey
-Khloe
-Carly
-Amaya
-Mariana
-Christina
-Alondra
-Tessa
-Eliana
-Bianca
-Jazmin
-Clara
-Vivian
-Josephine
-Delaney
-Scarlett
-Elena
-Cadence
-Alexia
-Maggie
-Laura
-Nora
-Ariel
-Elise
-Nadia
-Mckenna
-Chelsea
-Lyla
-Alaina
-Jasmin
-Hope
-Leila
-Caitlyn
-Cassidy
-Makenna
-Allie
-Izabella
-Eden
-Callie
-Haylee
-Caitlin
-Kendra
-Karina
-Kyra
-Kayleigh
-Addyson
-Kiara
-Jazmine
-Karla
-Camryn
-Alina
-Lola
-Kyla
-Kelly
-Fatima
-Tiffany
-Kira
-Crystal
-Mallory
-Esmeralda
-Alejandra
-Eleanor
-Angelica
-Jayda
-Abby
-Kara
-Veronica
-Carmen
-Jamie
-Ryleigh
-Valentina
-Allyson
-Dakota
-Kamryn
-Courtney
-Cecilia
-Madeleine
-Aniya
-Alison
-Esther
-Heaven
-Aubree
-Lindsey
-Leilani
-Nina
-Melody
-Macy
-Ashlynn
-Joanna
-Cassandra
-Alayna
-Kaydence
-Madilyn
-Aurora
-Heidi
-Emerson
-Kimora
-Madalyn
-Erica
-Josie
-Katelynn
-Guadalupe
-Harper
-Ivy
-Lexi
-Camille
-Savanna
-Dulce
-Daniella
-Lucia
-Emely
-Joselyn
-Kiley
-Kailey
-Miriam
-Cynthia
-Rihanna
-Georgia
-Rylie
-Harmony
-Kiera
-Kyleigh
-Monica
-Bethany
-Kaylie
-Cameron
-Teagan
-Cora
-Brynn
-Ciara
-Genevieve
-Alice
-Maddison
-Eliza
-Tatiana
-Jaelyn
-Erika
-Ximena
-April
-Marely
-Julie
-Danica
-Presley
-Brielle
-Julissa
-Angie
-Iris
-Brenda
-Hazel
-Rose
-Malia
-Shayla
-Fiona
-Phoebe
-Nayeli
-Paola
-Kaelyn
-Selena
-Audrina
-Rebekah
-Carolina
-Janiyah
-Michaela
-Penelope
-Janiya
-Anastasia
-Adeline
-Ruth
-Sasha
-Denise
-Holly
-Madisyn
-Hanna
-Tatum
-Marlee
-Nataly
-Helen
-Janelle
-Lizbeth
-Serena
-Anya
-Jaslene
-Kaylin
-Jazlyn
-Nancy
-Lindsay
-Desiree
-Hayley
-Itzel
-Imani
-Madelynn
-Asia
-Kadence
-Madyson
-Talia
-Jane
-Kayden
-Annie
-Amari
-Bridget
-Raegan
-Jadyn
-Celeste
-Jimena
-Luna
-Yasmin
-Emilia
-Annika
-Estrella
-Sarai
-Lacey
-Ayla
-Alessandra
-Willow
-Nyla
-Dayana
-Lilah
-Lilliana
-Natasha
-Hadley
-Harley
-Priscilla
-Claudia
-Allisson
-Baylee
-Brenna
-Brittany
-Skyler
-Fernanda
-Danna
-Melany
-Cali
-Lia
-Macie
-Lyric
-Logan
-Gloria
-Lana
-Mylee
-Cindy
-Lilian
-Amira
-Anahi
-Alissa
-Anaya
-Lena
-Ainsley
-Sandra
-Noelle
-Marisol
-Meredith
-Kailyn
-Lesly
-Johanna
-Diamond
-Evangeline
-Juliet
-Kathleen
-Meghan
-Paisley
-Athena
-Hailee
-Rosa
-Wendy
-Emilee
-Sage
-Alanna
-Elaina
-Cara
-Nia
-Paris
-Casey
-Dana
-Emery
-Rowan
-Aubrie
-Kaitlin
-Jaden
-Kenzie
-Kiana
-Viviana
-Norah
-Lauryn
-Perla
-Amiyah
-Alyson
-Rachael
-Shannon
-Aileen
-Miracle
-Lillie
-Danika
-Heather
-Kassidy
-Taryn
-Tori
-Francesca
-Kristen
-Amya
-Elle
-Kristina
-Cheyanne
-Haylie
-Patricia
-Anne
-Samara
+Abel
+Adolph
+Aida
+Alan
+Alden
+Alex
+Alexa
+Alexandria
+Alexis
+Alexus
+Alfred
+Alfreda
+Alger
+Alisa
+Alisya
+Allegra
+Allegria
+Allen
+Alma
+Alysha
+Alyssia
+Amaryllis
+Ambrosine
+Amos
+Angel
+Anjelica
+Anne
+Arabella
+Archie
+Arielle
+Arleen
+Arn
+Art
+Ashlie
+Astor
+Aubrey
+Avalon
+Averill
+Baldric
+Barbra
+Bartholomew
+Beckah
+Becky
+Bernice
+Bertrand
+Bethney
+Betsy
+Bidelia
+Bill
+Blake
+Brayden
+Breanne
+Brendan
+Brittani
+Bronte
+Brooke
+Bryce
+Burt
+Byrne
+Byron
+Bysshe
+Cadence
+Calanthia
+Caleigh
+Camryn
+Candace
+Candice
+Candis
+Canute
+Carly
+Carlyle
+Carolyn
+Carry
+Carter
+Caryl
+Casimir
+Cassian
+Cecily
+Charlton
+Cherette
+Cheri
+Cherry
+Chip
+Christa
+Christiana
+Christobel
+Claribel
+Clark
+Claudius
+Clement
+Cleveland
+Cliff
+Clinton
+Clitus
+Clover
+Collin
+Coreen
+Corrine
+Cy
+Cynthia
+Dalya
+Damian
+Daniella
+Danny
+Darcey
+Darell
+Daria
+Darin
+Dayna
+Deangelo
+Debbi
+Dee
+Deena
+Della
+Delma
+Denholm
+Denys
+Desmond
+Devin
+Diamond
+Dina
+Dolores
+Dominic
+Donella
+Donna
+Donny
+Dorothy
+Dortha
+Driscoll
+Duncan
+Easter
+Ebba
+Edgar
+Effie
+Eliot
+Eliott
+Elizabeth
+Elle
+Elric
+Elspet
+Elwood
+Emma
+Emmanuel
+Ermintrude
+Esmeralda
+Eugenia
+Euphemia
+Eustace
+Eveleen
+Evelina
+Fay
+Fitz
+Flick
+Floella
+Flora
+Flossie
+Fortune
+Francis
+Frankie
+Fulton
+Garret
+Gaye
+Gaylord
+Genette
+Georgene
+Geraldine
+Gervase
+Gina
+Ginger
+Gladwyn
+Glenna
+Goddard
+Godwin
+Goodwin
+Gordon
+Graeme
+Gratian
+Greta
+Griselda
+Gwenda
+Gwenevere
+Hadley
+Haidee
+Hailey
+Hal
+Haleigh
+Happy
+Hartley
+Hayley
+Heather
+Hedley
+Helen
+Henderson
+Hepsie
+Hervey
+Holden
+Homer
+Hope
+Horatio
+Hortensia
+Huffie
+Hugo
+Iantha
+Ileen
+Innocent
+Irene
+Irvine
+Jacaline
+Jacquetta
+Jacqui
+Jake
+Jakki
+Jalen
+Jamar
+Jamie
+Jamison
+Janel
+Janelle
+Janette
+Janie
+Janina
+Janine
+Jasmine
+Jaydon
+Jaye
+Jaylee
+Jayne
+Jaynie
+Jeanna
+Jeannie
+Jeannine
+Jeb
+Jed
+Jemmy
+Jenifer
+Jennie
+Jera
+Jere
+Jeri
+Jermaine
+Jerrie
+Jillian
+Jillie
+Jim
+Joachim
+Joetta
+Joey
+Johnathan
+Johnny
+Joi
+Jonathon
+Joni
+Josepha
+Josh
+Josiah
+Joye
+Julia
+July
+Kaelea
+Kaleigh
+Karenza
+Karly
+Karyn
+Kat
+Kathy
+Katlyn
+Kayleigh
+Keegan
+Keira
+Keith
+Kellie
+Kennard
+Kerena
+Kerensa
+Keturah
+Keziah
+Kimberley
+Lacy
+Lakeisha
+Lalla
+Lanny
+Latanya
+Launce
+Laurencia
+Laurissa
+Leeann
+Leia
+Leland
+Lennox
+Leroi
+Lessie
+Leta
+Lexia
+Lexus
+Linden
+Lindsie
+Lindy
+Linton
+Lockie
+Loreto
+Lori
+Lorin
+Lou
+Luanne
+Lucian
+Luvenia
+Lyndsey
+Lynn
+Lynsey
+Lynwood
+Mabelle
+Macey
+Madyson
+Maegan
+Malachi
+Malcolm
+Manley
+Marcia
+Mariabella
+Marilene
+Marion
+Marion
+Marje
+Marjory
+Marlowe
+Marlyn
+Marshall
+Maryann
+Maudie
+Maurene
+May
+Maynard
+Melvyn
+Merideth
+Merrilyn
+Meryl
+Micheal
+Mike
+Milton
+Minnie
+Monna
+Montague
+Monte
+Monty
+Muriel
+Mya
+Myriam
+Myrtie
+Nan
+Nathaniel
+Nelle
+Nena
+Nerissa
+Netta
+Nettie
+Nikolas
+Noah
+Nonie
+Nova
+Nowell
+Nydia
+Olive
+Oralie
+Osbert
+Osborn
+Osborne
+Osmund
+Paget
+Patience
+Patrick
+Patton
+Pauleen
+Pene
+Percival
+Peregrine
+Pheobe
+Phoebe
+Phyliss
+Phyllida
+Phyllis
+Porsche
+Prosper
+Prue
+Quanah
+Quiana
+Raelene
+Rain
+Randa
+Randal
+Rastus
+Rayner
+Rebeckah
+Reene
+Renie
+Reuben
+Rexana
+Reynard
+Rhetta
+Rich
+Richie
+Rick
+Rickena
+Rickey
+Rickie
+Rodger
+Roger
+Romayne
+Ronnette
+Roscoe
+Rosemary
+Roswell
+Royce
+Rubye
+Rusty
+Sabella
+Sachie
+Sal
+Sally
+Saranna
+Sawyer
+Scotty
+Seneca
+Seymour
+Shan
+Shana
+Shanika
+Shannah
+Shannon
+Shantae
+Sharalyn
+Sharla
+Sheri
+Sherie
+Sherill
+Sherri
+Shiloh
+Simon
+Sissy
+Sloan
+Sophie
+Sorrel
+Spike
+Star
+Steph
+Stephany
+Sue
+Sukie
+Sunshine
+Susanna
+Susannah
+Suzan
+Suzy
+Sybil
+Syd
+Sydney
+Tamika
+Tamsin
+Tania
+Tansy
+Tatyanna
+Taylor
+Tel
+Terrell
+Tiffany
+Tod
+Tolly
+Topaz
+Tori
+Tracee
+Tracey
+Trinity
+Tye
+Uland
+Ulric
+Ulyssa
+Valary
+Vaughn
+Verna
+Vince
+Vinnie
+Vivyan
+Walter
+Ward
+Warner
+Wayne
+Wendi
+Whitaker
+William
+Willy
+Winifred
+Wisdom
+Woodrow
+Woody
+Wynonna
+Wynter
+Yasmin
+Yolanda
+Ysabel
+Zack
+Zeke
+Zelda
+Zune
+Jacob
+Michael
+Ethan
+Joshua
+Daniel
+Alexander
+Anthony
+William
+Christopher
+Matthew
+Jayden
+Andrew
+Joseph
+David
+Noah
+Aiden
+James
+Ryan
+Logan
+John
+Nathan
+Elijah
+Christian
+Gabriel
+Benjamin
+Jonathan
+Tyler
+Samuel
+Nicholas
+Gavin
+Dylan
+Jackson
+Brandon
+Caleb
+Mason
+Angel
+Isaac
+Evan
+Jack
+Kevin
+Jose
+Isaiah
+Luke
+Landon
+Justin
+Lucas
+Zachary
+Jordan
+Robert
+Aaron
+Brayden
+Thomas
+Cameron
+Hunter
+Austin
+Adrian
+Connor
+Owen
+Aidan
+Jason
+Julian
+Wyatt
+Charles
+Luis
+Carter
+Juan
+Chase
+Diego
+Jeremiah
+Brody
+Xavier
+Adam
+Carlos
+Sebastian
+Liam
+Hayden
+Nathaniel
+Henry
+Jesus
+Ian
+Tristan
+Bryan
+Sean
+Cole
+Alex
+Eric
+Brian
+Jaden
+Carson
+Blake
+Ayden
+Cooper
+Dominic
+Brady
+Caden
+Josiah
+Kyle
+Colton
+Kaden
+Eli
+Miguel
+Antonio
+Parker
+Steven
+Alejandro
+Riley
+Richard
+Timothy
+Devin
+Jesse
+Victor
+Jake
+Joel
+Colin
+Kaleb
+Bryce
+Levi
+Oliver
+Oscar
+Vincent
+Ashton
+Cody
+Micah
+Preston
+Marcus
+Max
+Patrick
+Seth
+Jeremy
+Peyton
+Nolan
+Ivan
+Damian
+Maxwell
+Alan
+Kenneth
+Jonah
+Jorge
+Mark
+Giovanni
+Eduardo
+Grant
+Collin
+Gage
+Omar
+Emmanuel
+Trevor
+Edward
+Ricardo
+Cristian
+Nicolas
+Kayden
+George
+Jaxon
+Paul
+Braden
+Elias
+Andres
+Derek
+Garrett
+Tanner
+Malachi
+Conner
+Fernando
+Cesar
+Javier
+Miles
+Jaiden
+Alexis
+Leonardo
+Santiago
+Francisco
+Cayden
+Shane
+Edwin
+Hudson
+Travis
+Bryson
+Erick
+Jace
+Hector
+Josue
+Peter
+Jaylen
+Mario
+Manuel
+Abraham
+Grayson
+Damien
+Kaiden
+Spencer
+Stephen
+Edgar
+Wesley
+Shawn
+Trenton
+Jared
+Jeffrey
+Landen
+Johnathan
+Bradley
+Braxton
+Ryder
+Camden
+Roman
+Asher
+Brendan
+Maddox
+Sergio
+Israel
+Andy
+Lincoln
+Erik
+Donovan
+Raymond
+Avery
+Rylan
+Dalton
+Harrison
+Andre
+Martin
+Keegan
+Marco
+Jude
+Sawyer
+Dakota
+Leo
+Calvin
+Kai
+Drake
+Troy
+Zion
+Clayton
+Roberto
+Zane
+Gregory
+Tucker
+Rafael
+Kingston
+Dominick
+Ezekiel
+Griffin
+Devon
+Drew
+Lukas
+Johnny
+Ty
+Pedro
+Tyson
+Caiden
+Mateo
+Braylon
+Cash
+Aden
+Chance
+Taylor
+Marcos
+Maximus
+Ruben
+Emanuel
+Simon
+Corbin
+Brennan
+Dillon
+Skyler
+Myles
+Xander
+Jaxson
+Dawson
+Kameron
+Kyler
+Axel
+Colby
+Jonas
+Joaquin
+Payton
+Brock
+Frank
+Enrique
+Quinn
+Emilio
+Malik
+Grady
+Angelo
+Julio
+Derrick
+Raul
+Fabian
+Corey
+Gerardo
+Dante
+Ezra
+Armando
+Allen
+Theodore
+Gael
+Amir
+Zander
+Adan
+Maximilian
+Randy
+Easton
+Dustin
+Luca
+Phillip
+Julius
+Charlie
+Ronald
+Jakob
+Cade
+Brett
+Trent
+Silas
+Keith
+Emiliano
+Trey
+Jalen
+Darius
+Lane
+Jerry
+Jaime
+Scott
+Graham
+Weston
+Braydon
+Anderson
+Rodrigo
+Pablo
+Saul
+Danny
+Donald
+Elliot
+Brayan
+Dallas
+Lorenzo
+Casey
+Mitchell
+Alberto
+Tristen
+Rowan
+Jayson
+Gustavo
+Aaden
+Amari
+Dean
+Braeden
+Declan
+Chris
+Ismael
+Dane
+Louis
+Arturo
+Brenden
+Felix
+Jimmy
+Cohen
+Tony
+Holden
+Reid
+Abel
+Bennett
+Zackary
+Arthur
+Nehemiah
+Ricky
+Esteban
+Cruz
+Finn
+Mauricio
+Dennis
+Keaton
+Albert
+Marvin
+Mathew
+Larry
+Moises
+Issac
+Philip
+Quentin
+Curtis
+Greyson
+Jameson
+Everett
+Jayce
+Darren
+Elliott
+Uriel
+Alfredo
+Hugo
+Alec
+Jamari
+Marshall
+Walter
+Judah
+Jay
+Lance
+Beau
+Ali
+Landyn
+Yahir
+Phoenix
+Nickolas
+Kobe
+Bryant
+Maurice
+Russell
+Leland
+Colten
+Reed
+Davis
+Joe
+Ernesto
+Desmond
+Kade
+Reece
+Morgan
+Ramon
+Rocco
+Orlando
+Ryker
+Brodie
+Paxton
+Jacoby
+Douglas
+Kristopher
+Gary
+Lawrence
+Izaiah
+Solomon
+Nikolas
+Mekhi
+Justice
+Tate
+Jaydon
+Salvador
+Shaun
+Alvin
+Eddie
+Kane
+Davion
+Zachariah
+Dorian
+Titus
+Kellen
+Camron
+Isiah
+Javon
+Nasir
+Milo
+Johan
+Byron
+Jasper
+Jonathon
+Chad
+Marc
+Kelvin
+Chandler
+Sam
+Cory
+Deandre
+River
+Reese
+Roger
+Quinton
+Talon
+Romeo
+Franklin
+Noel
+Alijah
+Guillermo
+Gunner
+Damon
+Jadon
+Emerson
+Micheal
+Bruce
+Terry
+Kolton
+Melvin
+Beckett
+Porter
+August
+Brycen
+Dayton
+Jamarion
+Leonel
+Karson
+Zayden
+Keagan
+Carl
+Khalil
+Cristopher
+Nelson
+Braiden
+Moses
+Isaias
+Roy
+Triston
+Walker
+Kale
+Emma
+Isabella
+Emily
+Madison
+Ava
+Olivia
+Sophia
+Abigail
+Elizabeth
+Chloe
+Samantha
+Addison
+Natalie
+Mia
+Alexis
+Alyssa
+Hannah
+Ashley
+Ella
+Sarah
+Grace
+Taylor
+Brianna
+Lily
+Hailey
+Anna
+Victoria
+Kayla
+Lillian
+Lauren
+Kaylee
+Allison
+Savannah
+Nevaeh
+Gabriella
+Sofia
+Makayla
+Avery
+Riley
+Julia
+Leah
+Aubrey
+Jasmine
+Audrey
+Katherine
+Morgan
+Brooklyn
+Destiny
+Sydney
+Alexa
+Kylie
+Brooke
+Kaitlyn
+Evelyn
+Layla
+Madeline
+Kimberly
+Zoe
+Jessica
+Peyton
+Alexandra
+Claire
+Madelyn
+Maria
+Mackenzie
+Arianna
+Jocelyn
+Amelia
+Angelina
+Trinity
+Andrea
+Maya
+Valeria
+Sophie
+Rachel
+Vanessa
+Aaliyah
+Mariah
+Gabrielle
+Katelyn
+Ariana
+Bailey
+Camila
+Jennifer
+Melanie
+Gianna
+Charlotte
+Paige
+Autumn
+Payton
+Faith
+Sara
+Isabelle
+Caroline
+Genesis
+Isabel
+Mary
+Zoey
+Gracie
+Megan
+Haley
+Mya
+Michelle
+Molly
+Stephanie
+Nicole
+Jenna
+Natalia
+Sadie
+Jada
+Serenity
+Lucy
+Ruby
+Eva
+Kennedy
+Rylee
+Jayla
+Naomi
+Rebecca
+Lydia
+Daniela
+Bella
+Keira
+Adriana
+Lilly
+Hayden
+Miley
+Katie
+Jade
+Jordan
+Gabriela
+Amy
+Angela
+Melissa
+Valerie
+Giselle
+Diana
+Amanda
+Kate
+Laila
+Reagan
+Jordyn
+Kylee
+Danielle
+Briana
+Marley
+Leslie
+Kendall
+Catherine
+Liliana
+Mckenzie
+Jacqueline
+Ashlyn
+Reese
+Marissa
+London
+Juliana
+Shelby
+Cheyenne
+Angel
+Daisy
+Makenzie
+Miranda
+Erin
+Amber
+Alana
+Ellie
+Breanna
+Ana
+Mikayla
+Summer
+Piper
+Adrianna
+Jillian
+Sierra
+Jayden
+Sienna
+Alicia
+Lila
+Margaret
+Alivia
+Brooklynn
+Karen
+Violet
+Sabrina
+Stella
+Aniyah
+Annabelle
+Alexandria
+Kathryn
+Skylar
+Aliyah
+Delilah
+Julianna
+Kelsey
+Khloe
+Carly
+Amaya
+Mariana
+Christina
+Alondra
+Tessa
+Eliana
+Bianca
+Jazmin
+Clara
+Vivian
+Josephine
+Delaney
+Scarlett
+Elena
+Cadence
+Alexia
+Maggie
+Laura
+Nora
+Ariel
+Elise
+Nadia
+Mckenna
+Chelsea
+Lyla
+Alaina
+Jasmin
+Hope
+Leila
+Caitlyn
+Cassidy
+Makenna
+Allie
+Izabella
+Eden
+Callie
+Haylee
+Caitlin
+Kendra
+Karina
+Kyra
+Kayleigh
+Addyson
+Kiara
+Jazmine
+Karla
+Camryn
+Alina
+Lola
+Kyla
+Kelly
+Fatima
+Tiffany
+Kira
+Crystal
+Mallory
+Esmeralda
+Alejandra
+Eleanor
+Angelica
+Jayda
+Abby
+Kara
+Veronica
+Carmen
+Jamie
+Ryleigh
+Valentina
+Allyson
+Dakota
+Kamryn
+Courtney
+Cecilia
+Madeleine
+Aniya
+Alison
+Esther
+Heaven
+Aubree
+Lindsey
+Leilani
+Nina
+Melody
+Macy
+Ashlynn
+Joanna
+Cassandra
+Alayna
+Kaydence
+Madilyn
+Aurora
+Heidi
+Emerson
+Kimora
+Madalyn
+Erica
+Josie
+Katelynn
+Guadalupe
+Harper
+Ivy
+Lexi
+Camille
+Savanna
+Dulce
+Daniella
+Lucia
+Emely
+Joselyn
+Kiley
+Kailey
+Miriam
+Cynthia
+Rihanna
+Georgia
+Rylie
+Harmony
+Kiera
+Kyleigh
+Monica
+Bethany
+Kaylie
+Cameron
+Teagan
+Cora
+Brynn
+Ciara
+Genevieve
+Alice
+Maddison
+Eliza
+Tatiana
+Jaelyn
+Erika
+Ximena
+April
+Marely
+Julie
+Danica
+Presley
+Brielle
+Julissa
+Angie
+Iris
+Brenda
+Hazel
+Rose
+Malia
+Shayla
+Fiona
+Phoebe
+Nayeli
+Paola
+Kaelyn
+Selena
+Audrina
+Rebekah
+Carolina
+Janiyah
+Michaela
+Penelope
+Janiya
+Anastasia
+Adeline
+Ruth
+Sasha
+Denise
+Holly
+Madisyn
+Hanna
+Tatum
+Marlee
+Nataly
+Helen
+Janelle
+Lizbeth
+Serena
+Anya
+Jaslene
+Kaylin
+Jazlyn
+Nancy
+Lindsay
+Desiree
+Hayley
+Itzel
+Imani
+Madelynn
+Asia
+Kadence
+Madyson
+Talia
+Jane
+Kayden
+Annie
+Amari
+Bridget
+Raegan
+Jadyn
+Celeste
+Jimena
+Luna
+Yasmin
+Emilia
+Annika
+Estrella
+Sarai
+Lacey
+Ayla
+Alessandra
+Willow
+Nyla
+Dayana
+Lilah
+Lilliana
+Natasha
+Hadley
+Harley
+Priscilla
+Claudia
+Allisson
+Baylee
+Brenna
+Brittany
+Skyler
+Fernanda
+Danna
+Melany
+Cali
+Lia
+Macie
+Lyric
+Logan
+Gloria
+Lana
+Mylee
+Cindy
+Lilian
+Amira
+Anahi
+Alissa
+Anaya
+Lena
+Ainsley
+Sandra
+Noelle
+Marisol
+Meredith
+Kailyn
+Lesly
+Johanna
+Diamond
+Evangeline
+Juliet
+Kathleen
+Meghan
+Paisley
+Athena
+Hailee
+Rosa
+Wendy
+Emilee
+Sage
+Alanna
+Elaina
+Cara
+Nia
+Paris
+Casey
+Dana
+Emery
+Rowan
+Aubrie
+Kaitlin
+Jaden
+Kenzie
+Kiana
+Viviana
+Norah
+Lauryn
+Perla
+Amiyah
+Alyson
+Rachael
+Shannon
+Aileen
+Miracle
+Lillie
+Danika
+Heather
+Kassidy
+Taryn
+Tori
+Francesca
+Kristen
+Amya
+Elle
+Kristina
+Cheyanne
+Haylie
+Patricia
+Anne
+Samara
diff --git a/config/names/first_female.txt b/config/names/first_female.txt
index b500f027efc..69057409915 100644
--- a/config/names/first_female.txt
+++ b/config/names/first_female.txt
@@ -1,807 +1,807 @@
-Aida
-Alexa
-Alexandria
-Alexis
-Alexus
-Alfreda
-Alisa
-Alisya
-Allegra
-Allegria
-Alma
-Alysha
-Alyssia
-Amaryllis
-Ambrosine
-Angel
-Anjelica
-Anne
-Arabella
-Arielle
-Arleen
-Ashlie
-Astor
-Aubrey
-Avalona
-Averill
-Barbara
-Beckah
-Becky
-Bernice
-Bethney
-Betsy
-Bidelia
-Breanne
-Brittani
-Brooke
-Cadence
-Calanthia
-Caleigh
-Candace
-Candice
-Carly
-Carlyle
-Carolyn
-Carry
-Caryl
-Cecily
-Cherette
-Cheri
-Cherry
-Christa
-Christiana
-Christobelle
-Claribel
-Clover
-Coreen
-Corrine
-Cynthia
-Dalya
-Daniella
-Daria
-Dayna
-Debbi
-Dee
-Deena
-Della
-Delma
-Denys
-Diamond
-Dina
-Dolores
-Donella
-Donna
-Dorothy
-Dortha
-Easter
-Ebba
-Effie
-Elizabeth
-Elle
-Emma
-Ermintrude
-Esmeralda
-Eugenia
-Euphemia
-Eustace
-Eveleen
-Evelina
-Fay
-Floella
-Flora
-Flossie
-Fortune
-Genette
-Georgene
-Geraldine
-Gervase
-Gina
-Ginger
-Gladwyn
-Glenna
-Greta
-Griselda
-Gwenda
-Gwenevere
-Hadley
-Haidee
-Hailey
-Hal
-Haleigh
-Hayley
-Heather
-Hedley
-Helen
-Hepsie
-Hortensia
-Iantha
-Ileen
-Innocent
-Irene
-Jacaline
-Jacquetta
-Jacqui
-Jakki
-Jalen
-Janelle
-Janette
-Janie
-Janina
-Janine
-Jasmine
-Jaylee
-Jaynie
-Jeanna
-Jeannie
-Jeannine
-Jenifer
-Jennie
-Jera
-Jere
-Jeri
-Jillian
-Jillie
-Joetta
-Joi
-Joni
-Josepha
-Joye
-Julia
-July
-Kaelea
-Kaleigh
-Karenza
-Karly
-Karyn
-Kat
-Kathy
-Katlyn
-Kayleigh
-Keegan
-Keira
-Keith
-Kellie
-Kerena
-Kerensa
-Keturah
-Kimberley
-Lacy
-Lakeisha
-Lalla
-Latanya
-Laurencia
-Laurissa
-Leeann
-Leia
-Lessie
-Leta
-Lexia
-Lexus
-Lindsie
-Lindy
-Lockie
-Lori
-Lorin
-Luanne
-Lucian
-Luvenia
-Lyndsey
-Lynn
-Lynsey
-Lynwood
-Mabelle
-Macey
-Madyson
-Maegan
-Marcia
-Mariabella
-Marilene
-Marion
-Marje
-Marjory
-Marlowe
-Marlyn
-Marshall
-Maryann
-Maudie
-Maurene
-May
-Merideth
-Merrilyn
-Meryl
-Minnie
-Monna
-Muriel
-Mya
-Myriam
-Myrtie
-Nan
-Nelle
-Nena
-Nerissa
-Netta
-Nettie
-Nonie
-Nova
-Nowell
-Nydia
-Olive
-Oralie
-Patience
-Pauleen
-Pene
-Peregrine
-Pheobe
-Phoebe
-Phyliss
-Phyllida
-Phyllis
-Porsche
-Prosper
-Prue
-Quanah
-Quiana
-Raelene
-Rain
-Randa
-Randal
-Rebeckah
-Reene
-Renie
-Rexana
-Rhetta
-Ronnette
-Rosemary
-Rubye
-Sabella
-Sachie
-Sally
-Saranna
-Seneca
-Shana
-Shanika
-Shannah
-Shannon
-Shantae
-Sharalyn
-Sharla
-Sheri
-Sherie
-Sherill
-Sherri
-Sissy
-Sophie
-Star
-Steph
-Stephany
-Sue
-Sukie
-Sunshine
-Susanna
-Susannah
-Suzan
-Suzy
-Sydney
-Tamika
-Tania
-Tansy
-Tatyanna
-Tiffany
-Tolly
-Topaz
-Tori
-Tracee
-Tracey
-Ulyssa
-Valary
-Verna
-Vinnie
-Vivyan
-Wendi
-Wisdom
-Wynonna
-Wynter
-Yasmin
-Yolanda
-Ysabel
-Zelda
-Zune
-Emma
-Isabella
-Emily
-Madison
-Ava
-Olivia
-Sophia
-Abigail
-Elizabeth
-Chloe
-Samantha
-Addison
-Natalie
-Mia
-Alexis
-Alyssa
-Hannah
-Ashley
-Ella
-Sarah
-Grace
-Taylor
-Brianna
-Lily
-Hailey
-Anna
-Victoria
-Kayla
-Lillian
-Lauren
-Kaylee
-Allison
-Savannah
-Nevaeh
-Gabriella
-Sofia
-Makayla
-Avery
-Riley
-Julia
-Leah
-Aubrey
-Jasmine
-Audrey
-Katherine
-Morgan
-Brooklyn
-Destiny
-Sydney
-Alexa
-Kylie
-Brooke
-Kaitlyn
-Evelyn
-Layla
-Madeline
-Kimberly
-Zoe
-Jessica
-Peyton
-Alexandra
-Claire
-Madelyn
-Maria
-Mackenzie
-Arianna
-Jocelyn
-Amelia
-Angelina
-Trinity
-Andrea
-Maya
-Valeria
-Sophie
-Rachel
-Vanessa
-Aaliyah
-Mariah
-Gabrielle
-Katelyn
-Ariana
-Bailey
-Camila
-Jennifer
-Melanie
-Gianna
-Charlotte
-Paige
-Autumn
-Payton
-Faith
-Sara
-Isabelle
-Caroline
-Isabel
-Mary
-Zoey
-Gracie
-Megan
-Haley
-Mya
-Michelle
-Molly
-Stephanie
-Nicole
-Jenna
-Natalia
-Sadie
-Jada
-Serenity
-Lucy
-Ruby
-Eva
-Kennedy
-Rylee
-Jayla
-Naomi
-Rebecca
-Lydia
-Daniela
-Bella
-Keira
-Adriana
-Lilly
-Hayden
-Miley
-Katie
-Jade
-Jordan
-Gabriela
-Amy
-Angela
-Melissa
-Valerie
-Giselle
-Diana
-Amanda
-Kate
-Laila
-Reagan
-Jordyn
-Kylee
-Danielle
-Briana
-Marley
-Leslie
-Kendall
-Catherine
-Liliana
-Mckenzie
-Jacqueline
-Ashlyn
-Reese
-Marissa
-London
-Juliana
-Shelby
-Cheyenne
-Angel
-Daisy
-Makenzie
-Miranda
-Erin
-Amber
-Alana
-Ellie
-Breanna
-Ana
-Mikayla
-Summer
-Piper
-Adrianna
-Jillian
-Sierra
-Jayden
-Sienna
-Alicia
-Lila
-Margaret
-Alivia
-Brooklynn
-Karen
-Violet
-Sabrina
-Stella
-Aniyah
-Annabelle
-Alexandria
-Kathryn
-Skylar
-Aliyah
-Delilah
-Julianna
-Kelsey
-Khloe
-Carly
-Amaya
-Mariana
-Christina
-Alondra
-Tessa
-Eliana
-Bianca
-Jazmin
-Clara
-Vivian
-Josephine
-Delaney
-Scarlett
-Elena
-Cadence
-Alexia
-Maggie
-Laura
-Nora
-Ariel
-Elise
-Nadia
-Mckenna
-Chelsea
-Lyla
-Alaina
-Jasmin
-Hope
-Leila
-Caitlyn
-Cassidy
-Makenna
-Allie
-Izabella
-Eden
-Callie
-Haylee
-Caitlin
-Kendra
-Karina
-Kyra
-Kayleigh
-Addyson
-Kiara
-Jazmine
-Karla
-Camryn
-Alina
-Lola
-Kyla
-Kelly
-Fatima
-Tiffany
-Kira
-Crystal
-Mallory
-Esmeralda
-Alejandra
-Eleanor
-Angelica
-Jayda
-Abby
-Kara
-Veronica
-Carmen
-Jamie
-Ryleigh
-Valentina
-Allyson
-Dakota
-Kamryn
-Courtney
-Cecilia
-Madeleine
-Aniya
-Alison
-Esther
-Heaven
-Aubree
-Lindsey
-Leilani
-Nina
-Melody
-Macy
-Ashlynn
-Joanna
-Cassandra
-Alayna
-Kaydence
-Madilyn
-Aurora
-Heidi
-Emerson
-Kimora
-Madalyn
-Erica
-Josie
-Katelynn
-Guadalupe
-Harper
-Ivy
-Lexi
-Camille
-Savanna
-Dulce
-Daniella
-Lucia
-Emely
-Joselyn
-Kiley
-Kailey
-Miriam
-Cynthia
-Rihanna
-Georgia
-Rylie
-Harmony
-Kiera
-Kyleigh
-Monica
-Bethany
-Kaylie
-Cameron
-Teagan
-Cora
-Brynn
-Ciara
-Genevieve
-Alice
-Maddison
-Eliza
-Tatiana
-Jaelyn
-Erika
-Ximena
-April
-Marely
-Julie
-Danica
-Presley
-Brielle
-Julissa
-Angie
-Iris
-Brenda
-Hazel
-Rose
-Malia
-Shayla
-Fiona
-Phoebe
-Nayeli
-Paola
-Kaelyn
-Selena
-Audrina
-Rebekah
-Carolina
-Janiyah
-Michaela
-Penelope
-Janiya
-Anastasia
-Adeline
-Ruth
-Sasha
-Denise
-Holly
-Madisyn
-Hanna
-Tatum
-Marlee
-Nataly
-Helen
-Janelle
-Lizbeth
-Serena
-Anya
-Jaslene
-Kaylin
-Jazlyn
-Nancy
-Lindsay
-Desiree
-Hayley
-Itzel
-Imani
-Madelynn
-Asia
-Kadence
-Madyson
-Talia
-Jane
-Kayden
-Annie
-Amari
-Bridget
-Raegan
-Jadyn
-Celeste
-Jimena
-Luna
-Yasmin
-Emilia
-Annika
-Estrella
-Sarai
-Lacey
-Ayla
-Alessandra
-Willow
-Nyla
-Dayana
-Lilah
-Lilliana
-Natasha
-Hadley
-Harley
-Priscilla
-Claudia
-Allisson
-Baylee
-Brenna
-Brittany
-Skyler
-Fernanda
-Danna
-Melany
-Cali
-Lia
-Macie
-Lyric
-Logan
-Gloria
-Lana
-Mylee
-Cindy
-Lilian
-Amira
-Anahi
-Alissa
-Anaya
-Lena
-Ainsley
-Sandra
-Noelle
-Marisol
-Meredith
-Kailyn
-Lesly
-Johanna
-Diamond
-Evangeline
-Juliet
-Kathleen
-Meghan
-Paisley
-Athena
-Hailee
-Rosa
-Wendy
-Emilee
-Sage
-Alanna
-Elaina
-Cara
-Nia
-Paris
-Casey
-Dana
-Emery
-Rowan
-Aubrie
-Kaitlin
-Jaden
-Kenzie
-Kiana
-Viviana
-Norah
-Lauryn
-Perla
-Amiyah
-Alyson
-Rachael
-Shannon
-Aileen
-Miracle
-Lillie
-Danika
-Heather
-Kassidy
-Taryn
-Tori
-Francesca
-Kristen
-Amya
-Elle
-Kristina
-Cheyanne
-Haylie
-Patricia
-Anne
+Aida
+Alexa
+Alexandria
+Alexis
+Alexus
+Alfreda
+Alisa
+Alisya
+Allegra
+Allegria
+Alma
+Alysha
+Alyssia
+Amaryllis
+Ambrosine
+Angel
+Anjelica
+Anne
+Arabella
+Arielle
+Arleen
+Ashlie
+Astor
+Aubrey
+Avalona
+Averill
+Barbara
+Beckah
+Becky
+Bernice
+Bethney
+Betsy
+Bidelia
+Breanne
+Brittani
+Brooke
+Cadence
+Calanthia
+Caleigh
+Candace
+Candice
+Carly
+Carlyle
+Carolyn
+Carry
+Caryl
+Cecily
+Cherette
+Cheri
+Cherry
+Christa
+Christiana
+Christobelle
+Claribel
+Clover
+Coreen
+Corrine
+Cynthia
+Dalya
+Daniella
+Daria
+Dayna
+Debbi
+Dee
+Deena
+Della
+Delma
+Denys
+Diamond
+Dina
+Dolores
+Donella
+Donna
+Dorothy
+Dortha
+Easter
+Ebba
+Effie
+Elizabeth
+Elle
+Emma
+Ermintrude
+Esmeralda
+Eugenia
+Euphemia
+Eustace
+Eveleen
+Evelina
+Fay
+Floella
+Flora
+Flossie
+Fortune
+Genette
+Georgene
+Geraldine
+Gervase
+Gina
+Ginger
+Gladwyn
+Glenna
+Greta
+Griselda
+Gwenda
+Gwenevere
+Hadley
+Haidee
+Hailey
+Hal
+Haleigh
+Hayley
+Heather
+Hedley
+Helen
+Hepsie
+Hortensia
+Iantha
+Ileen
+Innocent
+Irene
+Jacaline
+Jacquetta
+Jacqui
+Jakki
+Jalen
+Janelle
+Janette
+Janie
+Janina
+Janine
+Jasmine
+Jaylee
+Jaynie
+Jeanna
+Jeannie
+Jeannine
+Jenifer
+Jennie
+Jera
+Jere
+Jeri
+Jillian
+Jillie
+Joetta
+Joi
+Joni
+Josepha
+Joye
+Julia
+July
+Kaelea
+Kaleigh
+Karenza
+Karly
+Karyn
+Kat
+Kathy
+Katlyn
+Kayleigh
+Keegan
+Keira
+Keith
+Kellie
+Kerena
+Kerensa
+Keturah
+Kimberley
+Lacy
+Lakeisha
+Lalla
+Latanya
+Laurencia
+Laurissa
+Leeann
+Leia
+Lessie
+Leta
+Lexia
+Lexus
+Lindsie
+Lindy
+Lockie
+Lori
+Lorin
+Luanne
+Lucian
+Luvenia
+Lyndsey
+Lynn
+Lynsey
+Lynwood
+Mabelle
+Macey
+Madyson
+Maegan
+Marcia
+Mariabella
+Marilene
+Marion
+Marje
+Marjory
+Marlowe
+Marlyn
+Marshall
+Maryann
+Maudie
+Maurene
+May
+Merideth
+Merrilyn
+Meryl
+Minnie
+Monna
+Muriel
+Mya
+Myriam
+Myrtie
+Nan
+Nelle
+Nena
+Nerissa
+Netta
+Nettie
+Nonie
+Nova
+Nowell
+Nydia
+Olive
+Oralie
+Patience
+Pauleen
+Pene
+Peregrine
+Pheobe
+Phoebe
+Phyliss
+Phyllida
+Phyllis
+Porsche
+Prosper
+Prue
+Quanah
+Quiana
+Raelene
+Rain
+Randa
+Randal
+Rebeckah
+Reene
+Renie
+Rexana
+Rhetta
+Ronnette
+Rosemary
+Rubye
+Sabella
+Sachie
+Sally
+Saranna
+Seneca
+Shana
+Shanika
+Shannah
+Shannon
+Shantae
+Sharalyn
+Sharla
+Sheri
+Sherie
+Sherill
+Sherri
+Sissy
+Sophie
+Star
+Steph
+Stephany
+Sue
+Sukie
+Sunshine
+Susanna
+Susannah
+Suzan
+Suzy
+Sydney
+Tamika
+Tania
+Tansy
+Tatyanna
+Tiffany
+Tolly
+Topaz
+Tori
+Tracee
+Tracey
+Ulyssa
+Valary
+Verna
+Vinnie
+Vivyan
+Wendi
+Wisdom
+Wynonna
+Wynter
+Yasmin
+Yolanda
+Ysabel
+Zelda
+Zune
+Emma
+Isabella
+Emily
+Madison
+Ava
+Olivia
+Sophia
+Abigail
+Elizabeth
+Chloe
+Samantha
+Addison
+Natalie
+Mia
+Alexis
+Alyssa
+Hannah
+Ashley
+Ella
+Sarah
+Grace
+Taylor
+Brianna
+Lily
+Hailey
+Anna
+Victoria
+Kayla
+Lillian
+Lauren
+Kaylee
+Allison
+Savannah
+Nevaeh
+Gabriella
+Sofia
+Makayla
+Avery
+Riley
+Julia
+Leah
+Aubrey
+Jasmine
+Audrey
+Katherine
+Morgan
+Brooklyn
+Destiny
+Sydney
+Alexa
+Kylie
+Brooke
+Kaitlyn
+Evelyn
+Layla
+Madeline
+Kimberly
+Zoe
+Jessica
+Peyton
+Alexandra
+Claire
+Madelyn
+Maria
+Mackenzie
+Arianna
+Jocelyn
+Amelia
+Angelina
+Trinity
+Andrea
+Maya
+Valeria
+Sophie
+Rachel
+Vanessa
+Aaliyah
+Mariah
+Gabrielle
+Katelyn
+Ariana
+Bailey
+Camila
+Jennifer
+Melanie
+Gianna
+Charlotte
+Paige
+Autumn
+Payton
+Faith
+Sara
+Isabelle
+Caroline
+Isabel
+Mary
+Zoey
+Gracie
+Megan
+Haley
+Mya
+Michelle
+Molly
+Stephanie
+Nicole
+Jenna
+Natalia
+Sadie
+Jada
+Serenity
+Lucy
+Ruby
+Eva
+Kennedy
+Rylee
+Jayla
+Naomi
+Rebecca
+Lydia
+Daniela
+Bella
+Keira
+Adriana
+Lilly
+Hayden
+Miley
+Katie
+Jade
+Jordan
+Gabriela
+Amy
+Angela
+Melissa
+Valerie
+Giselle
+Diana
+Amanda
+Kate
+Laila
+Reagan
+Jordyn
+Kylee
+Danielle
+Briana
+Marley
+Leslie
+Kendall
+Catherine
+Liliana
+Mckenzie
+Jacqueline
+Ashlyn
+Reese
+Marissa
+London
+Juliana
+Shelby
+Cheyenne
+Angel
+Daisy
+Makenzie
+Miranda
+Erin
+Amber
+Alana
+Ellie
+Breanna
+Ana
+Mikayla
+Summer
+Piper
+Adrianna
+Jillian
+Sierra
+Jayden
+Sienna
+Alicia
+Lila
+Margaret
+Alivia
+Brooklynn
+Karen
+Violet
+Sabrina
+Stella
+Aniyah
+Annabelle
+Alexandria
+Kathryn
+Skylar
+Aliyah
+Delilah
+Julianna
+Kelsey
+Khloe
+Carly
+Amaya
+Mariana
+Christina
+Alondra
+Tessa
+Eliana
+Bianca
+Jazmin
+Clara
+Vivian
+Josephine
+Delaney
+Scarlett
+Elena
+Cadence
+Alexia
+Maggie
+Laura
+Nora
+Ariel
+Elise
+Nadia
+Mckenna
+Chelsea
+Lyla
+Alaina
+Jasmin
+Hope
+Leila
+Caitlyn
+Cassidy
+Makenna
+Allie
+Izabella
+Eden
+Callie
+Haylee
+Caitlin
+Kendra
+Karina
+Kyra
+Kayleigh
+Addyson
+Kiara
+Jazmine
+Karla
+Camryn
+Alina
+Lola
+Kyla
+Kelly
+Fatima
+Tiffany
+Kira
+Crystal
+Mallory
+Esmeralda
+Alejandra
+Eleanor
+Angelica
+Jayda
+Abby
+Kara
+Veronica
+Carmen
+Jamie
+Ryleigh
+Valentina
+Allyson
+Dakota
+Kamryn
+Courtney
+Cecilia
+Madeleine
+Aniya
+Alison
+Esther
+Heaven
+Aubree
+Lindsey
+Leilani
+Nina
+Melody
+Macy
+Ashlynn
+Joanna
+Cassandra
+Alayna
+Kaydence
+Madilyn
+Aurora
+Heidi
+Emerson
+Kimora
+Madalyn
+Erica
+Josie
+Katelynn
+Guadalupe
+Harper
+Ivy
+Lexi
+Camille
+Savanna
+Dulce
+Daniella
+Lucia
+Emely
+Joselyn
+Kiley
+Kailey
+Miriam
+Cynthia
+Rihanna
+Georgia
+Rylie
+Harmony
+Kiera
+Kyleigh
+Monica
+Bethany
+Kaylie
+Cameron
+Teagan
+Cora
+Brynn
+Ciara
+Genevieve
+Alice
+Maddison
+Eliza
+Tatiana
+Jaelyn
+Erika
+Ximena
+April
+Marely
+Julie
+Danica
+Presley
+Brielle
+Julissa
+Angie
+Iris
+Brenda
+Hazel
+Rose
+Malia
+Shayla
+Fiona
+Phoebe
+Nayeli
+Paola
+Kaelyn
+Selena
+Audrina
+Rebekah
+Carolina
+Janiyah
+Michaela
+Penelope
+Janiya
+Anastasia
+Adeline
+Ruth
+Sasha
+Denise
+Holly
+Madisyn
+Hanna
+Tatum
+Marlee
+Nataly
+Helen
+Janelle
+Lizbeth
+Serena
+Anya
+Jaslene
+Kaylin
+Jazlyn
+Nancy
+Lindsay
+Desiree
+Hayley
+Itzel
+Imani
+Madelynn
+Asia
+Kadence
+Madyson
+Talia
+Jane
+Kayden
+Annie
+Amari
+Bridget
+Raegan
+Jadyn
+Celeste
+Jimena
+Luna
+Yasmin
+Emilia
+Annika
+Estrella
+Sarai
+Lacey
+Ayla
+Alessandra
+Willow
+Nyla
+Dayana
+Lilah
+Lilliana
+Natasha
+Hadley
+Harley
+Priscilla
+Claudia
+Allisson
+Baylee
+Brenna
+Brittany
+Skyler
+Fernanda
+Danna
+Melany
+Cali
+Lia
+Macie
+Lyric
+Logan
+Gloria
+Lana
+Mylee
+Cindy
+Lilian
+Amira
+Anahi
+Alissa
+Anaya
+Lena
+Ainsley
+Sandra
+Noelle
+Marisol
+Meredith
+Kailyn
+Lesly
+Johanna
+Diamond
+Evangeline
+Juliet
+Kathleen
+Meghan
+Paisley
+Athena
+Hailee
+Rosa
+Wendy
+Emilee
+Sage
+Alanna
+Elaina
+Cara
+Nia
+Paris
+Casey
+Dana
+Emery
+Rowan
+Aubrie
+Kaitlin
+Jaden
+Kenzie
+Kiana
+Viviana
+Norah
+Lauryn
+Perla
+Amiyah
+Alyson
+Rachael
+Shannon
+Aileen
+Miracle
+Lillie
+Danika
+Heather
+Kassidy
+Taryn
+Tori
+Francesca
+Kristen
+Amya
+Elle
+Kristina
+Cheyanne
+Haylie
+Patricia
+Anne
Samara
\ No newline at end of file
diff --git a/config/names/first_male.txt b/config/names/first_male.txt
index f2b03e16868..ebb8f6d2862 100644
--- a/config/names/first_male.txt
+++ b/config/names/first_male.txt
@@ -1,725 +1,725 @@
-Abel
-Adolph
-Alan
-Alden
-Alex
-Alfred
-Alger
-Allen
-Amos
-Apple
-Archie
-Arnie
-Art
-Arthur
-Baldric
-Bartholomew
-Bill
-Blake
-Brayden
-Brendan
-Brock
-Bronte
-Brick
-Bruce
-Bryce
-Buck
-Burt
-Butch
-Byrne
-Byron
-Camryn
-Carl
-Carter
-Casimir
-Cassian
-Charles
-Charlton
-Chip
-Clark
-Claudius
-Clement
-Cleveland
-Cliff
-Clinton
-Cletus
-Collin
-Crush
-Cy
-Damian
-Danny
-Darcey
-Darell
-Darin
-Deangelo
-Denholm
-Desmond
-Devin
-Dirk
-Dominic
-Donny
-Driscoll
-Duke
-Duncan
-Edgar
-Eliot
-Eliott
-Elric
-Elwood
-Emmanuel
-Fenton
-Fitz
-Flick
-Flint
-Flip
-Francis
-Frank
-Frankie
-Fridge
-Fulton
-Gannon
-Garret
-Gary
-Goddard
-Godwin
-Goodwin
-Gordon
-Graeme
-Grandpa
-Gratian
-Grendel
-Han
-Harry
-Hartley
-Harvey
-Henderson
-Holden
-Homer
-Horatio
-Huffie
-Hungry
-Hugo
-Irvine
-Jacob
-Jake
-Jamar
-Jamie
-Jamison
-Janel
-Jaydon
-Jaye
-Jayne
-Jean-Luc
-Jeb
-Jed
-Jemmy
-Jermaine
-Jerrie
-Jim
-Joachim
-Joey
-Johnathan
-John
-Johnny
-Jonathon
-Josh
-Josiah
-Kennard
-Keziah
-Lando
-Lanny
-Launce
-Leland
-Lennox
-Lenny
-Leonard
-Leroy
-Lief
-Linden
-Linton
-Lorde
-Loreto
-Lou
-Lucas
-Luke
-Malachi
-Malcolm
-Manley
-Marion
-Max
-Maynard
-Melvyn
-Michael
-Mike
-Milton
-Montague
-Monte
-Monty
-Nat
-Nathaniel
-Nick
-Nikolas
-Noah
-Opie
-Osbert
-Osborn
-Osborne
-Osmund
-Oswald
-Paget
-Patrick
-Patton
-Percival
-Persh
-Rastus
-Raymond
-Rayner
-Reuben
-Reynard
-Richard
-Rodger
-Roger
-Romayne
-Roscoe
-Roswell
-Royce
-Rube
-Rusty
-Sal
-Sawyer
-Scotty
-Seymour
-Shane
-Shiloh
-Smoke
-Simon
-Sloan
-Sorrel
-Spike
-Sybil
-Syd
-Tamsin
-Taylor
-Tel
-Terrell
-Tim
-Timothy
-Todd
-Trip
-Tye
-Uland
-Ulric
-Vaughn
-Vince
-Vinny
-Walter
-Ward
-Warner
-Wayne
-Whitaker
-William
-Willy
-Woodrow
-Zack
-Zane
-Zeke
-Jacob
-Michael
-Ethan
-Joshua
-Daniel
-Alexander
-Anthony
-William
-Christopher
-Matthew
-Jayden
-Andrew
-Joseph
-David
-Noah
-Aiden
-James
-Ryan
-Logan
-John
-Nathan
-Elijah
-Christian
-Gabriel
-Benjamin
-Jonathan
-Tyler
-Samuel
-Nicholas
-Gavin
-Dylan
-Jackson
-Brandon
-Caleb
-Mason
-Angel
-Isaac
-Evan
-Jack
-Kevin
-Jose
-Isaiah
-Luke
-Landon
-Justin
-Lucas
-Zachary
-Jordan
-Robert
-Aaron
-Brayden
-Thomas
-Cameron
-Hunter
-Austin
-Adrian
-Connor
-Owen
-Aidan
-Jason
-Julian
-Wyatt
-Charles
-Luis
-Carter
-Juan
-Chase
-Diego
-Jeremiah
-Brody
-Xavier
-Adam
-Carlos
-Sebastian
-Liam
-Hayden
-Nathaniel
-Henry
-Jesus
-Ian
-Tristan
-Bryan
-Sean
-Cole
-Alex
-Eric
-Brian
-Jaden
-Carson
-Blake
-Ayden
-Cooper
-Dominic
-Brady
-Caden
-Josiah
-Kyle
-Colton
-Kaden
-Eli
-Miguel
-Antonio
-Parker
-Steven
-Alejandro
-Riley
-Richard
-Timothy
-Devin
-Jesse
-Victor
-Jake
-Joel
-Colin
-Kaleb
-Bryce
-Levi
-Oliver
-Oscar
-Vincent
-Ashton
-Cody
-Micah
-Preston
-Marcus
-Max
-Patrick
-Seth
-Jeremy
-Peyton
-Nolan
-Ivan
-Damian
-Maxwell
-Alan
-Kenneth
-Jonah
-Jorge
-Mark
-Giovanni
-Eduardo
-Grant
-Collin
-Gage
-Omar
-Emmanuel
-Trevor
-Edward
-Ricardo
-Cristian
-Nicolas
-Kayden
-George
-Jaxon
-Paul
-Braden
-Elias
-Andres
-Derek
-Garrett
-Tanner
-Malachi
-Conner
-Fernando
-Cesar
-Javier
-Miles
-Jaiden
-Alexis
-Leonardo
-Santiago
-Francisco
-Cayden
-Shane
-Edwin
-Hudson
-Travis
-Bryson
-Erick
-Jace
-Hector
-Josue
-Peter
-Jaylen
-Mario
-Manuel
-Abraham
-Grayson
-Damien
-Kaiden
-Spencer
-Stephen
-Edgar
-Wesley
-Shawn
-Trenton
-Jared
-Jeffrey
-Landen
-Johnathan
-Bradley
-Braxton
-Ryder
-Camden
-Roman
-Asher
-Brendan
-Maddox
-Sergio
-Israel
-Andy
-Lincoln
-Erik
-Donovan
-Raymond
-Avery
-Rylan
-Dalton
-Harrison
-Andre
-Martin
-Keegan
-Marco
-Jude
-Sawyer
-Dakota
-Leo
-Calvin
-Kai
-Drake
-Troy
-Zion
-Clayton
-Roberto
-Zane
-Gregory
-Tucker
-Rafael
-Kingston
-Dominick
-Ezekiel
-Griffin
-Devon
-Drew
-Lukas
-Johnny
-Ty
-Pedro
-Tyson
-Caiden
-Mateo
-Braylon
-Cash
-Aden
-Chance
-Taylor
-Marcos
-Maximus
-Ruben
-Emanuel
-Simon
-Corbin
-Brennan
-Dillon
-Skyler
-Myles
-Xander
-Jaxson
-Dawson
-Kameron
-Kyler
-Axel
-Colby
-Jonas
-Joaquin
-Payton
-Brock
-Frank
-Enrique
-Quinn
-Emilio
-Malik
-Grady
-Angelo
-Julio
-Derrick
-Raul
-Fabian
-Corey
-Gerardo
-Dante
-Ezra
-Armando
-Allen
-Theodore
-Gael
-Amir
-Zander
-Adan
-Maximilian
-Randy
-Easton
-Dustin
-Luca
-Phillip
-Julius
-Charlie
-Ronald
-Jakob
-Cade
-Brett
-Trent
-Silas
-Keith
-Emiliano
-Trey
-Jalen
-Darius
-Lane
-Jerry
-Jaime
-Scott
-Graham
-Weston
-Braydon
-Anderson
-Rodrigo
-Pablo
-Saul
-Danny
-Donald
-Elliot
-Brayan
-Dallas
-Lorenzo
-Casey
-Mitchell
-Alberto
-Tristen
-Rowan
-Jayson
-Gustavo
-Aaden
-Amari
-Dean
-Braeden
-Declan
-Chris
-Ismael
-Dane
-Louis
-Arturo
-Brenden
-Felix
-Jimmy
-Cohen
-Tony
-Holden
-Reid
-Abel
-Bennett
-Zackary
-Arthur
-Nehemiah
-Ricky
-Esteban
-Cruz
-Finn
-Mauricio
-Dennis
-Keaton
-Albert
-Marvin
-Mathew
-Larry
-Moises
-Issac
-Philip
-Quentin
-Curtis
-Greyson
-Jameson
-Everett
-Jayce
-Darren
-Elliott
-Uriel
-Alfredo
-Hugo
-Alec
-Jamari
-Marshall
-Walter
-Judah
-Jay
-Lance
-Beau
-Ali
-Landyn
-Yahir
-Phoenix
-Nickolas
-Kobe
-Bryant
-Maurice
-Russell
-Leland
-Colten
-Reed
-Davis
-Joe
-Ernesto
-Desmond
-Kade
-Reece
-Morgan
-Ramon
-Rocco
-Orlando
-Ryker
-Brodie
-Paxton
-Jacoby
-Douglas
-Kristopher
-Gary
-Lawrence
-Izaiah
-Solomon
-Nikolas
-Mekhi
-Justice
-Tate
-Jaydon
-Salvador
-Shaun
-Alvin
-Eddie
-Kane
-Davion
-Zachariah
-Damien
-Titus
-Kellen
-Camron
-Isiah
-Javon
-Nasir
-Milo
-Johan
-Byron
-Jasper
-Jonathon
-Chad
-Marc
-Kelvin
-Chandler
-Sam
-Cory
-Deandre
-River
-Reese
-Roger
-Quinton
-Talon
-Romeo
-Franklin
-Noel
-Alijah
-Guillermo
-Gunner
-Damon
-Jadon
-Emerson
-Micheal
-Bruce
-Terry
-Kolton
-Melvin
-Beckett
-Porter
-August
-Brycen
-Dayton
-Jamarion
-Leonel
-Karson
-Zayden
-Keagan
-Carl
-Khalil
-Cristopher
-Nelson
-Braiden
-Moses
-Isaias
-Roy
-Triston
-Walker
+Abel
+Adolph
+Alan
+Alden
+Alex
+Alfred
+Alger
+Allen
+Amos
+Apple
+Archie
+Arnie
+Art
+Arthur
+Baldric
+Bartholomew
+Bill
+Blake
+Brayden
+Brendan
+Brock
+Bronte
+Brick
+Bruce
+Bryce
+Buck
+Burt
+Butch
+Byrne
+Byron
+Camryn
+Carl
+Carter
+Casimir
+Cassian
+Charles
+Charlton
+Chip
+Clark
+Claudius
+Clement
+Cleveland
+Cliff
+Clinton
+Cletus
+Collin
+Crush
+Cy
+Damian
+Danny
+Darcey
+Darell
+Darin
+Deangelo
+Denholm
+Desmond
+Devin
+Dirk
+Dominic
+Donny
+Driscoll
+Duke
+Duncan
+Edgar
+Eliot
+Eliott
+Elric
+Elwood
+Emmanuel
+Fenton
+Fitz
+Flick
+Flint
+Flip
+Francis
+Frank
+Frankie
+Fridge
+Fulton
+Gannon
+Garret
+Gary
+Goddard
+Godwin
+Goodwin
+Gordon
+Graeme
+Grandpa
+Gratian
+Grendel
+Han
+Harry
+Hartley
+Harvey
+Henderson
+Holden
+Homer
+Horatio
+Huffie
+Hungry
+Hugo
+Irvine
+Jacob
+Jake
+Jamar
+Jamie
+Jamison
+Janel
+Jaydon
+Jaye
+Jayne
+Jean-Luc
+Jeb
+Jed
+Jemmy
+Jermaine
+Jerrie
+Jim
+Joachim
+Joey
+Johnathan
+John
+Johnny
+Jonathon
+Josh
+Josiah
+Kennard
+Keziah
+Lando
+Lanny
+Launce
+Leland
+Lennox
+Lenny
+Leonard
+Leroy
+Lief
+Linden
+Linton
+Lorde
+Loreto
+Lou
+Lucas
+Luke
+Malachi
+Malcolm
+Manley
+Marion
+Max
+Maynard
+Melvyn
+Michael
+Mike
+Milton
+Montague
+Monte
+Monty
+Nat
+Nathaniel
+Nick
+Nikolas
+Noah
+Opie
+Osbert
+Osborn
+Osborne
+Osmund
+Oswald
+Paget
+Patrick
+Patton
+Percival
+Persh
+Rastus
+Raymond
+Rayner
+Reuben
+Reynard
+Richard
+Rodger
+Roger
+Romayne
+Roscoe
+Roswell
+Royce
+Rube
+Rusty
+Sal
+Sawyer
+Scotty
+Seymour
+Shane
+Shiloh
+Smoke
+Simon
+Sloan
+Sorrel
+Spike
+Sybil
+Syd
+Tamsin
+Taylor
+Tel
+Terrell
+Tim
+Timothy
+Todd
+Trip
+Tye
+Uland
+Ulric
+Vaughn
+Vince
+Vinny
+Walter
+Ward
+Warner
+Wayne
+Whitaker
+William
+Willy
+Woodrow
+Zack
+Zane
+Zeke
+Jacob
+Michael
+Ethan
+Joshua
+Daniel
+Alexander
+Anthony
+William
+Christopher
+Matthew
+Jayden
+Andrew
+Joseph
+David
+Noah
+Aiden
+James
+Ryan
+Logan
+John
+Nathan
+Elijah
+Christian
+Gabriel
+Benjamin
+Jonathan
+Tyler
+Samuel
+Nicholas
+Gavin
+Dylan
+Jackson
+Brandon
+Caleb
+Mason
+Angel
+Isaac
+Evan
+Jack
+Kevin
+Jose
+Isaiah
+Luke
+Landon
+Justin
+Lucas
+Zachary
+Jordan
+Robert
+Aaron
+Brayden
+Thomas
+Cameron
+Hunter
+Austin
+Adrian
+Connor
+Owen
+Aidan
+Jason
+Julian
+Wyatt
+Charles
+Luis
+Carter
+Juan
+Chase
+Diego
+Jeremiah
+Brody
+Xavier
+Adam
+Carlos
+Sebastian
+Liam
+Hayden
+Nathaniel
+Henry
+Jesus
+Ian
+Tristan
+Bryan
+Sean
+Cole
+Alex
+Eric
+Brian
+Jaden
+Carson
+Blake
+Ayden
+Cooper
+Dominic
+Brady
+Caden
+Josiah
+Kyle
+Colton
+Kaden
+Eli
+Miguel
+Antonio
+Parker
+Steven
+Alejandro
+Riley
+Richard
+Timothy
+Devin
+Jesse
+Victor
+Jake
+Joel
+Colin
+Kaleb
+Bryce
+Levi
+Oliver
+Oscar
+Vincent
+Ashton
+Cody
+Micah
+Preston
+Marcus
+Max
+Patrick
+Seth
+Jeremy
+Peyton
+Nolan
+Ivan
+Damian
+Maxwell
+Alan
+Kenneth
+Jonah
+Jorge
+Mark
+Giovanni
+Eduardo
+Grant
+Collin
+Gage
+Omar
+Emmanuel
+Trevor
+Edward
+Ricardo
+Cristian
+Nicolas
+Kayden
+George
+Jaxon
+Paul
+Braden
+Elias
+Andres
+Derek
+Garrett
+Tanner
+Malachi
+Conner
+Fernando
+Cesar
+Javier
+Miles
+Jaiden
+Alexis
+Leonardo
+Santiago
+Francisco
+Cayden
+Shane
+Edwin
+Hudson
+Travis
+Bryson
+Erick
+Jace
+Hector
+Josue
+Peter
+Jaylen
+Mario
+Manuel
+Abraham
+Grayson
+Damien
+Kaiden
+Spencer
+Stephen
+Edgar
+Wesley
+Shawn
+Trenton
+Jared
+Jeffrey
+Landen
+Johnathan
+Bradley
+Braxton
+Ryder
+Camden
+Roman
+Asher
+Brendan
+Maddox
+Sergio
+Israel
+Andy
+Lincoln
+Erik
+Donovan
+Raymond
+Avery
+Rylan
+Dalton
+Harrison
+Andre
+Martin
+Keegan
+Marco
+Jude
+Sawyer
+Dakota
+Leo
+Calvin
+Kai
+Drake
+Troy
+Zion
+Clayton
+Roberto
+Zane
+Gregory
+Tucker
+Rafael
+Kingston
+Dominick
+Ezekiel
+Griffin
+Devon
+Drew
+Lukas
+Johnny
+Ty
+Pedro
+Tyson
+Caiden
+Mateo
+Braylon
+Cash
+Aden
+Chance
+Taylor
+Marcos
+Maximus
+Ruben
+Emanuel
+Simon
+Corbin
+Brennan
+Dillon
+Skyler
+Myles
+Xander
+Jaxson
+Dawson
+Kameron
+Kyler
+Axel
+Colby
+Jonas
+Joaquin
+Payton
+Brock
+Frank
+Enrique
+Quinn
+Emilio
+Malik
+Grady
+Angelo
+Julio
+Derrick
+Raul
+Fabian
+Corey
+Gerardo
+Dante
+Ezra
+Armando
+Allen
+Theodore
+Gael
+Amir
+Zander
+Adan
+Maximilian
+Randy
+Easton
+Dustin
+Luca
+Phillip
+Julius
+Charlie
+Ronald
+Jakob
+Cade
+Brett
+Trent
+Silas
+Keith
+Emiliano
+Trey
+Jalen
+Darius
+Lane
+Jerry
+Jaime
+Scott
+Graham
+Weston
+Braydon
+Anderson
+Rodrigo
+Pablo
+Saul
+Danny
+Donald
+Elliot
+Brayan
+Dallas
+Lorenzo
+Casey
+Mitchell
+Alberto
+Tristen
+Rowan
+Jayson
+Gustavo
+Aaden
+Amari
+Dean
+Braeden
+Declan
+Chris
+Ismael
+Dane
+Louis
+Arturo
+Brenden
+Felix
+Jimmy
+Cohen
+Tony
+Holden
+Reid
+Abel
+Bennett
+Zackary
+Arthur
+Nehemiah
+Ricky
+Esteban
+Cruz
+Finn
+Mauricio
+Dennis
+Keaton
+Albert
+Marvin
+Mathew
+Larry
+Moises
+Issac
+Philip
+Quentin
+Curtis
+Greyson
+Jameson
+Everett
+Jayce
+Darren
+Elliott
+Uriel
+Alfredo
+Hugo
+Alec
+Jamari
+Marshall
+Walter
+Judah
+Jay
+Lance
+Beau
+Ali
+Landyn
+Yahir
+Phoenix
+Nickolas
+Kobe
+Bryant
+Maurice
+Russell
+Leland
+Colten
+Reed
+Davis
+Joe
+Ernesto
+Desmond
+Kade
+Reece
+Morgan
+Ramon
+Rocco
+Orlando
+Ryker
+Brodie
+Paxton
+Jacoby
+Douglas
+Kristopher
+Gary
+Lawrence
+Izaiah
+Solomon
+Nikolas
+Mekhi
+Justice
+Tate
+Jaydon
+Salvador
+Shaun
+Alvin
+Eddie
+Kane
+Davion
+Zachariah
+Damien
+Titus
+Kellen
+Camron
+Isiah
+Javon
+Nasir
+Milo
+Johan
+Byron
+Jasper
+Jonathon
+Chad
+Marc
+Kelvin
+Chandler
+Sam
+Cory
+Deandre
+River
+Reese
+Roger
+Quinton
+Talon
+Romeo
+Franklin
+Noel
+Alijah
+Guillermo
+Gunner
+Damon
+Jadon
+Emerson
+Micheal
+Bruce
+Terry
+Kolton
+Melvin
+Beckett
+Porter
+August
+Brycen
+Dayton
+Jamarion
+Leonel
+Karson
+Zayden
+Keagan
+Carl
+Khalil
+Cristopher
+Nelson
+Braiden
+Moses
+Isaias
+Roy
+Triston
+Walker
Kale
\ No newline at end of file
diff --git a/config/names/last.txt b/config/names/last.txt
index 5b41e53aae8..9bdb16ebe71 100644
--- a/config/names/last.txt
+++ b/config/names/last.txt
@@ -1,620 +1,620 @@
-Whittier
-Dimeling
-Blaine
-Dennis
-Adams
-Rader
-Murray
-Millhouse
-Ludwig
-Burris
-Shupe
-Mary
-Zadovsky
-Philips
-Wise
-Gronko
-Jardine
-Black
-Mitchell
-Enderly
-Stall
-Harrow
-Atweeke
-Sealis
-Conrad
-Lucy
-Stewart
-Green
-Feufer
-Warren
-Campbell
-Shafer
-Woodworth
-Magor
-Logue
-Reichard
-Day
-Dugmore
-Murray
-Greenawalt
-Jyllian
-Osterwise
-Styles
-Cavalet
-Garneys
-Raub
-Sholl
-Chauvin
-Poley
-Todd
-Brandenburg
-Baer
-Pritchard
-Pinney
-Kadel
-Anderson
-Clarke
-Hunt
-Gadow
-Stough
-Marcotte
-Brooks
-Watson
-Nash
-Sheets
-Ashbaugh
-Zimmer
-Noton
-Dean
-Fleming
-Draudy
-Bluetenberger
-Fischer
-Hawkins
-Poehl
-Addison
-Mcintosh
-Keppel
-Kimple
-Alice
-Stone
-Fiscina
-Leichter
-Wile
-Callison
-Cowper
-Harrold
-Carr
-Eckhardstein
-Wilkerson
-Shirey
-Benford
-Reade
-Baskett
-Seidner
-Gettemy
-Joyce
-Judge
-Burkett
-Kiefer
-Carmichael
-Hirleman
-Wells
-Isemann
-Cressman
-Highlands
-Briggs
-Rowley
-Coldsmith
-Berkheimer
-Hill
-Maclagan
-Mcfall
-Mens
-Braun
-James
-Sloan
-Bould
-Overstreet
-Kanaga
-Polson
-Finlay
-Sandys
-Bousum
-Howard
-Treeby
-Stainforth
-Werner
-Sulyard
-Marriman
-Weinstein
-Butterfill
-Mason
-Coates
-Peters
-Gregory
-Wilo
-Edwards
-Barnes
-Harding
-Tireman
-Lombardi
-Roberts
-Faqua
-Basmanoff
-Mccune
-Mckendrick
-Oppenheimer
-Oneal
-Focell
-Tedrow
-Fields
-Ryals
-Best
-Zaun
-Knapp
-Linton
-Jackson
-Bullard
-Mcloskey
-Zoucks
-Heckendora
-Hoenshell
-Woollard
-Mueller
-Burns
-Franks
-Goodman
-Stern
-Robinson
-Hooker
-David
-Fitzgerald
-Vanleer
-Beach
-Flickinger
-Metzer
-Bynum
-Stafford
-Osteen
-Johnson
-Paynter
-Thomlinson
-Simmons
-Basinger
-Fisher
-Bunten
-Compton
-Archibald
-Catherina
-Rahl
-Bowchiew
-Tennant
-Mccullough
-Margaret
-Schaeffer
-Sommer
-Beail
-Merryman
-Knapenberger
-Patterson
-Houston
-Lacon
-Levett
-Sullivan
-Sidower
-Laborde
-Stroh
-Hice
-Biery
-Christman
-Staymates
-Sauter
-Snyder
-Bratton
-Sybilla
-Altmann
-Mathews
-Newbern
-Baker
-Kemble
-Mingle
-Unk
-Otis
-Quinn
-Bell
-Roberts
-Wood
-Ullman
-Bicknell
-Gibson
-Rohtin
-James
-Wallick
-Eggbert
-Losey
-Neely
-Catleay
-McDonald
-Beedell
-Williamson
-Bennett
-Potter
-Caldwell
-Lowe
-Durstine
-King
-Gardner
-Ulery
-Rifler
-Trovato
-Thomas
-Nehling
-Baum
-Werry
-Mcmullen
-Koster
-Willey
-Mildred
-Straub
-Haynes
-Baxter
-Ackerley
-Greene
-Atkinson
-Davis
-Weeter
-Milne
-Leech
-Clewett
-Ewing
-Hook
-Reighner
-Welty
-Jenkins
-Bennett
-Swarner
-Hawker
-Agg
-Batten
-Cherry
-Shaffer
-Yeskey
-Stephenson
-Pycroft
-Larson
-Joghs
-Keener
-Christopher
-Roadman
-Echard
-Priebe
-Auman
-Kemerer
-Sutton
-Prechtl
-Cowart
-Ringer
-Garratt
-Siegrist
-Seelig
-Lafortune
-Dryfus
-Isaman
-Teagarden
-Evans
-Wolfe
-Fiddler
-Jowers
-Aultman
-Olphert
-Howe
-Leslie
-Stocker
-Bode
-Whirlow
-Ann
-Mcclymonds
-Guess
-Taggart
-Pratt
-Moon
-Huey
-Hegarty
-Meyers
-Stahl
-Nickolson
-Mortland
-Perkins
-Thorley
-Fuchs
-Ray
-Schrader
-Kellogg
-Woodward
-Faust
-Roby
-Bashline
-Cypret
-Laurenzi
-Minnie
-Houser
-Langston
-Anderson
-Barrett
-Wible
-Hujsak
-Wardle
-Pershing
-Kuster
-Driggers
-Wheeler
-Garland
-Alliman
-Hoover
-Camp
-Hall
-Parkinson
-Swabey
-Mull
-Cox
-Hanford
-Stange
-Wolff
-Jesse
-Brinigh
-Koepple
-Schmidt
-Muller
-Schofield
-Zalack
-Pfeifer
-Fea
-Blackburn
-Ward
-Kifer
-Costello
-Donkin
-Osterweis
-Brindle
-Llora
-Duncan
-Ehret
-Fryer
-Summy
-Richards
-Boyer
-Hutton
-Mosser
-Lester
-Stroble
-Randolph
-Lord
-Scott
-Nicholas
-Smail
-Ratcliff
-Riggle
-Newton
-Sanders
-Mitchell
-Lauffer
-Aggley
-Moberly
-Hynes
-Pennington
-Woolery
-Hardie
-Blessig
-Tanner
-Demuth
-Fraser
-Henry
-Shick
-Ironmonger
-Scherer
-Field
-Prevatt
-Earl
-Paulson
-Curry
-Powers
-Rosensteel
-Hoopengarner
-Weisgarber
-Elliott
-Pearsall
-Lowstetter
-Holdeman
-Kepplinger
-Bloise
-Hunter
-Glover
-Hayhurst
-Wentzel
-Owens
-Smith
-Steele
-Leach
-Armstrong
-Wheeler
-Easter
-Greenwood
-Woodward
-Pratt
-Buzzard
-Cox
-Eliza
-Rockwell
-Zeal
-Harshman
-Northey
-Tilton
-Richter
-Moore
-Jerome
-Hardy
-Bickerson
-White
-Beck
-Waldron
-Fulton
-Miller
-Sandford
-Hughes
-Winton
-Digson
-Byers
-Hincken
-Shaner
-Todd
-Whiteman
-Lineman
-Albright
-Hastings
-Elderson
-Garrison
-Rose
-Kelley
-Quirin
-Dickinson
-Young
-Ramos
-Jewell
-Endsley
-Briner
-Jenner
-Saylor
-Bash
-Blyant
-Rhinehart
-Prescott
-Kirkson
-Picard
-Riker
-Spock
-Skywalker
-Vader
-Muggins
-Buttersworth
-Stamos
-Sagan
-Hawking
-Dawkins
-Goebbles
-McShain
-McDonohugh
-Power
-Smith
-Jones
-Williams
-Brown
-Taylor
-Davies
-Wilson
-Evans
-Thomas
-Roberts
-Johnson
-Walker
-Wright
-Robinson
-Thompson
-Hughes
-White
-Edwards
-Hall
-Patel
-Green
-Martins
-Lewis
-Wood
-Jackson
-Clarke
-Harris
-Clark
-Scott
-Turner
-Hill
-Moore
-Cooper
-Morris
-Ward
-Watson
-Morgan
-Anderson
-Harrison
-King
-Campbell
-Young
-Mitchell
-Baker
-James
-Kelly
-Allen
-Bell
-Phillips
-Lee
-Stewart
-Miller
-Parker
-Simpson
-Bennett
-Davis
-Griffiths
-Shaw
-Price
-Cook
-Richardson
-Murray
-Marshall
-Begum
-Murphy
-Khan
-Gray
-Collins
-Bailey
-Carter
-Robertson
-Graham
-Adams
-Richards
-Cox
-Singh
-Hussain
-Ellis
-Wilkinson
-Foster
-Thomson
-Russell
-Ali
-Reid
-Rathens
-Rathen
-Mason
-Chapman
-Powell
-Owen
-Ahmed
-Gibson
-Rogers
-Webb
-Holmes
-Mills
-Matthews
-Hunt
-Palmer
-Lloyd
-Kaur
-Fisher
-Ivanov
-Smirnov
-Vasilyev
-Petrov
-Kuznetsov
-Mikhaylov
-Pavlov
-Semenov
-Andreev
+Whittier
+Dimeling
+Blaine
+Dennis
+Adams
+Rader
+Murray
+Millhouse
+Ludwig
+Burris
+Shupe
+Mary
+Zadovsky
+Philips
+Wise
+Gronko
+Jardine
+Black
+Mitchell
+Enderly
+Stall
+Harrow
+Atweeke
+Sealis
+Conrad
+Lucy
+Stewart
+Green
+Feufer
+Warren
+Campbell
+Shafer
+Woodworth
+Magor
+Logue
+Reichard
+Day
+Dugmore
+Murray
+Greenawalt
+Jyllian
+Osterwise
+Styles
+Cavalet
+Garneys
+Raub
+Sholl
+Chauvin
+Poley
+Todd
+Brandenburg
+Baer
+Pritchard
+Pinney
+Kadel
+Anderson
+Clarke
+Hunt
+Gadow
+Stough
+Marcotte
+Brooks
+Watson
+Nash
+Sheets
+Ashbaugh
+Zimmer
+Noton
+Dean
+Fleming
+Draudy
+Bluetenberger
+Fischer
+Hawkins
+Poehl
+Addison
+Mcintosh
+Keppel
+Kimple
+Alice
+Stone
+Fiscina
+Leichter
+Wile
+Callison
+Cowper
+Harrold
+Carr
+Eckhardstein
+Wilkerson
+Shirey
+Benford
+Reade
+Baskett
+Seidner
+Gettemy
+Joyce
+Judge
+Burkett
+Kiefer
+Carmichael
+Hirleman
+Wells
+Isemann
+Cressman
+Highlands
+Briggs
+Rowley
+Coldsmith
+Berkheimer
+Hill
+Maclagan
+Mcfall
+Mens
+Braun
+James
+Sloan
+Bould
+Overstreet
+Kanaga
+Polson
+Finlay
+Sandys
+Bousum
+Howard
+Treeby
+Stainforth
+Werner
+Sulyard
+Marriman
+Weinstein
+Butterfill
+Mason
+Coates
+Peters
+Gregory
+Wilo
+Edwards
+Barnes
+Harding
+Tireman
+Lombardi
+Roberts
+Faqua
+Basmanoff
+Mccune
+Mckendrick
+Oppenheimer
+Oneal
+Focell
+Tedrow
+Fields
+Ryals
+Best
+Zaun
+Knapp
+Linton
+Jackson
+Bullard
+Mcloskey
+Zoucks
+Heckendora
+Hoenshell
+Woollard
+Mueller
+Burns
+Franks
+Goodman
+Stern
+Robinson
+Hooker
+David
+Fitzgerald
+Vanleer
+Beach
+Flickinger
+Metzer
+Bynum
+Stafford
+Osteen
+Johnson
+Paynter
+Thomlinson
+Simmons
+Basinger
+Fisher
+Bunten
+Compton
+Archibald
+Catherina
+Rahl
+Bowchiew
+Tennant
+Mccullough
+Margaret
+Schaeffer
+Sommer
+Beail
+Merryman
+Knapenberger
+Patterson
+Houston
+Lacon
+Levett
+Sullivan
+Sidower
+Laborde
+Stroh
+Hice
+Biery
+Christman
+Staymates
+Sauter
+Snyder
+Bratton
+Sybilla
+Altmann
+Mathews
+Newbern
+Baker
+Kemble
+Mingle
+Unk
+Otis
+Quinn
+Bell
+Roberts
+Wood
+Ullman
+Bicknell
+Gibson
+Rohtin
+James
+Wallick
+Eggbert
+Losey
+Neely
+Catleay
+McDonald
+Beedell
+Williamson
+Bennett
+Potter
+Caldwell
+Lowe
+Durstine
+King
+Gardner
+Ulery
+Rifler
+Trovato
+Thomas
+Nehling
+Baum
+Werry
+Mcmullen
+Koster
+Willey
+Mildred
+Straub
+Haynes
+Baxter
+Ackerley
+Greene
+Atkinson
+Davis
+Weeter
+Milne
+Leech
+Clewett
+Ewing
+Hook
+Reighner
+Welty
+Jenkins
+Bennett
+Swarner
+Hawker
+Agg
+Batten
+Cherry
+Shaffer
+Yeskey
+Stephenson
+Pycroft
+Larson
+Joghs
+Keener
+Christopher
+Roadman
+Echard
+Priebe
+Auman
+Kemerer
+Sutton
+Prechtl
+Cowart
+Ringer
+Garratt
+Siegrist
+Seelig
+Lafortune
+Dryfus
+Isaman
+Teagarden
+Evans
+Wolfe
+Fiddler
+Jowers
+Aultman
+Olphert
+Howe
+Leslie
+Stocker
+Bode
+Whirlow
+Ann
+Mcclymonds
+Guess
+Taggart
+Pratt
+Moon
+Huey
+Hegarty
+Meyers
+Stahl
+Nickolson
+Mortland
+Perkins
+Thorley
+Fuchs
+Ray
+Schrader
+Kellogg
+Woodward
+Faust
+Roby
+Bashline
+Cypret
+Laurenzi
+Minnie
+Houser
+Langston
+Anderson
+Barrett
+Wible
+Hujsak
+Wardle
+Pershing
+Kuster
+Driggers
+Wheeler
+Garland
+Alliman
+Hoover
+Camp
+Hall
+Parkinson
+Swabey
+Mull
+Cox
+Hanford
+Stange
+Wolff
+Jesse
+Brinigh
+Koepple
+Schmidt
+Muller
+Schofield
+Zalack
+Pfeifer
+Fea
+Blackburn
+Ward
+Kifer
+Costello
+Donkin
+Osterweis
+Brindle
+Llora
+Duncan
+Ehret
+Fryer
+Summy
+Richards
+Boyer
+Hutton
+Mosser
+Lester
+Stroble
+Randolph
+Lord
+Scott
+Nicholas
+Smail
+Ratcliff
+Riggle
+Newton
+Sanders
+Mitchell
+Lauffer
+Aggley
+Moberly
+Hynes
+Pennington
+Woolery
+Hardie
+Blessig
+Tanner
+Demuth
+Fraser
+Henry
+Shick
+Ironmonger
+Scherer
+Field
+Prevatt
+Earl
+Paulson
+Curry
+Powers
+Rosensteel
+Hoopengarner
+Weisgarber
+Elliott
+Pearsall
+Lowstetter
+Holdeman
+Kepplinger
+Bloise
+Hunter
+Glover
+Hayhurst
+Wentzel
+Owens
+Smith
+Steele
+Leach
+Armstrong
+Wheeler
+Easter
+Greenwood
+Woodward
+Pratt
+Buzzard
+Cox
+Eliza
+Rockwell
+Zeal
+Harshman
+Northey
+Tilton
+Richter
+Moore
+Jerome
+Hardy
+Bickerson
+White
+Beck
+Waldron
+Fulton
+Miller
+Sandford
+Hughes
+Winton
+Digson
+Byers
+Hincken
+Shaner
+Todd
+Whiteman
+Lineman
+Albright
+Hastings
+Elderson
+Garrison
+Rose
+Kelley
+Quirin
+Dickinson
+Young
+Ramos
+Jewell
+Endsley
+Briner
+Jenner
+Saylor
+Bash
+Blyant
+Rhinehart
+Prescott
+Kirkson
+Picard
+Riker
+Spock
+Skywalker
+Vader
+Muggins
+Buttersworth
+Stamos
+Sagan
+Hawking
+Dawkins
+Goebbles
+McShain
+McDonohugh
+Power
+Smith
+Jones
+Williams
+Brown
+Taylor
+Davies
+Wilson
+Evans
+Thomas
+Roberts
+Johnson
+Walker
+Wright
+Robinson
+Thompson
+Hughes
+White
+Edwards
+Hall
+Patel
+Green
+Martins
+Lewis
+Wood
+Jackson
+Clarke
+Harris
+Clark
+Scott
+Turner
+Hill
+Moore
+Cooper
+Morris
+Ward
+Watson
+Morgan
+Anderson
+Harrison
+King
+Campbell
+Young
+Mitchell
+Baker
+James
+Kelly
+Allen
+Bell
+Phillips
+Lee
+Stewart
+Miller
+Parker
+Simpson
+Bennett
+Davis
+Griffiths
+Shaw
+Price
+Cook
+Richardson
+Murray
+Marshall
+Begum
+Murphy
+Khan
+Gray
+Collins
+Bailey
+Carter
+Robertson
+Graham
+Adams
+Richards
+Cox
+Singh
+Hussain
+Ellis
+Wilkinson
+Foster
+Thomson
+Russell
+Ali
+Reid
+Rathens
+Rathen
+Mason
+Chapman
+Powell
+Owen
+Ahmed
+Gibson
+Rogers
+Webb
+Holmes
+Mills
+Matthews
+Hunt
+Palmer
+Lloyd
+Kaur
+Fisher
+Ivanov
+Smirnov
+Vasilyev
+Petrov
+Kuznetsov
+Mikhaylov
+Pavlov
+Semenov
+Andreev
Alekseev
\ No newline at end of file
diff --git a/config/names/ninjaname.txt b/config/names/ninjaname.txt
index b41271dbe10..42b74817041 100644
--- a/config/names/ninjaname.txt
+++ b/config/names/ninjaname.txt
@@ -1,44 +1,44 @@
-Shadow
-Sarutobi
-Smoke
-Rain
-Scorpion
-Zero
-Ermac
-Saibot
-Cyrax
-Raphael
-Michaelangelo
-Donatello
-Leonardo
-Splinter
-Shredder
-Hazuki
-Hien
-Hiryu
-Ryu
-Hayabusa
-Midnight
-Seven
-McNinja
-Hanzo
-Blood
-Iga
-Koga
-Hero
-Hiro
-Phantom
-Baki
-Ogre
-Daemon
-Goemon
-McAwesome
-Throat
-Death
-Aria
-Bro
-Fox
-Null
-Raiden
-Samurai
+Shadow
+Sarutobi
+Smoke
+Rain
+Scorpion
+Zero
+Ermac
+Saibot
+Cyrax
+Raphael
+Michaelangelo
+Donatello
+Leonardo
+Splinter
+Shredder
+Hazuki
+Hien
+Hiryu
+Ryu
+Hayabusa
+Midnight
+Seven
+McNinja
+Hanzo
+Blood
+Iga
+Koga
+Hero
+Hiro
+Phantom
+Baki
+Ogre
+Daemon
+Goemon
+McAwesome
+Throat
+Death
+Aria
+Bro
+Fox
+Null
+Raiden
+Samurai
Eater
\ No newline at end of file
diff --git a/config/names/ninjatitle.txt b/config/names/ninjatitle.txt
index 2c7f9e7f73c..078ae36fc10 100644
--- a/config/names/ninjatitle.txt
+++ b/config/names/ninjatitle.txt
@@ -1,46 +1,46 @@
-Master
-Sensei
-Swift
-Merciless
-Assassin
-Rogue
-Hunter
-Widower
-Orphaner
-Stalker
-Killer
-Silent
-Silencing
-Quick
-Agile
-Merciful
-Ninja
-Shinobi
-Initiate
-Grandmaster
-Strider
-Striker
-Slayer
-Awesome
-Ender
-Dr.
-Noob
-Night
-Crimson
-Grappler
-Ulimate
-Remorseless
-Deep
-Dragon
-Cruel
-Nightshade
-Black
-Gray
-Solid
-Liquid
-Solidus
-Steel
-Nickel
-Silver
-Singing
+Master
+Sensei
+Swift
+Merciless
+Assassin
+Rogue
+Hunter
+Widower
+Orphaner
+Stalker
+Killer
+Silent
+Silencing
+Quick
+Agile
+Merciful
+Ninja
+Shinobi
+Initiate
+Grandmaster
+Strider
+Striker
+Slayer
+Awesome
+Ender
+Dr.
+Noob
+Night
+Crimson
+Grappler
+Ulimate
+Remorseless
+Deep
+Dragon
+Cruel
+Nightshade
+Black
+Gray
+Solid
+Liquid
+Solidus
+Steel
+Nickel
+Silver
+Singing
Snake
\ No newline at end of file
diff --git a/config/names/verbs.txt b/config/names/verbs.txt
index e036e3c1dab..5bb8d6e3139 100644
--- a/config/names/verbs.txt
+++ b/config/names/verbs.txt
@@ -1,633 +1,633 @@
-accept
-add
-admire
-admit
-advise
-afford
-agree
-alert
-allow
-amuse
-analyse
-announce
-annoy
-answer
-apologise
-appear
-applaud
-appreciate
-approve
-argue
-arrange
-arrest
-arrive
-ask
-attach
-attack
-attempt
-attend
-attract
-avoid
-back
-bake
-balance
-ban
-bang
-bare
-bat
-bathe
-battle
-beam
-beg
-behave
-belong
-bleach
-bless
-blind
-blink
-blot
-blush
-boast
-boil
-bolt
-bomb
-book
-bore
-borrow
-bounce
-bow
-box
-brake
-brake
-branch
-breathe
-bruise
-brush
-bubble
-bump
-burn
-bury
-buzz
-calculate
-call
-camp
-care
-carry
-carve
-cause
-challenge
-change
-charge
-chase
-cheat
-check
-cheer
-chew
-choke
-chop
-claim
-clap
-clean
-clear
-clip
-close
-coach
-coil
-collect
-colour
-comb
-command
-communicate
-compare
-compete
-complain
-complete
-concentrate
-concern
-confess
-confuse
-connect
-consider
-consist
-contain
-continue
-copy
-correct
-cough
-count
-cover
-crack
-crash
-crawl
-cross
-crush
-cry
-cure
-curl
-curve
-cycle
-dam
-damage
-dance
-dare
-decay
-deceive
-decide
-decorate
-delay
-delight
-deliver
-depend
-describe
-desert
-deserve
-destroy
-detect
-develop
-disagree
-disappear
-disapprove
-disarm
-discover
-dislike
-divide
-double
-doubt
-drag
-drain
-dream
-dress
-drip
-drop
-drown
-drum
-dry
-dust
-earn
-educate
-embarrass
-employ
-empty
-encourage
-end
-enjoy
-enter
-entertain
-escape
-examine
-excite
-excuse
-exercise
-exist
-expand
-expect
-explain
-explode
-extend
-face
-fade
-fail
-fancy
-fasten
-fax
-fear
-fence
-fetch
-file
-fill
-film
-fire
-fit
-fix
-flap
-flash
-float
-flood
-flow
-flower
-fold
-follow
-fool
-force
-form
-found
-frame
-frighten
-fry
-gather
-gaze
-glow
-glue
-grab
-grate
-grease
-greet
-grin
-grip
-groan
-guarantee
-guard
-guess
-guide
-hammer
-hand
-handle
-hang
-happen
-harass
-harm
-hate
-haunt
-head
-heal
-heap
-heat
-help
-hook
-hop
-hope
-hover
-hug
-hum
-hunt
-hurry
-identify
-ignore
-imagine
-impress
-improve
-include
-increase
-influence
-inform
-inject
-injure
-instruct
-intend
-interest
-interfere
-interrupt
-introduce
-invent
-invite
-irritate
-itch
-jail
-jam
-jog
-join
-joke
-judge
-juggle
-jump
-kick
-kill
-kiss
-kneel
-knit
-knock
-knot
-label
-land
-last
-laugh
-launch
-learn
-level
-license
-lick
-lie
-lighten
-like
-list
-listen
-live
-load
-lock
-long
-look
-love
-man
-manage
-march
-mark
-marry
-match
-mate
-matter
-measure
-meddle
-melt
-memorise
-mend
-messup
-milk
-mine
-miss
-mix
-moan
-moor
-mourn
-move
-muddle
-mug
-multiply
-murder
-nail
-name
-need
-nest
-nod
-note
-notice
-number
-obey
-object
-observe
-obtain
-occur
-offend
-offer
-open
-order
-overflow
-owe
-own
-pack
-paddle
-paint
-park
-part
-pass
-paste
-pat
-pause
-peck
-pedal
-peel
-peep
-perform
-permit
-phone
-pick
-pinch
-pine
-place
-plan
-plant
-play
-please
-plug
-point
-poke
-polish
-pop
-possess
-post
-pour
-practise
-pray
-preach
-precede
-prefer
-prepare
-present
-preserve
-press
-pretend
-prevent
-prick
-print
-produce
-program
-promise
-protect
-provide
-pull
-pump
-punch
-puncture
-punish
-push
-question
-queue
-race
-radiate
-rain
-raise
-reach
-realise
-receive
-recognise
-record
-reduce
-reflect
-refuse
-regret
-reign
-reject
-rejoice
-relax
-release
-rely
-remain
-remember
-remind
-remove
-repair
-repeat
-replace
-reply
-report
-reproduce
-request
-rescue
-retire
-return
-rhyme
-rinse
-risk
-rob
-rock
-roll
-rot
-rub
-ruin
-rule
-rush
-sack
-sail
-satisfy
-save
-saw
-scare
-scatter
-scold
-scorch
-scrape
-scratch
-scream
-screw
-scribble
-scrub
-seal
-search
-separate
-serve
-settle
-shade
-share
-shave
-shelter
-shiver
-shock
-shop
-shrug
-sigh
-sign
-signal
-sin
-sip
-ski
-skip
-slap
-slip
-slow
-smash
-smell
-smile
-smoke
-snatch
-sneeze
-sniff
-snore
-snow
-soak
-soothe
-sound
-spare
-spark
-sparkle
-spell
-spill
-spoil
-spot
-spray
-sprout
-squash
-squeak
-squeal
-squeeze
-stain
-stamp
-stare
-start
-stay
-steer
-step
-stir
-stitch
-stop
-store
-strap
-strengthen
-stretch
-strip
-stroke
-stuff
-subtract
-succeed
-suck
-suffer
-suggest
-suit
-supply
-support
-suppose
-surprise
-surround
-suspect
-suspend
-switch
-talk
-tame
-tap
-taste
-tease
-telephone
-tempt
-terrify
-test
-thank
-thaw
-tick
-tickle
-tie
-time
-tip
-tire
-touch
-tour
-tow
-trace
-trade
-train
-transport
-trap
-travel
-treat
-tremble
-trick
-trip
-trot
-trouble
-trust
-try
-tug
-tumble
-turn
-twist
-type
-undress
-unfasten
-unite
-unlock
-unpack
-untidy
-use
-vanish
-visit
-wail
-wait
-walk
-wander
-want
-warm
-warn
-wash
-waste
-watch
-water
-wave
-weigh
-welcome
-whine
-whip
-whirl
-whisper
-whistle
-wink
-wipe
-wish
-wobble
-wonder
-work
-worry
-wrap
-wreck
-wrestle
-wriggle
-yawn
-yell
-zip
+accept
+add
+admire
+admit
+advise
+afford
+agree
+alert
+allow
+amuse
+analyse
+announce
+annoy
+answer
+apologise
+appear
+applaud
+appreciate
+approve
+argue
+arrange
+arrest
+arrive
+ask
+attach
+attack
+attempt
+attend
+attract
+avoid
+back
+bake
+balance
+ban
+bang
+bare
+bat
+bathe
+battle
+beam
+beg
+behave
+belong
+bleach
+bless
+blind
+blink
+blot
+blush
+boast
+boil
+bolt
+bomb
+book
+bore
+borrow
+bounce
+bow
+box
+brake
+brake
+branch
+breathe
+bruise
+brush
+bubble
+bump
+burn
+bury
+buzz
+calculate
+call
+camp
+care
+carry
+carve
+cause
+challenge
+change
+charge
+chase
+cheat
+check
+cheer
+chew
+choke
+chop
+claim
+clap
+clean
+clear
+clip
+close
+coach
+coil
+collect
+colour
+comb
+command
+communicate
+compare
+compete
+complain
+complete
+concentrate
+concern
+confess
+confuse
+connect
+consider
+consist
+contain
+continue
+copy
+correct
+cough
+count
+cover
+crack
+crash
+crawl
+cross
+crush
+cry
+cure
+curl
+curve
+cycle
+dam
+damage
+dance
+dare
+decay
+deceive
+decide
+decorate
+delay
+delight
+deliver
+depend
+describe
+desert
+deserve
+destroy
+detect
+develop
+disagree
+disappear
+disapprove
+disarm
+discover
+dislike
+divide
+double
+doubt
+drag
+drain
+dream
+dress
+drip
+drop
+drown
+drum
+dry
+dust
+earn
+educate
+embarrass
+employ
+empty
+encourage
+end
+enjoy
+enter
+entertain
+escape
+examine
+excite
+excuse
+exercise
+exist
+expand
+expect
+explain
+explode
+extend
+face
+fade
+fail
+fancy
+fasten
+fax
+fear
+fence
+fetch
+file
+fill
+film
+fire
+fit
+fix
+flap
+flash
+float
+flood
+flow
+flower
+fold
+follow
+fool
+force
+form
+found
+frame
+frighten
+fry
+gather
+gaze
+glow
+glue
+grab
+grate
+grease
+greet
+grin
+grip
+groan
+guarantee
+guard
+guess
+guide
+hammer
+hand
+handle
+hang
+happen
+harass
+harm
+hate
+haunt
+head
+heal
+heap
+heat
+help
+hook
+hop
+hope
+hover
+hug
+hum
+hunt
+hurry
+identify
+ignore
+imagine
+impress
+improve
+include
+increase
+influence
+inform
+inject
+injure
+instruct
+intend
+interest
+interfere
+interrupt
+introduce
+invent
+invite
+irritate
+itch
+jail
+jam
+jog
+join
+joke
+judge
+juggle
+jump
+kick
+kill
+kiss
+kneel
+knit
+knock
+knot
+label
+land
+last
+laugh
+launch
+learn
+level
+license
+lick
+lie
+lighten
+like
+list
+listen
+live
+load
+lock
+long
+look
+love
+man
+manage
+march
+mark
+marry
+match
+mate
+matter
+measure
+meddle
+melt
+memorise
+mend
+messup
+milk
+mine
+miss
+mix
+moan
+moor
+mourn
+move
+muddle
+mug
+multiply
+murder
+nail
+name
+need
+nest
+nod
+note
+notice
+number
+obey
+object
+observe
+obtain
+occur
+offend
+offer
+open
+order
+overflow
+owe
+own
+pack
+paddle
+paint
+park
+part
+pass
+paste
+pat
+pause
+peck
+pedal
+peel
+peep
+perform
+permit
+phone
+pick
+pinch
+pine
+place
+plan
+plant
+play
+please
+plug
+point
+poke
+polish
+pop
+possess
+post
+pour
+practise
+pray
+preach
+precede
+prefer
+prepare
+present
+preserve
+press
+pretend
+prevent
+prick
+print
+produce
+program
+promise
+protect
+provide
+pull
+pump
+punch
+puncture
+punish
+push
+question
+queue
+race
+radiate
+rain
+raise
+reach
+realise
+receive
+recognise
+record
+reduce
+reflect
+refuse
+regret
+reign
+reject
+rejoice
+relax
+release
+rely
+remain
+remember
+remind
+remove
+repair
+repeat
+replace
+reply
+report
+reproduce
+request
+rescue
+retire
+return
+rhyme
+rinse
+risk
+rob
+rock
+roll
+rot
+rub
+ruin
+rule
+rush
+sack
+sail
+satisfy
+save
+saw
+scare
+scatter
+scold
+scorch
+scrape
+scratch
+scream
+screw
+scribble
+scrub
+seal
+search
+separate
+serve
+settle
+shade
+share
+shave
+shelter
+shiver
+shock
+shop
+shrug
+sigh
+sign
+signal
+sin
+sip
+ski
+skip
+slap
+slip
+slow
+smash
+smell
+smile
+smoke
+snatch
+sneeze
+sniff
+snore
+snow
+soak
+soothe
+sound
+spare
+spark
+sparkle
+spell
+spill
+spoil
+spot
+spray
+sprout
+squash
+squeak
+squeal
+squeeze
+stain
+stamp
+stare
+start
+stay
+steer
+step
+stir
+stitch
+stop
+store
+strap
+strengthen
+stretch
+strip
+stroke
+stuff
+subtract
+succeed
+suck
+suffer
+suggest
+suit
+supply
+support
+suppose
+surprise
+surround
+suspect
+suspend
+switch
+talk
+tame
+tap
+taste
+tease
+telephone
+tempt
+terrify
+test
+thank
+thaw
+tick
+tickle
+tie
+time
+tip
+tire
+touch
+tour
+tow
+trace
+trade
+train
+transport
+trap
+travel
+treat
+tremble
+trick
+trip
+trot
+trouble
+trust
+try
+tug
+tumble
+turn
+twist
+type
+undress
+unfasten
+unite
+unlock
+unpack
+untidy
+use
+vanish
+visit
+wail
+wait
+walk
+wander
+want
+warm
+warn
+wash
+waste
+watch
+water
+wave
+weigh
+welcome
+whine
+whip
+whirl
+whisper
+whistle
+wink
+wipe
+wish
+wobble
+wonder
+work
+worry
+wrap
+wreck
+wrestle
+wriggle
+yawn
+yell
+zip
zoom
\ No newline at end of file
diff --git a/config/names/wizardfirst.txt b/config/names/wizardfirst.txt
index 408ae3b447e..18806ca74b7 100644
--- a/config/names/wizardfirst.txt
+++ b/config/names/wizardfirst.txt
@@ -1,36 +1,36 @@
-Jim
-Gulstaff
-Gandalf
-Grimm
-Mordenkainen
-Elminister
-Saruman
-Vaarsuvius
-Yoda
-Zul
-Nihilus
-Vecna
-Mogan
-Circe
-Prospero
-Raistlin
-Rasputin
-Tzeentch
-Khelben
-Dumbledor
-Houdini
-Terefi
-Urza
-Tenser
-Zagyg
-Mystryl
-Boccob
-Merlin
-Archchancellor
-Radagast
-Kreol
-Kaschei
-Lina
-Morgan
-Alatar
+Jim
+Gulstaff
+Gandalf
+Grimm
+Mordenkainen
+Elminister
+Saruman
+Vaarsuvius
+Yoda
+Zul
+Nihilus
+Vecna
+Mogan
+Circe
+Prospero
+Raistlin
+Rasputin
+Tzeentch
+Khelben
+Dumbledor
+Houdini
+Terefi
+Urza
+Tenser
+Zagyg
+Mystryl
+Boccob
+Merlin
+Archchancellor
+Radagast
+Kreol
+Kaschei
+Lina
+Morgan
+Alatar
Palando
\ No newline at end of file
diff --git a/config/names/wizardsecond.txt b/config/names/wizardsecond.txt
index d1e2e734862..1fe60bdb275 100644
--- a/config/names/wizardsecond.txt
+++ b/config/names/wizardsecond.txt
@@ -1,39 +1,39 @@
-the Powerful
-the Great
-the Magician
-the Wise
-the Seething
-the Amazing
-the Spiral King
-Darkmagic
-the White
-the Gray
-Shado
-the Sorcelator
-the Raven
-the Emperor
-the Brown
-Weatherwax
-the Destroyer
-the Deathless
-Yagg
-the Remorseful
-the Weeping
-the Unending
-the All Knowing
-Dark
-Smith
-the Conquerer
-the Unstoppable
-Gray
-of Void
-Unseen
-Darko
-Honko
-the Bandit Killer
-the Dragon Spooker
-Inverse
-le Fay
-the Blue
-the Red
+the Powerful
+the Great
+the Magician
+the Wise
+the Seething
+the Amazing
+the Spiral King
+Darkmagic
+the White
+the Gray
+Shado
+the Sorcelator
+the Raven
+the Emperor
+the Brown
+Weatherwax
+the Destroyer
+the Deathless
+Yagg
+the Remorseful
+the Weeping
+the Unending
+the All Knowing
+Dark
+Smith
+the Conquerer
+the Unstoppable
+Gray
+of Void
+Unseen
+Darko
+Honko
+the Bandit Killer
+the Dragon Spooker
+Inverse
+le Fay
+the Blue
+the Red
the Benevolent
\ No newline at end of file
diff --git a/config/tips.txt b/config/tips.txt
index e51b584e7cd..33aad7a0b30 100644
--- a/config/tips.txt
+++ b/config/tips.txt
@@ -1,92 +1,156 @@
-You can drag yourself to a chair or a bed to buckle yourself to it.
-You can drag yourself onto a photocopier to copy your ass.
-Space transitions change every round, but are consistent within a round.
-People can be ejected from the cloner before they are done by cutting power to the clone pod.
-If you've been feeding some slimes for at least two generations, you can order them around, and even have them follow you if they like you enough.
-Almost all slime cores have two or more different effects.
-With the right slime cores, you can get up to nine uses of a single slime's effects.
-Touching a supermatter shard is akin to hugging a singularity.
-To catch thrown items, toggle throw mode on and make sure you have an open hand.
-Updating sec records regularly helps avoid confusion in the brig!
-You can drag the icon of an equipped headset or PDA onto your screen to interact with it.
-The mime's invisible wall will block electrodes and other projectiles, but beams pass straight through it like windows.
-The Library system is much more robust than most people think! Mess around with it, see if you can log who takes out the books for radio-reading.
-Use a pair of handcuffs on a pair of orange shoes (standard prisoner issue) to chain them together.
-Revolutionaries and gangsters can have their opinions swayed back to Nanotrasen loyalty by enough heavy objects to the head.
-Husked corpses that have been drained of their genomes by a changeling also lack blood in their veins, unlike burned or space frozen corpses.
-The stethoscope's utility extends beyond lung and heart check-ups. They can also be used to crack certain safes.
-Chloral Hydrate can be counteracted by having coffee in your system!
-The AI system integrity restorer in both the RD's office and on the bridge can revive a dead AI loaded onto an intellicard.
-If an anomaly appears, scan it with an analyzer and then ping the frequency it gives you with a remote signalling device.
-Various creatures can crawl through air vents by holding alt while left clicking them.
-Nuclear operatives can be extremely powerful, but only if they work together. Communication is key!
-A rogue AI can be an extremely powerful tool for traitors, but be wary of the laws you use to slave it to you as it may try to find loopholes to get back at you.
-You can drag yourself onto tables to climb on them. This takes a moment and requires two free hands.
-You can drag other players onto yourself to open the strip menu, letting you remove their equipment or force them to equip something.
-Aliens are by far the most powerful close-quarters combat menace. Fight them at a distance to gain the upper hand!
-Aliens take double damage from all burn sources, such as lasers and fires. Flamethrowers are extremely effective against them.
-As an alien, your most powerful weapon is the facehugger. It can instantly win any fight, but can be completely blocked by certain headgear. Strip downed victims before applying one.
-Monkeys can still wear some human items, such as masks and backpacks, but they cannot bring anything with themselves when vent crawling.
-Nuclear operatives are very effective in a blitzkrieg tactic: attacking almost as soon as the round starts and well before the crew is prepared.
-You can use a fire extinguisher as a ghetto jetpack by spraying in the opposite direction of where you want to go. This also works with any gun.
-Coffee can keep you very warm. Drink a lot before running around through exposed space.
-Both cargo and the HoP can make you fill out a form for their services.
-You can destroy a blob by shooting emitters at its core.
-You can electrify a grille by having an exposed wire node underneath it.
-If you press the tab key, you can toggle hotkey mode, which allows you to move using WASD and perform other actions using hotkeys.
-You can hack MULE bots to let you ride them.
-You can hack most vending machines to obtain contraband items.
-You can use a multitool on the Cargo Ordering Console circuitboards to get contraband crates.
-The cryptographic sequencer (emag) has an enormous amount of functions beyond breaking open locks and hacking cyborgs, experiment!
-Touching anything without black, insulated, or brown gloves will leave fingerprints, which can be analyzed by detectives to find the suspect. Be careful of what you leave prints on!
-Blobs are extremely powerful and are impossible to defeat alone. Communicate with the crew and rally them against the threat!
-You can fight blob pieces diagonally, as they can only expand onto adjacent tiles in cardinal directions.
-Security huds and secglass huds can tell you if someone is implanted with a loyalty implant. Use this to your advantage in a revolution.
-Loyalty implants can only prevent someone from being turned into a cultist: unlike revolutionaries, it will not de-cult them if they have already been converted.
-Loyalty implants will break when used to de-convert a gangster. You will need to use two if you want to prevent them from being re-recruited.
-Don't neglect upgrading your machines with the machine parts produced by research! These can seriously improve the efficiency of your equipment.
-Cyborgs are impervious to fires and temperature, and can walk in a blazing inferno without worry. Don't shy away from setting the whole station on fire as a malfunctioning or rogue AI!
-The heads of staff, especially the Head of Security and the Captain, are usually extremely difficult to kill. If one of them is your target as a traitor, plan carefully.
-The Steal DNA sting from changelings counts for your genome absorb objective, but does not let you change your powers.
-Chemists are among the most powerful people on the station. They can survive almost anything thanks to all the chemicals in them that have basically replaced their blood.
-The station is capable of being entirely powered by the solar arrays, and is a much safer form of power over the singularity engine.
-The singularity engine is extremely dangerous if containment fails. Check back on it very frequently and call the shuttle immediately when, not if, it breaks free.
-Firesuits and winter coats offer mild protection from the cold, allowing you to spend longer periods of time near breaches and space than if wearing nothing at all.
-Vendors provide a very poor source of food riddled with sugar. This can affect your metabolism quite severely and it comes with many negative effects. Eat from the kitchen to stay healthy and even profit from a happy gut!
-Emergency internals tanks can be used from your hands, your pockets, your belt, or your suit storage slot (assuming you're wearing a valid exosuit).
-When walking through halls, stay on the Help intent to pass through people rather than bumping into them.
-Trying to do surgery but you keep cutting your patient? Remember to be on the help intent and to target the right limb!
-Glass shards can be welded to make glass, and metal rods can be welded to make metal. Ores can be welded, too, but this takes a lot of fuel.
-Many monsters won't attack you if you're unconscious. If you see a space bear, go to sleep, quick!
-Many monsters won't attack you if you're unconscious, but a medibot will still heal you. Keep one around when you're mining and never worry about dying again.
-Two people are critical and need your help, but you don't have time for two trips? Pull one and use the grab intent to grab the other. This will make you slower, but you will be able to take them both.
-When using the grab intent, grab someone by clicking on them then upgrade your grab by clicking on your hand slot. Holding them by the hands lets you throw them or table them.
-Can't seem to get a patient into the cryo tube or sleepers? Just drag their sprite to it to put them in it instantly. No more needing to shuffle around pulling them into it awkwardly.
-EMP blasts have a chance to make machines explode!
-Targeting your opponent's mouth in a fistfight will give you a greater chance of knocking them unconscious.
-As a security officer, examining a crew member with a secHUD allows you to set their status to arrest. You can even give a reason for the arrest warrant, as well.
-Clowns are extremely clumsy and will often misfire weapons.
-Hulks can't fire weapons because of their meaty fingers.
-The mime's crayon is edible.
-Shooting lasers at a computer console will destroy it.
-Using ethanol on a piece of paper will remove any writing on it.
-Using an emag on the gibber will allow you to throw people into it!
-Using the comms console with captain level access will allow you to broadcast announcements in BIG, RED LETTERS!
-You can repair cracked windows with a welding tool on help intent.
-Hold alt and left click on an adjacent tile to see its contents in the top right pane.
-While observing or as a ghost, double click on people, bots, or the singularity to follow them.
-Ghosts can click on active teleporters, portals, wormholes, or the gateway to jump to its destination!
-Ghosts can double-click their corpse, or the object containing their corpse (such as the cloning scanner), to re-enter it.
-Ghosts can see inside storage items that have been left on the ground.
-If you click on the command/chat bar to give it full focus you can use control + arrow keys to move the cursor around or scroll through the history of commands. (Control + home/end work too)
-Locked down rogue borgs can be dismantled to return the MMI for placement in a new borg.
-Fore = north, aft = south, starboard = east and port = west.
-Many things that bind you can be resisted out of with the resist button. This includes locked or welded lockers, chairs and handcuffs. Whenever stuck, just give it a try!
-You can use . or # instead of : for radio channels. Building this habit reduces the chance of accidentally saying things on common.
-While pulling something, clicking on a tile with an empty hand will move it to that tile. No more getting stuck in maint while dragging something!
-Things that override clicks like decks of cards or paper bins can still be picked up by dragging them to your character. Equipped things that override click can be unequipped by dragging it to an empty hand.
-In the job selection menu, from the lobby, you can use right click on the "Low/Medium/High" priority button to make it cycle backwards.
-If you stay out of camera range for 10 seconds, the AI's track on you will break.
-You can shoot cameras with bullets to disable them remotely.
-Disabling a camera with wirecutters will not cause a camera alarm, but bludgeoning it will.
-Gangs derive their power from their presence and notoriety. Cleaning up gang tags is the best way to slow their growth.
+
+Dragging yourself or someone else onto a chair or bed will buckle them to it, immobilizing them. If handcuffed, it will take time to resist out.
+Where the space map levels connect is randomized every round, but are otherwise kept consistent within rounds. Remember that they are not necessarily bidirectional!
+You can catch thrown items by toggling on your throw mode with an empty hand active.
+To crack the safe in the vault, you must use a stethoscope on it.
+You can climb onto a table by dragging yourself onto one. This takes time and drops the items in your hands on the table.
+You can drag other players onto yourself to open the strip menu, letting you remove their equipment or force them to wear something. Note that exosuits or helmets will block your access to the clothing beneath them, and that certain items take longer to strip or put on than others.
+You can spray a fire extinguisher or fire a gun while floating through space to change your direction. Simply fire opposite to where you want to go.
+You can change the control scheme by pressing tab. One is WASD, the other is the arrow keys. Keep in mind that hotkeys are also changed with this.
+All vending machines can be hacked to obtain some contraband items from them, and some can be fed with coins to gain access to premium items.
+Firesuits and winter coats offer mild protection from the cold, allowing you to spend longer periods of time near breaches and space than if wearing nothing at all.
+Glass shards can be welded to make glass, and metal rods can be welded to make metal. Ores can be welded too, but this takes a lot of fuel.
+If you need to drag multiple people either to safety or to space, bring a locker over and stuff them all in before hauling them off.
+You can grab someone by clicking on them with the grab intent, then upgrade the grab by clicking on the grab button in your active hand. An aggressive grab will allow you to place someone on a table by clicking on it, or throw them by toggling on throwing.
+You can destroy computers by shooting lasers at them.
+Holding alt and left clicking a tile will allow you to see its contents in the top right window pane, which is much faster than right clicking.
+The resist button will allow you to resist out of handcuffs, being buckled to a chair or bed, and out of locked lockers. Whenever you're stuck, try resisting!
+You can move an item out of the way by dragging it and then clicking on an adjacent tile with an empty hand.
+You can recolor certain items like jumpsuits and gloves in washing machines by also throwing in a crayon.
+Maintenance is full of equipment that is randomized every round. Look around and see if anything is worth using.
+As the Captain, you are one of the highest priority targets on the station. Everything from revolutions, to nuclear operatives, to traitors that need to rob you of your pants or your life are things to worry about.
+As the Captain, always take the nuclear disk and pinpointer with you every shift. It's a good idea to give one of these to another head who you can trust with keeping it safe, such as the Head of Security.
+As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny and a ban.
+As the Chief Medical Officer, your hypospray is like an instant injection syringe that can hold 30 units as opposed to the standard 15.
+As the Chief Medical Officer, coordinate and communicate with your doctors, chemists, and geneticists during a nuclear emergency, blob, or some other crisis to keep people alive and fighting.
+As a Medical Doctor, you can eject someone from cloning early by disabling power in genetics. Note that they will suffer more genetic damage from this.
+As a Medical Doctor, you can attempt to drain blood from a husk with a syringe to determine the cause. If you can extract blood, it was caused by extreme temperatures or lasers, if there is no blood to extract, you have confirmed the presence of changelings.
+As a Medical Doctor, charcoal will not only heal toxin damage dealt by poisons, but will actively remove them.
+As a Medical Doctor, you can surgically implant or extract things from people's chests. This can range from putting in a bomb to pulling out an alien larva.
+As a Medical Doctor, you must target the correct limb and be on help intent when trying to perform surgery on someone.
+As a Chemist, there are dozens of chemicals that can heal, and even more that can cause harm. Experiment!
+As a Chemist, some chemicals can only be synthesized by heating up the contents in the chemical heater.
+As a Chemist, it is a good idea to carry some sort of combat or panic pill to help you get out of a dangerous situation. A mixture of healing, speed boosting, and stun recovery chemicals can help you immensely.
+As a Geneticist, check the door to your workspace once in a while to see if there's anyone to clone.
+As a Geneticist, becoming a hulk makes you capable of dealing high melee damage, stunlocking people, and punching through walls. However, you can't fire guns, will lose your hulk status if you take too much damage, and are not considered a human by the AI while you are a hulk.
+As the Virologist, your viruses can range from healing powers so great that you can solo a blob, or diseases so dangerous they can kill the entire crew with airborne spontaneous combustion. Experiment!
+As the Research Director, you can repair and even revive AIs by loading them into an intelicard, and then from there into an AI system integrity restorer computer.
+As the Research Director, you can lock down cyborgs instead of blowing them up. Then you can have their laws reset or if that doesn't work, safely dismantled.
+As a Scientist, you can inject yourself with the mutation toxin extracted from green slimes to become a slime man, who will never be attacked by slimes.
+As a Scientist, you can maximize the number of uses you get out of a slime by feeding it slime steroid, created from purple slimes, while alive. You can then apply extract enhancer, created from cerulean slimes, on each extract. It is possible to get 9 times as much out of a slime this way.
+As a Scientist, you can disable anomalies by scanning them with an analyzer, then send a signal on the frequency it gives you with a remote signalling device. This will leave behind an anomaly core, which is good for research or the construction of the Phazon mech!
+As a Scientist, researchable machine parts can seriously improve the efficiency and speed of machines around the station. In some cases, it can even unlock new functions.
+As a Roboticist, you can not only build cyborgs, but also drones, bots, and even mechs!
+As a Roboticist, keep an ear out for anomaly announcements. If you successfully get your hands on its core, you can build a phazon mech!
+As a Roboticist, you can repair your cyborgs with a welding tool. If they have taken burn damage from lasers, you can remove their battery and replace their wires with a cable coil.
+As the AI, you can click on people's names to look at them. This only works if there are cameras that can see them.
+As the AI, you can quickly open and close doors by holding shift while clicking them, bolt them when holding ctrl, and even shock them while holding alt.
+As a Cyborg, choose your module carefully, as only a roboticist can let you repick it. If possible, refrain from choosing a module until a situation that requires one occurs.
+As a Cyborg, you are immune to most forms of stunning, and excel at almost everything far better than humans. However, flashes can easily stunlock you and you cannot do any precision work as you lack hands.
+As a Cyborg, you are impervious to fires and heat. If you are rogue, you can release plasma fires everywhere and walk through them without a care in the world!
+As a Cyborg, you are extremely vulnerable to EMPs as EMPs both stun you and damage you. The ion rifle in the armory or a traitor with an EMP kit can kill you in seconds.
+As the Chief Engineer, you can rename areas or create entirely new ones using your station blueprints.
+As the Chief Engineer, coordinate with your engineering team to repair hull breaches as quickly as possible, so as to prevent too much air from draining.
+As the Chief Engineer, your rig suit is significantly better than everybody else's. It boasts better protection, and is completely heat and fire proof.
+As an Engineer, the supermatter shard is an extremely dangerous piece of equipment: touching it will vaporize you.
+As an Engineer, you can electrify grilles by placing wire "nodes" beneath them: the big seemingly unconnected bulges from a half completed wiring job.
+As an Engineer, return to engineering once in a while to check on the singularity and the SMES cells. It's always a good idea to make sure the containment isn't compromised.
+As an Engineer, you can power the station solely with the solar arrays. While uninteresting, it is a much safer alternative to the singularity engine.
+As an Engineer, you can repair windows by using a welding tool on them while on help intent.
+As an Engineer, your construction permit allows you to create a new area, but has only one use.
+As an Atmospheric Technician, you can unwrench a pipe regardless of the pressures of the gases inside, but if they're too high they can burst out and injure you!
+As an Atmopsheric Technician, you should look into replacing your gas pumps with volumetric gas pumps, as those move air in flat numerical amounts, rather than percentages which leave trace gases.
+As an Atmospheric Technician, you are better suited to fighting fires than anyone else. As such, you have access to better firesuits, nanofrost sprays, and a completely heat and fire proof rigsuit.
+As the Head of Security, you are expected to coordinate your security force to handle any threat that comes to the station. Sometimes it means making use of the armory to handle a blob, sometimes it means being ruthless during a revolution or cult.
+As the Head of Security, you can call for executions or forced cyborg-ing, but may require the Captain's approval.
+As the Head of Security, don't let the power go to your head. You may have high access, great equipment, and a miniature army at your side, but being a terrible person without a good reason is grounds for banning.
+As the Warden, your duty is to be the watchdog of the brig and handler of prisonners when little is happening, and to hand out equipment and weapons to the security officers when a crisis strikes.
+As the Warden, keep a close eye on the armory at all times, as it is a favored strike point of nuclear operatives and cocky traitors.
+As the Warden, if a prisoner's crimes are heinous enough you can put them in permabrig or the gulag. Make sure to check on them once in a while!
+As a Security Officer, you should communicate and coordinate with your fellow officers using the security channel :s to avoid confusion.
+As a Security Officer, you can use handcuffs on orange prisoner shoes to turn them into cuffed shoes. Anyone who wears these will be forced to walk.
+As a Security Officer, your sechuds or HUDsunglasses can not only see what job someone works in and their criminal status, but also if they are loyalty implanted or not. Use this to your advantage in a revolution to definitively tell who is on your side!
+As a Security Officer, loyalty implants can only prevent someone from being turned into a cultist: unlike revolutionaries, it will not de-cult them if they have already been converted.
+As a Security Officer, examining someone while wearing sechuds or HUDsunglasses will let you set their arrest level, which will cause beepsky or any other security bots to chase after them.
+As a Security Officer, implanting a gang member the first time will deconvert them, but destroy the implant. You must implant them a second time to protect them from further conversion attempts. Keep in mind that gang members have ways to destroy implants in people!
+As the Detective, people leave fingerprints everywhere and on everything. With the exception of white latex, gloves will hide them. All is not lost, however, as gloves leave fibers specific to their kind such as black or nitrile, pointing to a general department.
+As the Detective, you can use your forensics scanner from a distance.
+As the Lawyer, try to negotiate with the Warden if sentences seem too high for the crime.
+As the Head of Personnel, you are not higher ranking than other heads of staff, even though you are expected to take the Captain's place first should he go missing. If the situation seems too rough for you, consider allowing another head to become temporary Captain.
+As the Head of Personnel, you are often just as large a target as the Captain because of the potential power your ID and computer can hand out.
+As the Mime, you can place invisible walls that last for a short time to block other people. You can use it in a pinch to delay your pursuer.
+As the Clown, if you lose your banana peel, you can still slip people with your PDA! Honk!
+As the Clown, you have the clumsiness genetic defect, and will misfire guns if you try to fire them.
+As the Chaplain, your null rod has a lot of functions: it can convert water into holy water, which if spread on the ground prevents wizards from jaunting away, can destroy cultist runes by hitting them, and is a very powerful weapon to boot!
+As the Chaplain, your bible can heal people if you hit them with it, but it can also potentially cause brain damage. Use at your own risk!
+As the Chaplain, you are much more likely to get a response by praying to the gods than most people. To boost your chances, make altars with colorful crayon runes, lit candles, and wire art.
+As a Botanist, you can hack the MegaSeed Vendor to get access to more exotic seeds. These seeds can alternatively be ordered from cargo.
+As a Botanist, you can mutate the plants growing in your hydroponics trays with unstable mutagen from chemistry to get special variations.
+As a Botanist, you should look into increasing the potency of your plants. This increases the size, amount of chemicals, points gained from grinding them in the biogenerator, and lets people know you are a proficient botanist.
+As the Chef, you can load your food into snack vending machines.
+As the Chef, you can rename your custom made food with a pen.
+As the Chef, any food you make will be much healthier than the junk food found in vendors. Having the crew routinely eating from you will provide minor buffs.
+As the Bartender, the drinks you start with only give you the basics. If you want more advanced mixtures, look into working with chemistry, hydroponics, or even mining for things to grind up and throw in!
+As a Cargo Technician, you can hack mulebots to make them faster, run over people in their way, and even let you ride them!
+As a Cargo Technician, you can order contraband items from the supply shuttle console by de-constructing it and using a multitool on the circuit board, the re-assembling it.
+As a Shaft Miner, the west side of the asteroid has a lot more minerals than on the east, but also has monsters there.
+As a Shaft Miner, every monster on the west side of the asteroid has a pattern for you to learn, you can exploit this to minimize damage from the encounters.
+As a Shaft Miner, you can harvest goliath plates from goliaths and upgrade your rigsuit with it, greatly reducing incoming melee damage.
+As a Shaft Miner, you should always turn your jumpsuit sensors to maximum, a fellow miner or cyborg may come to save you if you die.
+As a Traitor, the cryptographic sequencer (emag) can not only open doors, but also lockers, crates, APCs and more. It can hack cyborgs, and even cause bots to go berserk. Experiment!
+As a Traitor, subverting the AI to serve you can make it an extremely powerful ally. However, be careful of the wording in the laws you give it, as it may use your poorly written laws against you!
+As a Traitor, the Captain and the Head of Security are two of the most difficult to kill targets on the station. If either one is your target, plan carefully.
+As a Traitor, you can manufacture and recycle revolver bullets at a hacked autolathe, making the revolver an extremely powerful tool.
+As a Traitor, you may sometimes be assigned to hunt other traitors, and in turn be hunted by others.
+As a Nuclear Operative, communication is key! Use :t or :h to speak to your fellow operatives and coordinate an attack plan.
+As a Nuclear Operative, you should look into purchasing a syndicate cyborg, as they can provide heavy fire support, full access, and are immune to conventional stuns.
+As a Nuclear Operative, stick together! While your equipment may save you from a lucky disarm or skillful taser bolt, your fellow operative are much better at saving your life: they can drag you away from danger while stunned and provide cover fire.
+As a Nuclear Operative, remember that capturing the disk and arming the Nuke is your task, don't just wander off and kill random people!
+As a Nuclear Operative, you might end up in a situation where the AI has bolted you into a room. Having some spare C4 in your pocket can save your life.
+As a Monkey, you can crawl through air or scrubber vents by alt+left clicking them. You must drop everything you are wearing and holding to do this, however.
+As a Monkey, you can still wear a few human items, like backpacks and gas masks, and still have two free hands. Remember that you cannot use guns!
+As a Malfunctioning AI, you can shunt to an APC if the situation gets bad. This can allow the clock to tick down long enough for you to win, but keep in mind the crew's pinpointer will point to you when you do this.
+As a Malfunctioning AI, you should either order your cyborgs to dismantle the robotics console or blow it up yourself in order to protect them.
+As a Malfunctioning AI, you should look into flooding the station with plasma fires to kill off large portions of the crew, letting you pick off the remaining few with space suits who escaped.
+As a Malfunctioning AI, never stop hacking APCs as it will continue to reduce the time left to win.
+As an Alien, your melee prowess is unmatched, but your ranged abilities are sorely lacking. Make use of corners to force a melee confrontation!
+As an Alien, you take double damage from all burn attacks, such as lasers, welding tools, and fires. Furthermore, fire can destroy your resin and eggs. Expose areas to space to starve away any flamethrower fires before they can do damage!
+As an Alien, resin floors not only regenerate your plasma supply, but also passively heal you. Fight on resin floors to gain a home turf advantage!
+As an Alien, the facehugger is by far your most powerful weapon because of its ability to instantly win a fight. Remember however that certain helmets, such as biohoods or space helmets will completely block facehugger attacks.
+As an Alien, you are unable to pick up or use any human items or machinery. Instead, you should focus on sabotaging APCs, computers, cameras and either stowing, spacing, or melting any weapons you find.
+As the Blob, you will spawn from your character from between a minute to 5 minutes after the round starts. Use this time to find a safe and well hidden location and evaluate where you will strike!
+As the Blob, you can do various sabotage before you spawn, such as spacing the armory or disabling R&D.
+As the Blob, keep your core some distance from space, as it is both expensive to expand onto space and easy to be attacked from. Emitter platforms built in space are especially dangerous.
+As the Blob, if you invest into the split consciousness ability, it will create a second blob core, from a node, controlled by another player with a different reagent of their own. Coordinate and communicate your attacks and reactions with them!
+As the Blob, you can randomly repick your reagent type if the crew has adapted and protected themselves against your current one.
+As the Blob, you fight a war of attrition: Take out medbay and fight in chokepoints to prevent continued assaults and coordinated burst damage attacks!
+As the Blob, remember that you can only expand onto tiles from cardinal directions, while the crew can attack you diagonally. Fight in narrow corridors or expand and widen across the width of the hallway to force confrontations where you can hit them!
+As the Blob, don't neglect the creation of factories. These create spores that carry your reagent and can chase crewmembers far further than you. Spores can also be rallied to swarm the crew and cause panic, and can even take over corpses to create much more dangerous blob zombies!
+As a Revolutionary, you cannot convert a head of staff or someone who has a loyalty implant, such as a security officer or those they implant. Implants can however be surgically removed, and do not carry over with cloning. Take control of medbay to keep control of conversions!
+As a Revolutionary, cargo bay can be your best friend or your worst nightmare. In the best case scenario you will be able to order a limitless amount of guns and armor, in the worst case scenario security will take control and order a limitless number of loyalty implants to turn your fellow revolutionaries against you.
+As a Revolutionary, your main power comes from how quickly you spread. Convert people as fast as you can and overwhelm the heads of staff before they can make it to security.
+As a Changeling, the Steal DNA sting from changelings counts for your genome absorb objective, but does not let you change your powers.
+As a Changeling, you can absorb someone by grabbing them around the neck and using the Absorb verb; this gives you the ability to rechoose your powers, the DNA of whoever you absorbed, the memory of the absorbed, and some samples of things the absorbed said.
+As a Shadowling, you can only have 5 thralls on your side while keeping your human form. After that, you must turn into a shadowling to convert more thralls.
+As a Shadowling, remember to communicate with your fellow shadowlings and thralls as you lack the firepower to take on much of anything by yourself until you ascend.
+As a Cultist, invest in taking over xenobio, an adamantine golem army can quickly be converted into cultists and constructs.
+As a Cultist, do not cause too much chaos before your objective is completed. If the shuttle gets called too soon, you may not have enough time to win.
+As a Cultist, your team starts off very weak, but if necessary can quickly convert everything they have into raw power. Make sure you have the numbers and equipment to support going loud, or the cult will fall flat on its face.
+As a Cultist, the Blood Boil rune instantly crits all non-cultists who can see it, but has a chance to explode runes near it, incuding itself.
+As a Cultist, you can create an army of manifested goons using a combination of the Manifest rune, which creates homunculi from ghosts, and the Blood Drain rune, which drains life from anyone standing on any blood drain rune.
+As a Cultist, you can communicate with your fellow cultists with your tome. If that's not available, you can use the Communicate verb at an extreme health cost.
+You can deconvert Cultists by feeding them large amounts of holy water.
+As a Wizard, you can turn people to stone, then animate it with a staff of animation to create an extremely powerful minion, for all of 5 minutes at least.
+As a Wizard, the fireball spell performs very poorly at close range, as it can easily catch you in the blast. It is best used as a form of artillery down long hallways.
+As a Wizard, summoning guns will turn a large portion of the crew against themselves, but will also give everyone anything from a pea shooter to a BFG 9000. Use at your own risk!
+As a Wizard, the staff of chaos can fire any type of bolts from the magical wands. This can range from bolts of instant death to accidentally healing or reviving someone.
+As a Wizard, most spells become unusable if you are not wearing your robes, hat, and sandals.
+As a Gangster, you can destroy loyalty implants with an implant breaker, letting you reconvert that person.It actually converts them, past implants or gang status(though not the captain)
+As a Gangster, your influence is based on how many areas you have tagged and how many people are wearing your gang's outfit; more areas and more people wearing the outfit will give you more influence.
+As a Gang Boss, it is wise to promote at least one other person you think is good or effective, preferably two, as a backup if you get caught by security or enemy gangsters.
+Gang outfits are very robust, giving moderate resistances to most direct damage at the cost of stealth.
+As an Abductor, you can select where your victims will be sent on the ship control console.
+As an Abductor Agent, the combat mode vest has much higher resistance to every kind of weapon, and your helmet prevents the AI from tracking you.
+As an Abductor, the baton is set up to allow you to rapidly stun, sleep, and cuff: From stun mode, it cyles to sleep, then to cuff, allowing you to render a target helpless and unable to communicate very rapidly.
+As a Ghost, you can see the inside of a container on the ground by clicking on it.
+As a Ghost, you can double click on people, bots, or the singularity to follow them.
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index 8c6e8a125ef..bb5ed90ea8d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,91 @@
-->
+
02 August 2015
+
Incoming5643 updated:
+
+ - Syndicate toolboxes now come with never before seen red insulated gloves.
+
+
Steelpoint updated:
+
+ - Fixed multiple mapping errors for Boxstation and the mining base.
+ - A circuit imprinter and exosuit fabrication board have been added to tech storage.
+
+
SvartaSvansen updated:
+
+ - Our lizard engineers have worked hard and managed to improve Centcom airlocks so they no longer disintegrate when the electronics are removed!
+ - Put a safety net in place so future airlocks without assemblies produce the default assembly instead of disintegrating.
+
+
+
30 July 2015
+
Gun Hog updated:
+
+ - The Reactivate Camera power for Malfunctining AIs now costs 10 CPU, and works on the entire camera network, up to 30 cameras fixed.
+ - The Upgrade Cameras power now costs 35 CPU, upgrades all cameras in the network to have EMP proofing, X-ray, and gives the AI night-vision.
+
+
Ikarrus updated:
+
+ - Door Access buttons can now be emagged to remove access restrictions.
+
+
LordPidey updated:
+
+ - Added a new medication, Miner's Salve. It heals brute/burn damage over time, and has the side effect of making the patient think their wounds are fully healed. It is mixed with water+iron+oil, or grind a twinkie, a sheet of metal, and a sheet of plasma.
+ - Added a grinder to the mining station.
+
+
Midaychi updated:
+
+ - Random loot has been added to the derelict as salvage for drones.
+
+
Scones updated:
+
+ - Adds a Rice Hat to the biogenerator.
+
+
+
29 July 2015
+
AnturK updated:
+
+ - Aliens can now mine through asteroid rock.
+
+
GunHog updated:
+
+ - Cyborg headlamps have a short cooldown before reactivation when forcibly deactivated.
+ - Shadowling's Veil now shuts down headlamps for the ability's entire duration.
+
+
Kor updated:
+
+ - Eating the heart of a Slaughter Demon will grant you dark powers.
+
+
freerealestate updated:
+
+ - Fixed bug where copying with ctrl+C didn't work due to it being assigned to resist.
+ - Changed resist to B (hotkeys mode) and ctrl+B (either mode) instead.
+ - Removed End resist from cyborgs.
+
+
+
28 July 2015
+
Anonus updated:
+
+ - New gang tags for Omni and Prima gangs.
+
+
Chiefwaffles updated:
+
+ - After realizing how often AIs tend to 'disappear', Central Command has authorized the shipment of the Automated Announcement System to take over the AI's responsibility of announcing new arrivals.
+ - In addition, users are able to configure the messages to their liking. Early testing has shown that this feature may be vulnerable to malicious external elements!
+ - The station's R&D software has been updated so it can now succesfully create its own prototype AAS board once the prerequisite levels have been met.
+
+
Dorsisdwarf updated:
+
+ - Increased the cost of Bioterror darts to 6TC.
+
+
Incoming5643 updated:
+
+ - Double Agents no longer know they're Double Agents and not just standard Traitors.
+
+
xxalpha updated:
+
+ - Removed Anti-Drop and Nutriment Pump implants from Nuclear Operative's uplink.
+
+
27 July 2015
Bgobandit updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2aedf02ebd7..6ed5452de7c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1372,3 +1372,67 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
kingofkosmos:
- rscadd: Added a link to re-enter corpse to alert when your body is placed in a
cloning scanner.
+2015-07-28:
+ Anonus:
+ - imageadd: New gang tags for Omni and Prima gangs.
+ Chiefwaffles:
+ - rscadd: After realizing how often AIs tend to 'disappear', Central Command has
+ authorized the shipment of the Automated Announcement System to take over the
+ AI's responsibility of announcing new arrivals.
+ - rscadd: In addition, users are able to configure the messages to their liking.
+ Early testing has shown that this feature may be vulnerable to malicious external
+ elements!
+ - rscadd: The station's R&D software has been updated so it can now succesfully
+ create its own prototype AAS board once the prerequisite levels have been met.
+ Dorsisdwarf:
+ - tweak: Increased the cost of Bioterror darts to 6TC.
+ Incoming5643:
+ - experiment: Double Agents no longer know they're Double Agents and not just standard
+ Traitors.
+ xxalpha:
+ - rscdel: Removed Anti-Drop and Nutriment Pump implants from Nuclear Operative's
+ uplink.
+2015-07-29:
+ AnturK:
+ - rscadd: Aliens can now mine through asteroid rock.
+ GunHog:
+ - tweak: Cyborg headlamps have a short cooldown before reactivation when forcibly
+ deactivated.
+ - bugfix: Shadowling's Veil now shuts down headlamps for the ability's entire duration.
+ Kor:
+ - rscadd: Eating the heart of a Slaughter Demon will grant you dark powers.
+ freerealestate:
+ - bugfix: Fixed bug where copying with ctrl+C didn't work due to it being assigned
+ to resist.
+ - rscadd: Changed resist to B (hotkeys mode) and ctrl+B (either mode) instead.
+ - rscdel: Removed End resist from cyborgs.
+2015-07-30:
+ Gun Hog:
+ - tweak: The Reactivate Camera power for Malfunctining AIs now costs 10 CPU, and
+ works on the entire camera network, up to 30 cameras fixed.
+ - tweak: The Upgrade Cameras power now costs 35 CPU, upgrades all cameras in the
+ network to have EMP proofing, X-ray, and gives the AI night-vision.
+ Ikarrus:
+ - rscadd: Door Access buttons can now be emagged to remove access restrictions.
+ LordPidey:
+ - rscadd: Added a new medication, Miner's Salve. It heals brute/burn damage over
+ time, and has the side effect of making the patient think their wounds are fully
+ healed. It is mixed with water+iron+oil, or grind a twinkie, a sheet of metal,
+ and a sheet of plasma.
+ - rscadd: Added a grinder to the mining station.
+ Midaychi:
+ - rscadd: Random loot has been added to the derelict as salvage for drones.
+ Scones:
+ - rscadd: Adds a Rice Hat to the biogenerator.
+2015-08-02:
+ Incoming5643:
+ - rscadd: Syndicate toolboxes now come with never before seen red insulated gloves.
+ Steelpoint:
+ - bugfix: Fixed multiple mapping errors for Boxstation and the mining base.
+ - resadd: A circuit imprinter and exosuit fabrication board have been added to tech
+ storage.
+ SvartaSvansen:
+ - rscadd: Our lizard engineers have worked hard and managed to improve Centcom airlocks
+ so they no longer disintegrate when the electronics are removed!
+ - tweak: Put a safety net in place so future airlocks without assemblies produce
+ the default assembly instead of disintegrating.
diff --git a/html/changelogs/KORPHAERON-PR-SOULSTONE.yml b/html/changelogs/KORPHAERON-PR-SOULSTONE.yml
new file mode 100644
index 00000000000..fc3c9e715bb
--- /dev/null
+++ b/html/changelogs/KORPHAERON-PR-SOULSTONE.yml
@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# spellcheck (typo fixes)
+# experiment
+# tgs (TG-ported fixes?)
+#################################
+
+# Your name.
+author: Kor
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Soulstones will now attempt to pull ghosts from beyond if the targeted corpse has no soul."
diff --git a/html/changelogs/Summoners99-hisssss.yml b/html/changelogs/Summoners99-hisssss.yml
new file mode 100644
index 00000000000..29532476ba3
--- /dev/null
+++ b/html/changelogs/Summoners99-hisssss.yml
@@ -0,0 +1,8 @@
+author: Summoner99
+
+delete-after: True
+
+changes:
+ - rscadd: "Added the *roar emote back to Alien Larva"
+ - bugfix: "Fixed aliens not being able to do the *hiss and *screech emotes"
+ - tweak: "Changed how the plural emote system works and now some emotes have plural versions, example is: *hiss and *hisses."
\ No newline at end of file
diff --git a/icons/effects/crayondecal.dmi b/icons/effects/crayondecal.dmi
index 5c44f86b6cb..89b071a9162 100644
Binary files a/icons/effects/crayondecal.dmi and b/icons/effects/crayondecal.dmi differ
diff --git a/icons/effects/station_explosion.dmi b/icons/effects/station_explosion.dmi
index 6ce74dbb36d..7dcab377107 100644
Binary files a/icons/effects/station_explosion.dmi and b/icons/effects/station_explosion.dmi differ
diff --git a/icons/mob/drone.dmi b/icons/mob/drone.dmi
index b27a8cba56c..e4c4b84990e 100644
Binary files a/icons/mob/drone.dmi and b/icons/mob/drone.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 1157611aa23..76941cba399 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index ea688d4249d..c7876bb0b7c 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/atmospherics/components/unary_devices.dmi b/icons/obj/atmospherics/components/unary_devices.dmi
index 6681804dd4f..b1c7922190b 100644
Binary files a/icons/obj/atmospherics/components/unary_devices.dmi and b/icons/obj/atmospherics/components/unary_devices.dmi differ
diff --git a/icons/obj/atmospherics/pipes/disposal.dmi b/icons/obj/atmospherics/pipes/disposal.dmi
index 086915ed3eb..b0a9b58b0d7 100644
Binary files a/icons/obj/atmospherics/pipes/disposal.dmi and b/icons/obj/atmospherics/pipes/disposal.dmi differ
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index e44ddedfcd4..a9bb0a68c02 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index d73ae4f3b36..7e46aa87a45 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 4fbc9bd674a..95b18b2e916 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi
index 94ed8ac6c2d..06689649d8e 100644
Binary files a/icons/obj/doors/door_assembly.dmi and b/icons/obj/doors/door_assembly.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index fb3f05626c2..39a49078881 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/machines/telecomms.dmi b/icons/obj/machines/telecomms.dmi
index f47fcc63f87..7f5f05e3aff 100644
Binary files a/icons/obj/machines/telecomms.dmi and b/icons/obj/machines/telecomms.dmi differ
diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi
index c2f7bfcc202..c9d0f461bc5 100644
Binary files a/icons/obj/wizard.dmi and b/icons/obj/wizard.dmi differ
diff --git a/install-byond.sh b/install-byond.sh
new file mode 100644
index 00000000000..da2756a8df2
--- /dev/null
+++ b/install-byond.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+if [ -d "$HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin" ];
+then
+ echo "Using cached directory."
+else
+ echo "Setting up BYOND."
+ mkdir -p "$HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}"
+ cd "$HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}"
+ curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip
+ unzip byond.zip
+ cd byond
+ make here
+fi
\ No newline at end of file
diff --git a/interface/interface.dm b/interface/interface.dm
index 348d110e134..a97aa48e385 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -91,7 +91,7 @@ Hotkey-Mode: (hotkey-mode must be on)
\tm = me
\tt = say
\to = OOC
-\tc = resist
+\tb = resist
\tx = swap-hand
\tz = activate held object (or y)
\tf = cycle-intents-left
@@ -111,7 +111,7 @@ Any-Mode: (hotkey doesn't need to be on)
\tCtrl+q = drop
\tCtrl+e = equip
\tCtrl+r = throw
-\tCtrl+c = resist
+\tCtrl+b = resist
\tCtrl+x = swap-hand
\tCtrl+z = activate held object (or Ctrl+y)
\tCtrl+f = cycle-intents-left
@@ -142,7 +142,7 @@ Hotkey-Mode: (hotkey-mode must be on)
\tq = unequip active module
\tt = say
\tx = cycle active modules
-\tc = resist
+\tb = resist
\tz = activate held object (or y)
\tf = cycle-intents-left
\tg = cycle-intents-right
@@ -160,7 +160,7 @@ Any-Mode: (hotkey doesn't need to be on)
\tCtrl+w = up
\tCtrl+q = unequip active module
\tCtrl+x = cycle active modules
-\tCtrl+c = resist
+\tCtrl+b = resist
\tCtrl+z = activate held object (or Ctrl+y)
\tCtrl+f = cycle-intents-left
\tCtrl+g = cycle-intents-right
diff --git a/interface/skin.dmf b/interface/skin.dmf
index cc847abc342..7db57837c75 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -100,11 +100,11 @@ macro "borghotkeymode"
command = ".west"
is-disabled = false
elem
- name = "C"
+ name = "B"
command = "resist"
is-disabled = false
elem
- name = "CTRL+C"
+ name = "CTRL+B"
command = "resist"
is-disabled = false
elem
@@ -306,7 +306,7 @@ macro "macro"
command = ".west"
is-disabled = false
elem
- name = "CTRL+C"
+ name = "CTRL+B"
command = "resist"
is-disabled = false
elem
@@ -496,11 +496,11 @@ macro "hotkeymode"
command = ".west"
is-disabled = false
elem
- name = "C"
+ name = "B"
command = "resist"
is-disabled = false
elem
- name = "CTRL+C"
+ name = "CTRL+B"
command = "resist"
is-disabled = false
elem
@@ -657,10 +657,6 @@ macro "borgmacro"
name = "SOUTHEAST"
command = ".southeast"
is-disabled = false
- elem
- name = "SOUTHWEST"
- command = "resist"
- is-disabled = false
elem
name = "NORTHWEST"
command = "unequip-module"
@@ -726,7 +722,7 @@ macro "borgmacro"
command = ".west"
is-disabled = false
elem
- name = "CTRL+C"
+ name = "CTRL+B"
command = "resist"
is-disabled = false
elem
@@ -1229,6 +1225,8 @@ window "chemdispenser"
keep-aspect = false
align = center
text-wrap = false
+ allow-html = false
+ letterbox = true
elem "eject"
type = BUTTON
pos = 264,4
@@ -1395,6 +1393,8 @@ window "chemdispenser"
keep-aspect = false
align = center
text-wrap = false
+ allow-html = false
+ letterbox = true
elem "child1"
type = CHILD
pos = 0,40
@@ -1516,6 +1516,8 @@ window "chemdispenser_reagents"
keep-aspect = false
align = center
text-wrap = false
+ allow-html = false
+ letterbox = true
window "mainwindow"
elem "mainwindow"
@@ -1726,6 +1728,8 @@ window "mapwindow"
on-size = ""
icon-size = 0
text-mode = false
+ letterbox = true
+ zoom = 0
on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\""
on-hide = ".winset\"mainwindow.mainvsplit.left=\""
style = ""
@@ -2254,4 +2258,6 @@ window "infowindow"
on-show = ".winset\"rpane.infob.is-visible=true;rpane.browseb.is-visible=true?rpane.infob.pos=130,0:rpane.infob.pos=65,0 rpane.textb.is-visible=true rpane.infob.is-checked=true rpane.rpanewindow.pos=0,30 rpane.rpanewindow.size=0x0 rpane.rpanewindow.left=infowindow\""
on-hide = ".winset\"rpane.infob.is-visible=false;rpane.browseb.is-visible=true?rpane.browseb.is-checked=true rpane.rpanewindow.left=browserwindow:rpane.textb.is-visible=true rpane.rpanewindow.pos=0,30 rpane.rpanewindow.size=0x0 rpane.rpanewindow.left=\""
on-tab = ""
+ prefix-color = none
+ suffix-color = none
diff --git a/tgstation.dme b/tgstation.dme
index 856510ba2aa..da3899506b4 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -381,6 +381,7 @@
#include "code\game\machinery\ai_slipper.dm"
#include "code\game\machinery\airlock_control.dm"
#include "code\game\machinery\alarm.dm"
+#include "code\game\machinery\announcement_system.dm"
#include "code\game\machinery\atmo_control.dm"
#include "code\game\machinery\autolathe.dm"
#include "code\game\machinery\Beacon.dm"
@@ -1091,6 +1092,7 @@
#include "code\modules\mob\dead\observer\logout.dm"
#include "code\modules\mob\dead\observer\observer.dm"
#include "code\modules\mob\dead\observer\say.dm"
+#include "code\modules\mob\living\bloodcrawl.dm"
#include "code\modules\mob\living\damage_procs.dm"
#include "code\modules\mob\living\death.dm"
#include "code\modules\mob\living\emote.dm"
@@ -1432,7 +1434,8 @@
#include "code\modules\reagents\reagent_containers\syringes.dm"
#include "code\modules\recycling\conveyor2.dm"
#include "code\modules\recycling\disposal-construction.dm"
-#include "code\modules\recycling\disposal.dm"
+#include "code\modules\recycling\disposal-structures.dm"
+#include "code\modules\recycling\disposal-unit.dm"
#include "code\modules\recycling\sortingmachinery.dm"
#include "code\modules\research\circuitprinter.dm"
#include "code\modules\research\designs.dm"
diff --git a/tools/dmm2tgm/dmm2tgm.py b/tools/dmm2tgm/dmm2tgm.py
deleted file mode 100644
index ae22a073eee..00000000000
--- a/tools/dmm2tgm/dmm2tgm.py
+++ /dev/null
@@ -1,79 +0,0 @@
-
-import sys
-
-# .dmm format converter, by RemieRichards
-# Version 2.0
-# Converts the internal structure of a .dmm file to a syntax
-# that git can better handle conflicts-wise, it's also fairly human readable!
-# Processes Boxstation (tgstation.2.1.3) almost instantly
-
-#TWEAKABLE VARIABLES
-map_file = "tgstation.2.1.3.dmm" #Map file, .dmm or .txt
-output_file = "" #Output file, .dmm or .txt, leave blank to overwrite map_file
-
-
-#CHECK FOR PREVIOUS CONVERSION
-with open(map_file, "r") as conversion_candidate:
- header = conversion_candidate.readline()
- if header.find("//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE") != -1:
- sys.exit("This map has already been converted, cancelling...")
-
-
-#ACTUAL CONVERSION
-with open(map_file, "r+") as unconverted_map:
- characters = unconverted_map.read()
- converted_map = ""
- in_object_block = False #()
- in_variable_block = False #{}
- in_quote_block = False #''
- in_double_quote_block = False #""
- for char in characters:
- if char == "(" :
- if not in_object_block:
- if not in_quote_block:
- if not in_double_quote_block:
- if not in_variable_block:
- in_object_block = True
- char = char + "\n"
- if char == ")":
- if in_object_block:
- if not in_quote_block:
- if not in_double_quote_block:
- if not in_variable_block:
- in_object_block = False
- if char == "{":
- in_variable_block = True
- if in_object_block:
- char = char + "\n\t"
- if char == "}":
- in_variable_block = False
- if in_object_block:
- char = "\n\t"+char
- if char == ",":
- if not in_variable_block:
- char = char + "\n"
- if char == "'":
- if in_quote_block:
- in_quote_block = False
- else:
- in_quote_block = True
- if char == "\"":
- if in_double_quote_block:
- in_double_quote_block = False
- else:
- in_double_quote_block = True
- if char == ";":
- if not in_quote_block:
- if not in_double_quote_block:
- char = char + "\n\t"
-
- converted_map = converted_map + char
-
-if output_file == "":
- output_file = map_file
-with open(output_file, "r+") as final_converted_map:
- final_converted_map.write("//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE \n")
- final_converted_map.write(converted_map)
-
-
-
diff --git a/tools/mapmerge/MapMerge.jar b/tools/mapmerge/MapMerge.jar
index e0bd47ea836..c8e4349ba42 100644
Binary files a/tools/mapmerge/MapMerge.jar and b/tools/mapmerge/MapMerge.jar differ
diff --git a/tools/mapmerge/Run Map Merge.bat b/tools/mapmerge/Run Map Merge.bat
index 1c159f79ca2..5bb8f1736b9 100644
--- a/tools/mapmerge/Run Map Merge.bat
+++ b/tools/mapmerge/Run Map Merge.bat
@@ -1,5 +1,4 @@
@echo off
-
-java -jar MapMerge.jar ../../_maps/
+call java -jar MapMerge.jar "../../_maps/" /wait
pause
\ No newline at end of file
diff --git a/tools/mapmerge/Source/.settings/org.eclipse.jdt.ui.prefs b/tools/mapmerge/Source/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..ea0a123b8b0
--- /dev/null
+++ b/tools/mapmerge/Source/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,60 @@
+cleanup.add_default_serial_version_id=false
+cleanup.add_generated_serial_version_id=true
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=true
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=false
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=true
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=false
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=true
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=true
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Default
+cleanup_settings_version=2
+eclipse.preferences.version=1
diff --git a/tools/mapmerge/Source/bin/MapMerge.class b/tools/mapmerge/Source/bin/MapMerge.class
new file mode 100644
index 00000000000..9a6d17f143f
Binary files /dev/null and b/tools/mapmerge/Source/bin/MapMerge.class differ
diff --git a/tools/mapmerge/Source/bin/MapMergerMain.class b/tools/mapmerge/Source/bin/MapMergerMain.class
deleted file mode 100644
index c0ec043c239..00000000000
Binary files a/tools/mapmerge/Source/bin/MapMergerMain.class and /dev/null differ
diff --git a/tools/mapmerge/Source/bin/MapPatcher Source/Location.class b/tools/mapmerge/Source/bin/MapPatcher Source/Location.class
deleted file mode 100644
index a6ad8cca026..00000000000
Binary files a/tools/mapmerge/Source/bin/MapPatcher Source/Location.class and /dev/null differ
diff --git a/tools/mapmerge/Source/bin/MapPatcher Source/Map.class b/tools/mapmerge/Source/bin/MapPatcher Source/Map.class
deleted file mode 100644
index 814958657bc..00000000000
Binary files a/tools/mapmerge/Source/bin/MapPatcher Source/Map.class and /dev/null differ
diff --git a/tools/mapmerge/Source/bin/MapPatcher Source/MapPatcher.class b/tools/mapmerge/Source/bin/MapPatcher Source/MapPatcher.class
deleted file mode 100644
index 286c9a4a9c3..00000000000
Binary files a/tools/mapmerge/Source/bin/MapPatcher Source/MapPatcher.class and /dev/null differ
diff --git a/tools/mapmerge/Source/bin/MapPatcher Source/SavingThread.class b/tools/mapmerge/Source/bin/MapPatcher Source/SavingThread.class
deleted file mode 100644
index 0be31fccea8..00000000000
Binary files a/tools/mapmerge/Source/bin/MapPatcher Source/SavingThread.class and /dev/null differ
diff --git a/tools/mapmerge/Source/src/MapMerge.java b/tools/mapmerge/Source/src/MapMerge.java
new file mode 100644
index 00000000000..a2058480a21
--- /dev/null
+++ b/tools/mapmerge/Source/src/MapMerge.java
@@ -0,0 +1,105 @@
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Scanner;
+
+public class MapMerge {
+
+ private static Scanner input = new Scanner(System.in);
+ private static Path pathToMaps;
+
+ public static void main(String[] mapPath) throws IOException {
+ pathToMaps = Paths.get(mapPath[0]);
+ FileFinder dmmFinder = new FileFinder("*.dmm");
+ Files.walkFileTree(pathToMaps, dmmFinder);
+ ArrayList foundFiles = dmmFinder.foundPaths;
+ if (foundFiles.size() > 0) {
+ try {
+ MapMerge.merge(foundFiles);
+ } catch (Exception e) {
+ System.out.println("Something went wrong.");
+ e.printStackTrace();
+ }
+ } else {
+ System.out.println("No files were found in provided directory!");
+ System.out.print("Path to maps folder: ");
+ pathToMaps = Paths.get(input.nextLine());
+ dmmFinder = new FileFinder("*.dmm");
+ Files.walkFileTree(pathToMaps, dmmFinder);
+ foundFiles = dmmFinder.foundPaths;
+ try {
+ MapMerge.merge(foundFiles);
+ } catch (Exception e) {
+ System.out.println("Something went wrong.");
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public static void merge(ArrayList foundFiles) throws IOException {
+
+ System.out.println("How many files do you want to merge?");
+ int selection1;
+ inputCheck: while (true) {
+ while (!input.hasNextInt()) {
+ String temp = input.next();
+ System.out.println(temp + " is not a valid int.");
+ }
+ selection1 = input.nextInt();
+ if (selection1 < 0) {
+ System.out.println("Use a number greater than 0!");
+ continue inputCheck;
+ } else {
+ break inputCheck;
+ }
+ }
+
+ for (int numOfFiles = selection1; numOfFiles != 0; numOfFiles--) {
+
+ for (int num = 0; num < foundFiles.size(); num++) {
+ System.out.println(num + ": " + foundFiles.get(num));
+ }
+
+ System.out.print("File to use: ");
+ int selection2;
+ inputCheck: while (true) {
+ while (!input.hasNextInt()) {
+ String temp = input.next();
+ System.out.println(temp + " is not a valid int.");
+ }
+ selection2 = input.nextInt();
+ if ((selection2 < 0) || (selection2 >= foundFiles.size())) {
+ if (selection2 < 0) {
+ System.out.println("Use a number greater than 0!");
+ } else {
+ System.out.println("Use a number less than " + foundFiles.size() + "!");
+ }
+ continue inputCheck;
+ } else {
+ break inputCheck;
+ }
+ }
+
+ String selected_map = foundFiles.get(selection2) + "";
+ String backup_map = selected_map + ".backup";
+ String edited_map = selected_map;
+ String to_save = selected_map;
+ String[] passInto = { "-clean", backup_map, edited_map, to_save };
+ MapPatcher.main(passInto);
+ try{
+ Process process = new ProcessBuilder("dmm2tgm\\dmm2tgm.exe", selected_map).start();
+ }catch(Exception e1){
+ System.out.println("You are not on a windows machine, trying the .py");
+ try{
+ Process process = new ProcessBuilder("dmm2tgm\\Source\\dmm2tgm.py", selected_map).start();
+ }catch(Exception e2){
+ System.out.println("You do not have python 2.7.x installed.");
+ System.out.println("Downloads can be found here: https://www.python.org/downloads/");
+ }
+ }
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/tools/mapmerge/Source/src/MapMergerMain.java b/tools/mapmerge/Source/src/MapMergerMain.java
deleted file mode 100644
index 873ae69cd84..00000000000
--- a/tools/mapmerge/Source/src/MapMergerMain.java
+++ /dev/null
@@ -1,96 +0,0 @@
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Scanner;
-
-public class MapMergerMain {
-
- private static Scanner input = new Scanner(System.in);
-
- public static void main(String[] mapPath) throws IOException{
- Path pathToMaps = Paths.get(mapPath[0]);
- FileFinder dmmFinder = new FileFinder("*.dmm");
- Files.walkFileTree(pathToMaps, dmmFinder);
- ArrayList foundFiles = dmmFinder.foundPaths;
- if (foundFiles.size() > 0) {
- try{
- merge(foundFiles);
- }catch(Exception e){
- System.out.println("Something went wrong.");
- e.printStackTrace();
- }
- }else{
- System.out.println("No files were found in provided directory!");
- System.out.print("Path to maps folder: ");
- pathToMaps = Paths.get(input.nextLine());
- dmmFinder = new FileFinder("*.dmm");
- Files.walkFileTree(pathToMaps, dmmFinder);
- foundFiles = dmmFinder.foundPaths;
- try{
- merge(foundFiles);
- }catch(Exception e){
- System.out.println("Something went wrong.");
- e.printStackTrace();
- }
- }
- }
-
-
- public static void merge(ArrayList foundFiles){
-
- System.out.println("How many files do you want to merge?");
- int selection1;
- inputCheck:while(true){
- while(!input.hasNextInt()){
- String temp = input.next();
- System.out.println(temp + " is not a valid int.");
- }
- selection1 = input.nextInt();
- if(selection1 < 0){
- System.out.println("Use a number greater than 0!");
- continue inputCheck;
- }else{
- break inputCheck;
- }
- }
-
- for(int numOfFiles = selection1; numOfFiles != 0; numOfFiles--){
-
- for(int num = 0;num < foundFiles.size();num++){
- System.out.println(num + ": " + foundFiles.get(num));
- }
-
- System.out.print("File to use: ");
- int selection2;
- inputCheck:while(true){
- while(!input.hasNextInt()){
- String temp = input.next();
- System.out.println(temp + " is not a valid int.");
- }
- selection2 = input.nextInt();
- if(selection2 < 0 || selection2 >= foundFiles.size()){
- if(selection2 < 0){
- System.out.println("Use a number greater than 0!");
- }else{
- System.out.println("Use a number less than " + foundFiles.size() +"!");
- }
- continue inputCheck;
- }else{
- break inputCheck;
- }
- }
-
- String newMap = foundFiles.get(selection2) + "";
- String oldMap = foundFiles.get(selection2) + ".backup";
- String[] passInto = new String[4];
- passInto[0] = "-clean";
- passInto[1] = oldMap;
- passInto[2] = newMap;
- passInto[3] = newMap;
- MapPatcher.main(passInto);
- }
- }
-
-}
\ No newline at end of file
diff --git a/tools/mapmerge/dmm2tgm/Source/dmm2tgm.py b/tools/mapmerge/dmm2tgm/Source/dmm2tgm.py
new file mode 100644
index 00000000000..637986f9a67
--- /dev/null
+++ b/tools/mapmerge/dmm2tgm/Source/dmm2tgm.py
@@ -0,0 +1,77 @@
+
+import sys
+
+# .dmm format converter, by RemieRichards
+# Version 2.0
+# Converts the internal structure of a .dmm file to a syntax
+# that git can better handle conflicts-wise, it's also fairly human readable!
+# Processes Boxstation (tgstation.2.1.3) almost instantly
+
+
+def convert_map(map_file):
+ #CHECK FOR PREVIOUS CONVERSION
+ with open(map_file, "r") as conversion_candidate:
+ header = conversion_candidate.readline()
+ if header.find("//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE") != -1:
+ sys.exit()
+ return
+
+
+ #ACTUAL CONVERSION
+ with open(map_file, "r+") as unconverted_map:
+ characters = unconverted_map.read()
+ converted_map = ""
+ in_object_block = False #()
+ in_variable_block = False #{}
+ in_quote_block = False #''
+ in_double_quote_block = False #""
+ for char in characters:
+ if not in_quote_block: #Checking for things like "Flashbangs (Warning!)" Because we only care about ({'";, that are used as byond syntax, not strings
+ if not in_double_quote_block:
+ if not in_variable_block:
+ if char == "(":
+ in_object_block = True
+ char = char + "\n"
+ if char == ")":
+ in_object_block = False
+ if char == ",":
+ char = char + "\n"
+
+ if char == "{":
+ in_variable_block = True
+ if in_object_block:
+ char = char + "\n\t"
+ if char == "}":
+ in_variable_block = False
+ if in_object_block:
+ char = "\n\t" + char
+
+ if char == ";":
+ char = char + "\n\t"
+
+ if char == "\"":
+ if in_double_quote_block:
+ in_double_quote_block = False
+ else:
+ in_double_quote_block = True
+
+ if char == "'":
+ if not in_double_quote_block:
+ if in_quote_block:
+ in_quote_block = False
+ else:
+ in_quote_block = True
+
+ converted_map = converted_map + char
+
+ #OVERWRITE MAP FILE WITH CONVERTED MAP STRING
+ with open(map_file, "r+") as final_converted_map:
+ final_converted_map.write("//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE \n")
+ final_converted_map.write(converted_map)
+
+ sys.exit()
+
+
+if sys.argv[1]: #Run like dmm2tgm.py "folder/folder/a_map.dmm"
+ convert_map(sys.argv[1])
+
diff --git a/tools/mapmerge/dmm2tgm/_hashlib.pyd b/tools/mapmerge/dmm2tgm/_hashlib.pyd
new file mode 100644
index 00000000000..9cf823e4757
Binary files /dev/null and b/tools/mapmerge/dmm2tgm/_hashlib.pyd differ
diff --git a/tools/mapmerge/dmm2tgm/bz2.pyd b/tools/mapmerge/dmm2tgm/bz2.pyd
new file mode 100644
index 00000000000..b388111d6ac
Binary files /dev/null and b/tools/mapmerge/dmm2tgm/bz2.pyd differ
diff --git a/tools/mapmerge/dmm2tgm/dmm2tgm.exe b/tools/mapmerge/dmm2tgm/dmm2tgm.exe
new file mode 100644
index 00000000000..fba25d71d02
Binary files /dev/null and b/tools/mapmerge/dmm2tgm/dmm2tgm.exe differ
diff --git a/tools/mapmerge/dmm2tgm/library.zip b/tools/mapmerge/dmm2tgm/library.zip
new file mode 100644
index 00000000000..068102032b4
Binary files /dev/null and b/tools/mapmerge/dmm2tgm/library.zip differ
diff --git a/tools/mapmerge/dmm2tgm/python27.dll b/tools/mapmerge/dmm2tgm/python27.dll
new file mode 100644
index 00000000000..e45374fb339
Binary files /dev/null and b/tools/mapmerge/dmm2tgm/python27.dll differ
diff --git a/tools/mapmerge/dmm2tgm/select.pyd b/tools/mapmerge/dmm2tgm/select.pyd
new file mode 100644
index 00000000000..62104e489e7
Binary files /dev/null and b/tools/mapmerge/dmm2tgm/select.pyd differ
diff --git a/tools/mapmerge/dmm2tgm/unicodedata.pyd b/tools/mapmerge/dmm2tgm/unicodedata.pyd
new file mode 100644
index 00000000000..f6a0f525618
Binary files /dev/null and b/tools/mapmerge/dmm2tgm/unicodedata.pyd differ
diff --git a/tools/mapmerge/dmm2tgm/w9xpopen.exe b/tools/mapmerge/dmm2tgm/w9xpopen.exe
new file mode 100644
index 00000000000..93036283633
Binary files /dev/null and b/tools/mapmerge/dmm2tgm/w9xpopen.exe differ