The water burns!"
+ user.reagents.add_reagent("hell_water",20)
+ else
+ user << "The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards."
+ user.reagents.add_reagent("godblood",20)
+ update_icons()
+ addtimer(src, "update_icons", time_between_uses)
+
+
+/obj/structure/divine/healingfountain/update_icons()
+ if(last_process + time_between_uses > world.time)
+ icon_state = "fountain"
+ else
+ icon_state = "fountain-[side]"
+
+
+/obj/structure/divine/powerpylon
+ name = "power pylon"
+ desc = "A pylon which increases the deity's rate it can influence the world."
+ icon_state = "powerpylon"
+ density = 1
+ health = 30
+ maxhealth = 30
+ metal_cost = 5
+ glass_cost = 15
+
+
+/obj/structure/divine/powerpylon/New()
+ ..()
+ if(deity && deity.god_nexus)
+ deity.god_nexus.powerpylons += src
+
+
+/obj/structure/divine/powerpylon/Destroy()
+ if(deity && deity.god_nexus)
+ deity.god_nexus.powerpylons -= src
+ return ..()
+
+
+/obj/structure/divine/powerpylon/deactivate()
+ ..()
+ if(deity)
+ deity.god_nexus.powerpylons -= src
+
+/obj/structure/divine/powerpylon/activate()
+ ..()
+ if(deity)
+ deity.god_nexus.powerpylons += src
+
+/obj/structure/divine/defensepylon
+ name = "defense pylon"
+ desc = "A pylon which is blessed to withstand many blows, and fire strong bolts at nonbelievers. A god can toggle it."
+ icon_state = "defensepylon"
+ health = 150
+ maxhealth = 150
+ metal_cost = 25
+ glass_cost = 30
+ var/obj/machinery/porta_turret/defensepylon_internal_turret/pylon_gun
+
+
+/obj/structure/divine/defensepylon/New()
+ ..()
+ pylon_gun = new(src)
+ pylon_gun.base = src
+ pylon_gun.faction = list("[side] god")
+
+
+/obj/structure/divine/defensepylon/Destroy()
+ qdel(pylon_gun) //just in case
+ return ..()
+
+
+/obj/structure/divine/defensepylon/examine(mob/user)
+ ..()
+ user << "\The [src] looks [pylon_gun.on ? "on" : "off"]."
+
+
+/obj/structure/divine/defensepylon/assign_deity(mob/camera/god/new_deity, alert_old_deity = TRUE)
+ if(..() && pylon_gun)
+ pylon_gun.faction = list("[side] god")
+ pylon_gun.side = side
+
+/obj/structure/divine/defensepylon/attack_god(mob/camera/god/user)
+ if(user.side == side)
+ if(deactivated)
+ user << "You need to reveal it first!"
+ return
+ pylon_gun.on = !pylon_gun.on
+ icon_state = (pylon_gun.on) ? "defensepylon-[side]" : "defensepylon"
+
+/obj/structure/divine/defensepylon/deactivate()
+ ..()
+ pylon_gun.on = 0
+ icon_state = (pylon_gun.on) ? "defensepylon-[side]" : "defensepylon"
+
+/obj/structure/divine/defensepylon/activate()
+ ..()
+ pylon_gun.on = 1
+ icon_state = (pylon_gun.on) ? "defensepylon-[side]" : "defensepylon"
+
+//This sits inside the defensepylon, to avoid copypasta
+/obj/machinery/porta_turret/defensepylon_internal_turret
+ name = "defense pylon"
+ desc = "A plyon which is blessed to withstand many blows, and fire strong bolts at nonbelievers."
+ icon = 'icons/obj/hand_of_god_structures.dmi'
+ installation = null
+ always_up = 1
+ use_power = 0
+ has_cover = 0
+ health = 200
+ projectile = /obj/item/projectile/beam/pylon_bolt
+ eprojectile = /obj/item/projectile/beam/pylon_bolt
+ shot_sound = 'sound/weapons/emitter2.ogg'
+ eshot_sound = 'sound/weapons/emitter2.ogg'
+ base_icon_state = "defensepylon"
+ active_state = ""
+ off_state = ""
+ faction = null
+ emp_vunerable = 0
+ var/side = "neutral"
+
+/obj/machinery/porta_turret/defensepylon_internal_turret/setup()
+ return
+
+/obj/machinery/porta_turret/defensepylon_internal_turret/shootAt(atom/movable/target)
+ var/obj/item/projectile/A = ..()
+ if(A)
+ A.color = side
+
+/obj/machinery/porta_turret/defensepylon_internal_turret/assess_perp(mob/living/carbon/human/perp)
+ if(perp.handcuffed) //dishonourable to kill somebody who might be converted.
+ return 0
+ var/badtarget = 0
+ switch(side)
+ if("blue")
+ badtarget = is_handofgod_bluecultist(perp)
+ if("red")
+ badtarget = is_handofgod_redcultist(perp)
+ else
+ badtarget = 1
+ if(badtarget)
+ return 0
+ return 10
+
+
+
+/obj/item/projectile/beam/pylon_bolt
+ name = "divine bolt"
+ icon_state = "greyscale_bolt"
+ damage = 15
+
+
+/obj/structure/divine/shrine
+ name = "shrine"
+ desc = "A shrine dedicated to a deity."
+ icon_state = "shrine"
+ metal_cost = 15
+ glass_cost = 15
+
+
+/obj/structure/divine/shrine/assign_deity(mob/camera/god/new_deity, alert_old_deity = TRUE)
+ if(..())
+ name = "shrine to [new_deity.name]"
+ desc = "A shrine dedicated to [new_deity.name]"
+
+
+
+
+//Functional, but need sprites
+/*
+/obj/structure/divine/translocator
+ name = "translocator"
+ desc = "A powerful structure, made with a greater gem. It allows a deity to move their nexus to where this stands"
+ icon_state = "translocator"
+ health = 100
+ maxhealth = 100
+ metal_cost = 20
+ glass_cost = 20
+ greater_gem_cost = 1
+
+
+/obj/structure/divine/lazarusaltar
+ name = "lazarus altar"
+ desc = "A very powerful altar capable of bringing life back to the recently deceased, made with a greater gem. It can revive anyone and will heal virtually all wounds, but they are but a shell of their former self."
+ icon_state = "lazarusaltar"
+ density = 0
+ health = 100
+ maxhealth = 100
+ metal_cost = 20
+ greater_gem_cost = 1
+
+
+/obj/structure/divine/lazarusaltar/attack_hand(mob/living/user)
+ var/mob/living/L = locate() in get_turf(src)
+ if(!is_handofgod_culstist(user))
+ user << "You try to use it, but unfortunately you don't know any rituals."
+ return
+ if(!L)
+ return
+
+ if((side == "red" && is_handofgod_redcultist(user))) || (side == "blue" && is_handofgod_bluecultist(user)))
+ user << "You attempt to revive [L] by invoking the rebirth ritual."
+ L.revive()
+ L.adjustCloneLoss(50)
+ L.adjustStaminaLoss(100)
+ else
+ user << "You attempt to revive [L] by invoking the rebirth ritual."
+ user << "But the altar ignores your words..."
+*/
+
+
diff --git a/code/game/gamemodes/handofgod/traps.dm b/code/game/gamemodes/handofgod/traps.dm
new file mode 100644
index 0000000000..b39475f0ce
--- /dev/null
+++ b/code/game/gamemodes/handofgod/traps.dm
@@ -0,0 +1,109 @@
+
+/obj/structure/divine/trap
+ name = "IT'S A TARP"
+ desc = "stepping on me is a guaranteed bad day"
+ icon_state = "trap"
+ density = 0
+ alpha = 30 //initially quite hidden when not "recharging"
+ health = 20
+ maxhealth = 20
+ trap = TRUE
+ autocolours = FALSE
+ var/last_trigger = 0
+ var/time_between_triggers = 600 //takes a minute to recharge
+
+
+/obj/structure/divine/trap/Crossed(atom/movable/AM)
+ if(last_trigger + time_between_triggers > world.time)
+ return
+ alpha = initial(alpha)
+ if(isliving(AM))
+ var/mob/living/L = AM
+ last_trigger = world.time
+ alpha = 200
+ trap_effect(L)
+ animate(src, alpha = initial(alpha), time = time_between_triggers)
+
+
+/obj/structure/divine/trap/examine(mob/user)
+ ..()
+ if(!isliving(user)) //bad ghosts, stop trying to powergame from beyond the grave
+ return
+ user << "You reveal a trap!"
+ alpha = 200
+ animate(src, alpha = initial(alpha), time = time_between_triggers)
+
+
+/obj/structure/divine/trap/proc/trap_effect(mob/living/L)
+ return
+
+
+/obj/structure/divine/trap/stun
+ name = "shock trap"
+ desc = "A trap that will shock you, it will burn your flesh and render you immobile, You'd better avoid it."
+ icon_state = "trap-shock"
+
+
+/obj/structure/divine/trap/stun/trap_effect(mob/living/L)
+ L << "You are paralyzed from the intense shock!"
+ L.Weaken(5)
+ var/turf/Lturf = get_turf(L)
+ new /obj/effect/particle_effect/sparks/electricity(Lturf)
+ new /obj/effect/particle_effect/sparks(Lturf)
+
+
+/obj/structure/divine/trap/fire
+ name = "flame trap"
+ desc = "A trap that will set you ablaze. You'd better avoid it."
+ icon_state = "trap-fire"
+
+
+/obj/structure/divine/trap/fire/trap_effect(mob/living/L)
+ L << "Spontaneous combustion!"
+ L.Weaken(1)
+ var/turf/Lturf = get_turf(L)
+ new /obj/effect/hotspot(Lturf)
+ new /obj/effect/particle_effect/sparks(Lturf)
+
+
+/obj/structure/divine/trap/chill
+ name = "frost trap"
+ desc = "A trap that will chill you to the bone. You'd better avoid it."
+ icon_state = "trap-frost"
+
+
+/obj/structure/divine/trap/chill/trap_effect(mob/living/L)
+ L << "You're frozen solid!"
+ L.Weaken(1)
+ L.bodytemperature -= 300
+ new /obj/effect/particle_effect/sparks(get_turf(L))
+
+
+/obj/structure/divine/trap/damage
+ name = "earth trap"
+ desc = "A trap that will summon a small earthquake, just for you. You'd better avoid it."
+ icon_state = "trap-earth"
+
+
+/obj/structure/divine/trap/damage/trap_effect(mob/living/L)
+ L << "The ground quakes beneath your feet!"
+ L.Weaken(5)
+ L.adjustBruteLoss(35)
+ var/turf/Lturf = get_turf(L)
+ new /obj/effect/particle_effect/sparks(Lturf)
+ new /obj/structure/flora/rock(Lturf)
+
+
+/obj/structure/divine/trap/ward
+ name = "divine ward"
+ desc = "A divine barrier, It looks like you could destroy it with enough effort, or wait for it to dissipate..."
+ icon_state = "ward"
+ health = 150
+ maxhealth = 150
+ density = 1
+ time_between_triggers = 1200 //Exists for 2 minutes
+
+
+/obj/structure/divine/trap/ward/New()
+ ..()
+ QDEL_IN(src, time_between_triggers)
diff --git a/code/game/gamemodes/miniantags/hades/hades.dm b/code/game/gamemodes/miniantags/hades/hades.dm
new file mode 100644
index 0000000000..9b9f1cbf80
--- /dev/null
+++ b/code/game/gamemodes/miniantags/hades/hades.dm
@@ -0,0 +1,765 @@
+#define STATE_JUDGE 0
+#define STATE_WRATH 1
+#define STATE_FLEE 2
+
+/mob/living/simple_animal/hostile/hades
+ name = "hades"
+ real_name = "hades"
+ desc = "A strange being, clad in dark robes. Their very presence radiates an uneasy power."
+ speak_emote = list("preaches","announces","spits","conveys")
+ emote_hear = list("hums.","prays.")
+ response_help = "kneels before"
+ response_disarm = "flails at"
+ response_harm = "punches"
+ icon = 'icons/mob/EvilPope.dmi'
+ icon_state = "EvilPope"
+ icon_living = "EvilPope"
+ icon_dead = "popedeath"
+ speed = 1
+ a_intent = "harm"
+ status_flags = CANPUSH
+ attack_sound = 'sound/magic/MAGIC_MISSILE.ogg'
+ death_sound = 'sound/magic/Teleport_diss.ogg'
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minbodytemp = 0
+ maxbodytemp = INFINITY
+ faction = list("hades")
+ attacktext = "strikes with an unholy rage at"
+ maxHealth = 1000
+ health = 1000
+ healable = 0
+ environment_smash = 3
+ melee_damage_lower = 15
+ melee_damage_upper = 20
+ see_in_dark = 8
+ see_invisible = SEE_INVISIBLE_MINIMUM
+ loot = list(/obj/effect/decal/cleanable/blood)
+ del_on_death = 0
+ deathmessage = "begins to sizzle and pop, their flesh peeling away like paper."
+
+ var/isDoingDeath = FALSE
+ var/isFleeing = FALSE
+ var/fleeTimes = 0
+ var/currentState = STATE_JUDGE
+ var/rageLevel = 0
+
+ var/maxWrathTimer = 150
+ var/lastWrathTimer = 0
+
+ var/timeBetweenGrabs = 60
+ var/lastGrabTime = 0
+
+ var/list/validSins = list("Greed","Gluttony","Pride","Lust","Envy","Sloth","Wrath")
+ var/lastsinPerson = 0
+ var/sinPersonTime = 300
+ var/lastFlee = 0
+ var/fleeTimer = 30
+ var/fakesinPersonChance = 60
+ var/list/sinPersonsayings = list("You revel in only your own greed.",\
+ "There is nothing but your absolution.",\
+ "Your choices have led you to this.",\
+ "There is only one way out.",\
+ "The only way to be free is to be free of yourself.",\
+ "Wallow in sin, and give yourself unto darkness.",\
+ "Only the truly sinful may stand.",\
+ "Find yourself and you will find Absolution.",\
+ "Forego the pain of this process, and submit.",\
+ "We can be one in suffering.",\
+ "You stand on the precipice of ascension, give in.",\
+ "You cannot fathom what lies beyond",\
+ "Repent your sins.",\
+ "This is the eve of your last days.",\
+ "Darkness comes.")
+
+ var/list/creepyasssounds = list('sound/hallucinations/behind_you1.ogg', 'sound/hallucinations/behind_you2.ogg', \
+ 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg',\
+ 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\
+ 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg',\
+ 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\
+ 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg')
+
+ var/obj/effect/proc_holder/spell/targeted/lightning/sinLightning
+
+ var/list/currentAcolytes = list()
+
+/mob/living/simple_animal/hostile/hades/New()
+ ..()
+
+ sinLightning = new/obj/effect/proc_holder/spell/targeted/lightning(src)
+
+ sinLightning.charge_max = 1
+ sinLightning.clothes_req = 0
+ sinLightning.range = 32
+ sinLightning.cooldown_min = 1
+
+ lastsinPerson = world.time
+ var/list/possible_titles = list("Pope","Bishop","Lord","Cardinal","Deacon","Pontiff")
+ var/chosen = "Hades, [pick(possible_titles)] of Sin"
+ name = chosen
+ real_name = chosen
+
+ world << "[name] has entered your reality. Kneel before them."
+ world << 'sound/effects/pope_entry.ogg'
+
+ Appear(get_turf(src))
+
+/mob/living/simple_animal/hostile/hades/handle_environment(datum/gas_mixture/environment)
+ //space popes are from space, they need not your fickle "oxygen"
+ return
+
+/mob/living/simple_animal/hostile/hades/handle_temperature_damage()
+ //space popes are from space, they don't uh.. something fire burny death
+ return
+
+/mob/living/simple_animal/hostile/hades/death(gibbed)
+ if(!isDoingDeath)
+ notransform = TRUE
+ anchored = TRUE
+ src.visible_message("[src] begins to twist and distort, before snapping backwards with a sickening crunch.")
+ spawn(20)
+ src.visible_message("[src] is being sucked back to their own realm, destabilizing the fabric of time and space itself!")
+ playsound(get_turf(src), 'sound/effects/hyperspace_begin.ogg', 100, 1)
+ isDoingDeath = TRUE
+ AIStatus = AI_OFF
+ SpinAnimation()
+ for(var/i in 1 to 5)
+ for(var/turf/T in spiral_range_turfs(i,src))
+ addtimer(src, "sinShed", i*10, FALSE, T)
+ spawn(60) // required to be spawn so we can call death's ..() to complete death.
+ SpinAnimation(0,0)
+ explosion(get_turf(src), 0, 2, 4, 6, flame_range = 6)
+ ..()
+ var/area/A = locate(/area/hades) in world
+ if(A)
+ var/turf/T = get_turf(locate(/obj/effect/landmark/event_spawn) in A)
+ if(T)
+ src.visible_message("[src]'s Staff is flung free as their body explodes.")
+ var/obj/structure/ladder/unbreakable/hades/churchLadder = new/obj/structure/ladder/unbreakable/hades(T)
+ var/obj/structure/ladder/unbreakable/hades/bodyLadder = new/obj/structure/ladder/unbreakable/hades(get_turf(src))
+ var/obj/item/weapon/hades_staff/HS = new/obj/item/weapon/hades_staff(get_turf(src))
+ HS.throw_at_fast(pick(orange(src,7)),10,1)
+ churchLadder.up = bodyLadder
+ bodyLadder.down = churchLadder
+ qdel(src)
+
+/mob/living/simple_animal/hostile/hades/attackby(obj/item/I, mob/user, params)
+ ..()
+ Defend(user,I)
+
+/mob/living/simple_animal/hostile/hades/grabbedby(mob/living/carbon/user, supress_message = 0)
+ ..()
+ Defend(user,user)
+
+/mob/living/simple_animal/hostile/hades/hitby(atom/movable/AM, skipcatch, hitpush, blocked)
+ ..()
+ lastsinPerson -= (sinPersonTime/4)
+ if(istype(AM,/obj/item))
+ var/obj/item/throwCast = AM
+ Defend(throwCast.thrownby,AM)
+
+/mob/living/simple_animal/hostile/hades/bullet_act(obj/item/projectile/P, def_zone)
+ //don't call ..() because we're going to deflect it
+ lastsinPerson -= (sinPersonTime/4)
+ Defend(P.firer,P)
+ return -1
+
+/mob/living/simple_animal/hostile/hades/attack_hand(mob/living/carbon/human/M)
+ ..()
+ lastsinPerson -= (sinPersonTime/4)
+ Defend(M,M)
+
+/mob/living/simple_animal/hostile/hades/proc/Defend(var/mob/attacker,var/source)
+ if(!isDoingDeath)
+ rageLevel += 5
+ src.visible_message("[src] rounds on the [attacker], gazing at them with a [pick("cold","frosty","freezing","dark")] [pick("glare","gaze","glower","stare")].")
+
+ if(istype(source,/obj/item/projectile))
+ src.visible_message("[src] [pick("calmly","silently","nonchalantly")] waves their hand, deflecting the [source].")
+ var/obj/item/projectile/P = source
+ if(P.starting)
+ var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
+ var/new_y = P.starting.y + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
+ var/turf/curloc = get_turf(src)
+
+ P.original = locate(new_x, new_y, P.z)
+ P.starting = curloc
+ P.current = curloc
+ P.firer = src
+ P.yo = new_y - curloc.y
+ P.xo = new_x - curloc.x
+ P.Angle = null
+ else
+ if(prob(20))
+ var/chosenDefend = rand(1,3)
+ switch(chosenDefend)
+ if(1)
+ attacker.visible_message("[attacker] is lifted from the ground, shadowy powers tossing them aside.")
+ attacker.throw_at_fast(pick(orange(src,7)),10,1)
+ if(2)
+ attacker.visible_message("[attacker] crackles with electricity, a bolt leaping from [src] to them.")
+ sinLightning.Bolt(src,attacker,30,5,src)
+ if(3)
+ src.visible_message("[src] points his staff at [attacker], a swarm of eyeballs lurching fourth!")
+ for(var/i in 1 to 4)
+ var/mob/living/simple_animal/hostile/carp/eyeball/E = new/mob/living/simple_animal/hostile/carp/eyeball(pick(orange(attacker,1)))
+ E.faction = faction
+ addtimer(E, "gib", 150, FALSE)
+
+/mob/living/simple_animal/hostile/hades/proc/sinShed(var/turf/T)
+ var/obj/effect/overlay/temp/cult/sparks/S = PoolOrNew(/obj/effect/overlay/temp/cult/sparks, T)
+ S.anchored = FALSE
+ S.throw_at_fast(src,10,1)
+ PoolOrNew(/obj/effect/overlay/temp/hadesBlood, T)
+
+/mob/living/simple_animal/hostile/hades/proc/Transfer(var/mob/living/taken, var/turf/transferTarget)
+ if(transferTarget)
+ playsound(get_turf(taken), 'sound/magic/Ethereal_Enter.ogg', 50, 1, -1)
+ PoolOrNew(/obj/effect/overlay/temp/hadesFlick, get_turf(taken))
+ taken.forceMove(transferTarget)
+ Appear(get_turf(taken))
+
+/mob/living/simple_animal/hostile/hades/proc/Appear(var/turf/where)
+ var/obj/effect/timestop/hades/TS = new /obj/effect/timestop/hades(where)
+ TS.immune = list(src)
+
+/mob/living/simple_animal/hostile/hades/Life()
+ if(..() && !isDoingDeath) // appropriately check if we're alive now we leave a corpse
+ if(health > maxHealth/4 && !isFleeing)
+ if(rageLevel > 50)
+ lastWrathTimer = world.time
+ currentState = STATE_WRATH
+ else
+ currentState = STATE_JUDGE
+ else
+ if(world.time > lastFlee + fleeTimer)
+ lastFlee = world.time
+ isFleeing = TRUE
+ currentState = STATE_FLEE
+
+ var/area/healthCheck = get_area(src)
+
+ if(istype(healthCheck,/area/chapel/main))
+ if(currentState == STATE_FLEE)
+ lastWrathTimer = world.time
+ currentState = STATE_WRATH
+ if(health < maxHealth/2)
+ health += 10 // slowly regain hp in the chapel, up to a maximum of half our max
+
+ var/spokenThisTurn = FALSE
+ for(var/mob/living/A in currentAcolytes)
+ if(!A)
+ currentAcolytes -= A
+ continue
+ if(A.health <= 0)
+ rageLevel += 5
+ if(!spokenThisTurn)
+ spokenThisTurn = TRUE
+ var/list/lossSayings = list("They were weak.","For every death, two more rise.",\
+ "What is but one servant lost?","Darkness engulf you!","To the Pit with them.",\
+ "Fools! All of you!","You can't stop me. You. Will. Be. JUDGED.")
+ src.say(pick(lossSayings))
+ currentAcolytes -= A
+ A.gib()
+
+ if(currentState == STATE_WRATH) // we have been enraged.
+ if(world.time > lastWrathTimer + maxWrathTimer)
+ rageLevel = 0 // wind down if we're wrathful too long.
+ rageLevel -= 1 // rage phase starts at 50, meaning roughly 20s of rage.
+ if(currentAcolytes.len == 0)
+ src.say("Rise, Servants. AID YOUR MASTER.")
+ playsound(get_turf(src), 'sound/magic/CastSummon.ogg', 100, 1)
+ for(var/i in 1 to 5)
+ var/mob/living/simple_animal/hostile/hadesacolyte/HA = new/mob/living/simple_animal/hostile/hadesacolyte(get_turf(pick(orange(2,src))))
+ HA.master = src
+ currentAcolytes += HA
+ if(target)
+ if(world.time > lastGrabTime + timeBetweenGrabs)
+ if(get_dist(src,target) > 4) // you can't run from us. upped to 4 to give more leeway.
+ lastGrabTime = world.time
+ var/list/fleeSayings = list("There is no escape from your sins, [target]","Fleeing will only make your punishment worse [target]!",\
+ "There is nowhere you can hide, [target]!","You can't run, [target]!","Get back here, [target]!","You coward, [target]!",\
+ "I will find you, [target]!","Return to me, [target]!")
+ src.say(pick(fleeSayings))
+ var/mob/living/toGrab = target
+ toGrab.Beam(src,"blood",'icons/effects/beam.dmi',10)
+ toGrab.Weaken(6)
+ playsound(get_turf(src), 'sound/magic/CastSummon.ogg', 100, 1)
+ toGrab.throw_at_fast(src,10,1)
+ if(rageLevel >= 100)
+ rageLevel = 50
+ var/list/overboardSayings = list("Ashes! It will all be ashes!","I will bring about the apocolypse!",\
+ "There will be nothing but your withered husks!","Face your doom, cretins!","There. Will. Be. ORDER!",\
+ "I am your Lord, lay down your arms and submit.","Your souls will be cremated!",\
+ "Only in death will you obey!","This is no person's fault but your own!")
+ src.say(pick(overboardSayings))
+ var/turf/StartLoc = get_turf(src)
+ var/list/nearby = orange(6,src)
+ var/slashCount = 0
+ var/aoeType = rand(1,2) // just for future proofing
+ for(var/mob/living/A in nearby)
+ slashCount++
+ A.Beam(src,"blood",'icons/effects/beam.dmi',10)
+ spawn(slashCount + 3)
+ if(aoeType == 1)
+ // no more cheaping it out with non-player mobs like turrets or carps
+ loc = get_turf(A)
+ sinShed(StartLoc)
+ A.attack_animal(src)
+ PoolOrNew(/obj/effect/overlay/temp/hadesBlood,get_turf(A))
+ playsound(get_turf(A), 'sound/magic/SummonItems_generic.ogg', 100, 1)
+ if(aoeType == 2)
+ sinShed(StartLoc)
+ PoolOrNew(/obj/effect/overlay/temp/hadesBite,get_turf(A))
+ A.Weaken(6)
+ var/obj/effect/timestop/hades/large/TS = new /obj/effect/timestop/hades/large(StartLoc)
+ TS.immune = list(src)
+ spawn((slashCount+1)+3)
+ loc = StartLoc
+
+ if(currentState == STATE_FLEE) // we've been wounded, let us flee and lick our wounds
+ var/area/A = locate(/area/chapel/main) in world
+ if(A)
+ var/turf/T = get_turf(locate(/obj/effect/landmark/event_spawn) in A)
+ if(!T)
+ T = get_turf(src) // no event spawn in chapel, fall back to doing it on the spot.
+ if(T)
+ fleeTimes++
+ Transfer(src,T)
+ AIStatus = AI_OFF
+ notransform = TRUE
+ anchored = TRUE
+ for(var/i in 1 to 5)
+ spawn(i*10)
+ for(var/turf/S in oview(i,src) - oview((i)-1,src))
+ sinShed(S)
+ health += maxHealth/(10*fleeTimes) // every flee we gain less HP
+ spawn(50)
+ isFleeing = FALSE
+ notransform = FALSE
+ anchored = FALSE
+ AIStatus = AI_ON
+ currentState = STATE_JUDGE
+ lastsinPerson = 0 // immediately teleport away to judge
+
+ if(currentState == STATE_JUDGE) // our default state, judge a few people and tell them they're rude or something
+ if(world.time > lastsinPerson + sinPersonTime)
+ if(prob(fakesinPersonChance))
+ lastsinPerson = world.time
+ visible_message("[pick(sinPersonsayings)]")
+ playsound(get_turf(src), pick(creepyasssounds), 100, 1)
+ else
+ lastsinPerson = world.time
+ var/mob/living/carbon/human/sinPerson = pick(living_mob_list)
+ var/depth = living_mob_list.len + 1 // just in case
+ if(sinPerson) // no more finding nullcakes
+ if(!sinPerson.ckey)
+ while(!sinPerson.ckey && depth > 0)
+ --depth
+ var/checkPerson = pick(living_mob_list)
+ if(checkPerson)
+ sinPerson = checkPerson
+ if(!sinPerson.ckey)
+ // double check ensure that if the above loop fails to get a ckey target
+ // we don't go and use the last mob checked, causing odd situations
+ return
+ if(sinPerson)
+ if(prob(65)) // moderately high chance for us to go to them, else they come here.
+ Transfer(src,get_turf(pick(oview(1,sinPerson))))
+ else
+ Transfer(sinPerson,get_turf(pick(oview(1,src))))
+ var/sinPersonchoice = pick(validSins)
+ switch(sinPersonchoice)
+ if("Greed")
+ src.say("Your sin, [sinPerson], is Greed.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Greed(sinPerson, TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Greed(sinPerson, FALSE)
+ if("Gluttony")
+ src.say("Your sin, [sinPerson], is Gluttony.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Gluttony(sinPerson,TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Gluttony(sinPerson,FALSE)
+ if("Pride")
+ src.say("Your sin, [sinPerson], is Pride.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Pride(sinPerson,TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Pride(sinPerson,FALSE)
+ if("Lust")
+ src.say("Your sin, [sinPerson], is Lust.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Lust(sinPerson,TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Lust(sinPerson,TRUE)
+ if("Envy")
+ src.say("Your sin, [sinPerson], is Envy.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Envy(sinPerson,TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Envy(sinPerson,FALSE)
+ if("Sloth")
+ src.say("Your sin, [sinPerson], is Sloth.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Sloth(sinPerson,TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Sloth(sinPerson,FALSE)
+ if("Wrath")
+ src.say("Your sin, [sinPerson], is Wrath.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Wrath(sinPerson,TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Wrath(sinPerson,FALSE)
+
+
+///Sin related things
+
+//global Sin procs, shared between staff and pope
+
+/proc/sin_Greed(var/mob/living/carbon/human/sinPerson, var/isIndulged)
+ if(isIndulged)
+ sinPerson << "You feel like you deserve more, in fact, you want everything."
+ var/list/greed = list(/obj/item/stack/sheet/mineral/gold,/obj/item/stack/sheet/mineral/silver,/obj/item/stack/sheet/mineral/diamond)
+ for(var/i in 1 to 10)
+ var/greed_type = pick(greed)
+ new greed_type(get_turf(sinPerson))
+ else
+ sinPerson << "Your body begins to shift and bend, changing to reflect your inner greed."
+ var/mob/living/M = sinPerson.change_mob_type(/mob/living/simple_animal/cockroach,get_turf(sinPerson),"Greedroach",1)
+ M.AddSpell(new/obj/effect/proc_holder/spell/targeted/mind_transfer)
+
+/proc/sin_Gluttony(var/mob/living/carbon/human/sinPerson, var/isIndulged)
+ if(isIndulged)
+ sinPerson << "Your stomach growls, you feel hungry."
+ var/list/allTypes = list()
+ for(var/A in typesof(/obj/item/weapon/reagent_containers/food/snacks))
+ var/obj/item/weapon/reagent_containers/food/snacks/O = A
+ if(initial(O.cooked_type))
+ allTypes += A
+ for(var/i in 1 to 10)
+ var/greed_type = pick(allTypes)
+ new greed_type(get_turf(sinPerson))
+ else
+ sinPerson << "Your body begins to bloat and stretch, bile rising in your throat."
+ sinPerson.reagents.add_reagent("nutriment",1000)
+
+/proc/sin_Pride(var/mob/living/carbon/human/sinPerson, var/isIndulged)
+ if(isIndulged)
+ sinPerson << "You feel strong enough to take on the world."
+ var/obj/item/weapon/twohanded/sin_pride/good = new/obj/item/weapon/twohanded/sin_pride(get_turf(sinPerson))
+ good.name = "Indulged [good.name]"
+ good.pride_direction = FALSE
+ else
+ sinPerson << "You feel small and weak, like the entire world is against you."
+ var/obj/item/weapon/twohanded/sin_pride/bad = new/obj/item/weapon/twohanded/sin_pride(get_turf(sinPerson))
+ bad.name = "Punished [bad.name]"
+ bad.pride_direction = TRUE
+
+/proc/sin_Lust(var/mob/living/carbon/human/sinPerson, var/isIndulged)
+ if(isIndulged)
+ sinPerson << "You feel confident, like everything and everyone is drawn to you."
+ var/obj/item/lovestone/good = new/obj/item/lovestone(get_turf(sinPerson))
+ good.name = "Indulged [good.name]"
+ good.lust_direction = FALSE
+ else
+ sinPerson << "You feel lonely... the wish for the warmth of another spark through your mind."
+ var/obj/item/lovestone/bad = new/obj/item/lovestone(get_turf(sinPerson))
+ bad.name = "Punished [bad.name]"
+ bad.lust_direction = TRUE
+
+/proc/sin_Envy(var/mob/living/carbon/human/sinPerson, var/isIndulged)
+ if(isIndulged)
+ for(var/mob/living/carbon/human/H in player_list) // name lottery
+ if(H == sinPerson)
+ continue
+ if(prob(25))
+ sinPerson.name = H.name
+ sinPerson.real_name = H.real_name
+ var/datum/dna/lottery = H.dna
+ lottery.transfer_identity(sinPerson, transfer_SE=1)
+ sinPerson.updateappearance(mutcolor_update=1)
+ sinPerson.domutcheck()
+ sinPerson << "You feel envious of [sinPerson.name], and your body shifts to reflect that!"
+ else
+ var/sinPersonspecies = pick(species_list)
+ var/newtype = species_list[sinPersonspecies]
+ sinPerson << "You wish for more from yourself.. your body shifts to suit your wish."
+ sinPerson.set_species(newtype)
+
+/proc/sin_Sloth(var/mob/living/carbon/human/sinPerson, var/isIndulged)
+ if(isIndulged)
+ sinPerson << "You feel tired..."
+ sinPerson.drowsyness += 100
+ else
+ sinPerson << "A chill comes over your body, the feeling of frostbite nipping at your fingers."
+ sinPerson.reagents.add_reagent("frostoil", 50)
+
+/proc/sin_Wrath(var/mob/living/carbon/human/sinPerson, var/isIndulged)
+ if(isIndulged)
+ sinPerson << "You feel wrathful, like you want to destroy everyone and everything."
+ sinPerson.change_mob_type(/mob/living/simple_animal/slaughter,get_turf(sinPerson),"Wrath Demon",1)
+ else
+ sinPerson << "Your chest feels tight, and the world begins to spin around you."
+ sinPerson.reagents.add_reagent("lexorin", 29)
+ sinPerson.reagents.add_reagent("mindbreaker", 29)
+
+/obj/effect/overlay/temp/hadesFlick
+ name = "transdimensional waste"
+ icon = 'icons/mob/mob.dmi'
+ icon_state = "liquify"
+ duration = 15
+
+/obj/effect/overlay/temp/hadesBite
+ name = "biting tendril"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "tendril_bite"
+ duration = 15
+
+/obj/effect/overlay/temp/hadesBlood
+ name = "blood plume"
+ icon = 'icons/effects/128x128.dmi'
+ icon_state = "spray_plume"
+ duration = 30
+
+/obj/effect/timestop/hades // custom timeslip to make him immune
+ name = "Frozen Time"
+ desc = "Time has slowed to a halt."
+
+/obj/effect/timestop/hades/New()
+ spawn(5)
+ ..()
+
+/obj/effect/timestop/hades/large
+ freezerange = 6
+ icon_state = "huge_rune"
+ icon = 'icons/effects/224x224.dmi'
+
+
+/obj/item/weapon/twohanded/sin_pride
+ icon_state = "mjollnir0"
+ name = "Pride-struck Hammer"
+ desc = "It resonates an aura of Pride."
+ force = 5
+ throwforce = 15
+ w_class = 4
+ slot_flags = SLOT_BACK
+ force_unwielded = 5
+ force_wielded = 20
+ attack_verb = list("attacked", "smashed", "crushed", "splattered", "cracked")
+ hitsound = 'sound/weapons/blade1.ogg'
+ var/pride_direction = FALSE
+
+/obj/item/weapon/twohanded/sin_pride/update_icon()
+ icon_state = "mjollnir[wielded]"
+ return
+
+/obj/item/weapon/twohanded/sin_pride/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
+ if(!proximity) return
+ if(wielded)
+ if(istype(A,/mob/living/carbon/human))
+ var/mob/living/carbon/H = A
+ var/mob/living/carbon/U = user
+ if(H)
+ if(pride_direction == FALSE)
+ U.reagents.trans_to(H, user.reagents.total_volume, 1, 1, 0)
+ U << "Your pride reflects on [H]."
+ if(H.health > 0)
+ U.health += force
+ U.updatehealth()
+ H.health -= force
+ H.updatehealth()
+ H << "You feel insecure, taking on [user]'s burden."
+ else if(pride_direction == TRUE)
+ H.reagents.trans_to(user, H.reagents.total_volume, 1, 1, 0)
+ H << "Your pride reflects on [user]."
+ if(U.health > 0)
+ U.health -= force
+ U.updatehealth()
+ H.health += force
+ H.updatehealth()
+ U << "You feel insecure, taking on [H]'s burden."
+
+/obj/item/lovestone
+ name = "Stone of Lust"
+ desc = "It lays within your hand, radiating pulses of uncomfortable warmth."
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "lovestone"
+ item_state = "lovestone"
+ w_class = 1
+ var/lust_direction = FALSE
+ var/lastUsage = 0
+ var/usageTimer = 300
+
+/obj/item/lovestone/attack_self(mob/user)
+ if(world.time > lastUsage + usageTimer)
+ lastUsage = world.time
+ user.visible_message("[user] grips the [src] tightly, causing it to vibrate and pulse brightly.")
+ spawn(25)
+ if(lust_direction == FALSE)
+ var/list/throwAt = list()
+ for(var/atom/movable/AM in oview(7,user))
+ if(!AM.anchored && AM != user)
+ throwAt.Add(AM)
+ for(var/counter = 1, counter < throwAt.len, ++counter)
+ var/atom/movable/cast = throwAt[counter]
+ cast.throw_at_fast(user,10,1)
+ else if(lust_direction == 1)
+ var/mob/living/carbon/human/H = user
+ var/mob/living/carbon/human/foundLover = locate(/mob/living/carbon/human) in orange(3,H)
+ if(!foundLover)
+ H << "As you hold the stone, loneliness grips you, your heart feeling heavy and you struggle to breath."
+ for(var/i in 1 to 10)
+ addtimer(H.reagents, "add_reagent", i*10, FALSE, "initropidril", i)
+ else
+ H << "You take comfort in the presence of [foundLover]"
+ H.reagents.add_reagent("omnizine",25)
+ H.Beam(foundLover,"r_beam",'icons/effects/beam.dmi',10)
+ foundLover << "You take comfort in the presence of [H]"
+ foundLover.reagents.add_reagent("omnizine",25)
+ else
+ user << "The stone lays inert. It is still recharging."
+
+/mob/living/simple_animal/hostile/hadesacolyte
+ name = "Acolyte of Hades"
+ desc = "Darkness seethes from their every pore."
+ icon_state = "hades_acolyte"
+ icon_living = "hades_acolyte"
+ icon_dead = "hades_acolyte_dead"
+ speak_chance = 0
+ turns_per_move = 5
+ response_help = "trembles in fear of"
+ response_disarm = "slaps wildly at"
+ response_harm = "hits"
+ speed = 1
+ maxHealth = 45
+ health = 45
+
+ harm_intent_damage = 5
+ melee_damage_lower = 5
+ melee_damage_upper = 15
+ attacktext = "strikes at"
+ attack_sound = 'sound/weapons/bladeslice.ogg'
+
+ butcher_results = list(/obj/item/clothing/mask/gas/cyborg/hades = 1,/obj/item/clothing/suit/hooded/chaplain_hoodie/hades = 1,/obj/item/weapon/hades_staff/fake = 1)
+
+ unsuitable_atmos_damage = 0
+ del_on_death = 0
+ faction = list("hades")
+
+ var/mob/living/simple_animal/hostile/hades/master
+
+/mob/living/simple_animal/hostile/hadesacolyte/Life()
+ if(..())
+ if(master)
+ if(get_dist(src,master) > 5)
+ PoolOrNew(/obj/effect/overlay/temp/hadesFlick,get_turf(src))
+ src.visible_message("[src] twists and distorts, before vanishing in a snap.")
+ src.forceMove(get_turf(pick(orange(2,master))))
+
+//acolyte of hades outfit
+/obj/item/clothing/mask/gas/cyborg/hades
+ name = "Skull Mask"
+ desc = "It's a skull mask, made of a thin, cool metal."
+
+/obj/item/clothing/suit/hooded/chaplain_hoodie/hades
+ name = "Dark robes"
+ desc = "A dark, soft robe."
+ hooded = 1
+ hoodtype = /obj/item/clothing/head/chaplain_hood/hades
+
+/obj/item/clothing/head/chaplain_hood/hades
+ name = "Dark hood"
+ desc = "A dark, soft hood."
+ body_parts_covered = HEAD
+ flags_inv = HIDEHAIR|HIDEEARS
+//end hades outfit
+
+/obj/item/hades_summoner
+ name = "Dark Seed"
+ desc = "The stone lays inert, but even when holding it you hear maddened whispers."
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "dark_seed_inert"
+ item_state = "dark_seed_inert"
+ w_class = 1
+ var/isActivated = FALSE
+ var/whoActivated
+ var/countDownToSummon = 10
+ var/absorbedHP = 0
+
+/obj/item/hades_summoner/attack_self(mob/user)
+ if(!isActivated)
+ var/choice = input(user,"Rub the stone?",name) in list("Yes","No")
+ if(choice == "Yes")
+ if(prob(15))
+ user << "You rub the stone.. and a voice springs fourth!"
+ user << "You hear a voice in your head.. 'Bring me the flesh of a living being.. and we shall bargain.'"
+ whoActivated = user
+ isActivated = TRUE
+ desc = "The stone hums with a soft glow, whispering to you."
+ icon_state = "dark_seed"
+ else
+ user << "The stone shivers, but nothing happens. Perhaps try again later?"
+ else
+ if(user != whoActivated)
+ user << "The stone lays inert."
+ else
+ if(countDownToSummon > 0)
+ user << "You hear a voice in your head.. 'I still require [countDownToSummon] vessels worth of flesh. Bring them to me'"
+ else
+ user << "I thank you, acolyte."
+ var/mob/living/simple_animal/hostile/hadesacolyte/HA = user.change_mob_type(/mob/living/simple_animal/hostile/hadesacolyte,get_turf(user),"[user.name]",1)
+ var/mob/living/simple_animal/hostile/hades/H = new/mob/living/simple_animal/hostile/hades(get_turf(user))
+ H.maxHealth = absorbedHP
+ H.health = H.maxHealth
+ if(H.maxHealth < initial(H.maxHealth))
+ HA << "You.. you fool! How dare you summon me with such dirty flesh!"
+ HA.faction -= "hades"
+ if(H.maxHealth > initial(H.maxHealth))
+ HA << "Such.. power! You have exceeded yourself, acolyte. Drink of my might!"
+ HA.maxHealth = 250
+ HA.health = 250
+ qdel(src)
+
+/obj/item/hades_summoner/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
+ if(!proximity)
+ return
+ if(istype(A,/mob/living))
+ var/mob/living/M = A
+ if(countDownToSummon > 0)
+ if(M.health > 0 && M.maxHealth > 200)
+ // no absorbing super strong creatures unless they're dead
+ user << "Such power.. Slay this [M] so that I may partake of its being."
+ return
+ if(!M.stat)
+ user << "[M] is still too tightly bound to the mortal world! You must either kill or knock them unconscious to sacrifice them."
+ return
+ user << "I accept your offering."
+ absorbedHP += M.maxHealth
+ if(!M.ckey)
+ M.gib()
+ else
+ M << "You feel the flesh being stripped from your bones. You're overwhelmed with maddening pain, before reforming into another being!"
+ M.change_mob_type(/mob/living/simple_animal/hostile/hadesacolyte,get_turf(user),"[user.name]",1)
+ countDownToSummon--
+ if(countDownToSummon <= 0)
+ user << "I am ready to ascend, my acolyte."
+
+
+#undef STATE_JUDGE
+#undef STATE_WRATH
+#undef STATE_FLEE
diff --git a/code/game/gamemodes/miniantags/hades/hades_chapel.dm b/code/game/gamemodes/miniantags/hades/hades_chapel.dm
new file mode 100644
index 0000000000..6b1f781fe0
--- /dev/null
+++ b/code/game/gamemodes/miniantags/hades/hades_chapel.dm
@@ -0,0 +1,177 @@
+/area/hades
+ name = "Chapel of Sin"
+ icon_state = "yellow"
+ requires_power = 0
+ has_gravity = 1
+
+/turf/open/floor/plasteel/hades
+ name = "Sin-touched Floor"
+ icon_state = "cult"
+
+/obj/structure/chair/hades
+ name = "Cross of Hades"
+ desc = "An inverted cross, with straps on it to support the weight of a living being."
+ icon_state = "chair_hades"
+ var/list/watchedSpikes = list()
+
+/obj/structure/chair/hades/New()
+ ..()
+ flags |= NODECONSTRUCT
+ for(var/obj/structure/kitchenspike/KS in range(12))
+ watchedSpikes += KS
+
+/obj/structure/chair/hades/proc/considerReady()
+ //buckled_mobs seems to work inconsistently, so we're doing some custom searching here.
+ if(!buckled_mobs)
+ return FALSE
+ if(!buckled_mobs.len)
+ return FALSE
+ for(var/obj/structure/kitchenspike/KS in watchedSpikes)
+ var/mob/living/M = locate(/mob/living) in get_turf(KS)
+ if(!M)
+ return FALSE
+ return TRUE
+
+/obj/structure/chair/hades/proc/completeRitual()
+ for(var/obj/structure/kitchenspike/KS in watchedSpikes)
+ var/mob/living/M = locate(/mob/living) in get_turf(KS)
+ M.gib()
+ playsound(get_turf(src), 'sound/effects/pope_entry.ogg', 100, 1)
+ sleep(100)
+ playsound(get_turf(src), 'sound/effects/hyperspace_end.ogg', 100, 1)
+ new/obj/item/weapon/hades_staff/imbued(get_turf(src))
+ src.visible_message("[src] shatters into a thousand shards, a staff falling from it.")
+ qdel(src)
+
+/obj/structure/chair/hades/attackby(obj/item/weapon/W, mob/user, params)
+ ..()
+ if(istype(W, /obj/item/weapon/hades_staff))
+ var/obj/item/weapon/hades_staff/HS = W
+ if(!HS.isKey)
+ return
+ src.visible_message("[user] inserts the [W] into the [src], giving it a quick turn.")
+ if(considerReady())
+ qdel(W)
+ src.visible_message("[src] shudders, the sound of moving gears arising...")
+ for(var/mob/living/M in buckled_mobs)
+ M.gib()
+ for(var/i in 1 to 4)
+ addtimer(GLOBAL_PROC, "playsound", i*10, FALSE, get_turf(src), 'sound/effects/clang.ogg', 100, 1)
+ spawn(50)
+ src.visible_message("[src] begins to lower into the ground...")
+ icon_state = "chair_hades_slide"
+ addtimer(src, "completeRitual", 50, FALSE)
+ else
+ src.visible_message("[src] clunks, the sound of grinding gears arising. Nothing happens.")
+
+/obj/structure/ladder/unbreakable/hades
+ name = "Dimensional Rift"
+ desc = "Where does it lead?"
+ icon = 'icons/mob/EvilPope.dmi'
+ icon_state = "popedeath"
+ anchored = TRUE
+
+/obj/structure/ladder/unbreakable/hades/update_icon()
+ return
+
+/obj/item/weapon/paper/hades_instructions
+ name = "paper- 'Hastily Scrawled Letter'"
+ info = "The Master has instructed us to collect corpses for the ritual, and told us to deposity them in the Ritual Room, behind a bookcase in the library. The Master has locked the device to only work with his key, so no more accidents happen."
+
+/obj/item/weapon/hades_staff
+ name = "Staff of Hades"
+ desc = "A large, dark staff, with a set of key-like prongs on the end."
+ icon_state = "staffofchange"
+ icon = 'icons/obj/guns/magic.dmi'
+ item_state = "staffofchange"
+ slot_flags = SLOT_BELT | SLOT_BACK
+ force = 25
+ throwforce = 5
+ w_class = 3
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ attack_verb = list("slapped", "shattered", "blasphemed", "smashed", "whacked", "crushed", "hammered")
+ block_chance = 25
+ var/isKey = 1
+
+/obj/item/weapon/hades_staff/fake
+ name = "Inert Staff of Hades"
+ desc = "A large, dark staff."
+ isKey = 0
+
+/obj/item/weapon/hades_staff/imbued
+ name = "Imbued Staff of Hades"
+ desc = " Bestowed with the power of wayward souls, this Staff allows the wielder to judge a target."
+ force = 75
+ throwforce = 35
+ block_chance = 75
+ var/lastJudge = 0
+ var/judgeCooldown = 150
+
+/obj/item/weapon/hades_staff/imbued/attack(mob/living/carbon/human/M, mob/living/carbon/human/user)
+ if(!istype(M))
+ return ..()
+
+ if(world.time > lastJudge + judgeCooldown)
+ var/mob/living/sinPerson = M
+ lastJudge = world.time
+ var/sinPersonchoice = pick("Greed","Gluttony","Pride","Lust","Envy","Sloth","Wrath")
+ switch(sinPersonchoice)
+ if("Greed")
+ src.say("Your sin, [sinPerson], is Greed.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Greed(sinPerson, TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Greed(sinPerson, FALSE)
+ if("Gluttony")
+ src.say("Your sin, [sinPerson], is Gluttony.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Gluttony(sinPerson,TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Gluttony(sinPerson,FALSE)
+ if("Pride")
+ src.say("Your sin, [sinPerson], is Pride.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Pride(sinPerson,TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Pride(sinPerson,FALSE)
+ if("Lust")
+ src.say("Your sin, [sinPerson], is Lust.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Lust(sinPerson,TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Lust(sinPerson,TRUE)
+ if("Envy")
+ src.say("Your sin, [sinPerson], is Envy.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Envy(sinPerson,TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Envy(sinPerson,FALSE)
+ if("Sloth")
+ src.say("Your sin, [sinPerson], is Sloth.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Sloth(sinPerson,TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Sloth(sinPerson,FALSE)
+ if("Wrath")
+ src.say("Your sin, [sinPerson], is Wrath.")
+ if(prob(50))
+ src.say("I will indulge your sin, [sinPerson].")
+ sin_Wrath(sinPerson,TRUE)
+ else
+ src.say("Your sin will be punished, [sinPerson]!")
+ sin_Wrath(sinPerson,FALSE)
+ else
+ ..()
+ user << "The [src] is still recharging."
diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm
new file mode 100644
index 0000000000..fa85983321
--- /dev/null
+++ b/code/game/objects/effects/gibs.dm
@@ -0,0 +1,62 @@
+/proc/gibs(atom/location, list/viruses, datum/dna/MobDNA)
+ new /obj/effect/gibspawner/generic(location,viruses,MobDNA)
+
+/proc/hgibs(atom/location, list/viruses, datum/dna/MobDNA)
+ new /obj/effect/gibspawner/human(location,viruses,MobDNA)
+
+/proc/xgibs(atom/location, list/viruses)
+ new /obj/effect/gibspawner/xeno(location,viruses)
+
+/proc/robogibs(atom/location, list/viruses)
+ new /obj/effect/gibspawner/robot(location,viruses)
+
+/obj/effect/gibspawner
+ var/sparks = 0 //whether sparks spread on Gib()
+ var/virusProb = 20 //the chance for viruses to spread on the gibs
+ var/list/gibtypes = list()
+ var/list/gibamounts = list()
+ var/list/gibdirections = list() //of lists
+
+/obj/effect/gibspawner/New(location, var/list/viruses, var/datum/dna/MobDNA)
+ ..()
+
+ Gib(loc,viruses,MobDNA)
+
+/obj/effect/gibspawner/proc/Gib(atom/location, list/viruses = list(), datum/dna/MobDNA = null)
+ if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len)
+ world << "Gib list length mismatch!"
+ return
+
+ var/obj/effect/decal/cleanable/blood/gibs/gib = null
+
+ if(sparks)
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
+ s.set_up(2, 1, location)
+ s.start()
+
+ for(var/i = 1, i<= gibtypes.len, i++)
+ if(gibamounts[i])
+ for(var/j = 1, j<= gibamounts[i], j++)
+ var/gibType = gibtypes[i]
+ gib = new gibType(location)
+ if(istype(location,/mob/living/carbon))
+ var/mob/living/carbon/digester = location
+ digester.stomach_contents += gib
+
+ if(viruses.len > 0)
+ for(var/datum/disease/D in viruses)
+ if(prob(virusProb))
+ var/datum/disease/viruus = D.Copy(1)
+ gib.viruses += viruus
+ viruus.holder = gib
+
+ if(MobDNA)
+ gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.blood_type
+ else if(istype(src, /obj/effect/gibspawner/generic)) // Probably a monkey
+ gib.blood_DNA["Non-human DNA"] = "A+"
+ var/list/directions = gibdirections[i]
+ if(istype(loc,/turf))
+ if(directions.len)
+ gib.streak(directions)
+
+ qdel(src)
diff --git a/code/game/objects/items/devices/boobytrap.dm b/code/game/objects/items/devices/boobytrap.dm
new file mode 100644
index 0000000000..fcce7b1aa9
--- /dev/null
+++ b/code/game/objects/items/devices/boobytrap.dm
@@ -0,0 +1,25 @@
+/obj/item/device/boobytrap
+ name = "booby trap"
+ desc = null //Different examine for traitors
+ item_state = "electronic"
+ icon_state = "boobytrap"
+ w_class = 1
+ throw_range = 4
+ throw_speed = 1
+ flags = NOBLUDGEON
+ force = 3
+ attack_verb = list("trapped", "rused", "tricked")
+ materials = list(MAT_METAL=50, MAT_GLASS=30)
+ origin_tech = "syndicate=1;combat=3;engineering=3"
+
+/obj/item/device/boobytrap/proc/blow()
+ explosion(src.loc,0,0,2,4,flame_range = 4)
+ qdel(src)
+
+/obj/item/device/boobytrap/examine(mob/user)
+ ..()
+ if(user.mind in ticker.mode.traitors) //No nuke ops because the device is excluded from nuclear
+ user << "A small device used to rig lockers and boxes with an explosive surprise. \
+ To use, simply attach it to a box or a locker."
+ else
+ user << "A suspicious array of delicate wires and parts."
diff --git a/code/game/objects/items/devices/modificationkit.dm b/code/game/objects/items/devices/modificationkit.dm
new file mode 100644
index 0000000000..cd25b38140
--- /dev/null
+++ b/code/game/objects/items/devices/modificationkit.dm
@@ -0,0 +1,35 @@
+/obj/item/modkit
+ name = "modification kit"
+ desc = "A one-use kit, which enables kinetic accelerators to retain their \
+ charge when away from a bioelectric source, renders them immune to \
+ interference with other accelerators, as well as allowing less \
+ dextrous races to use the tool."
+ icon = 'icons/obj/objects.dmi'
+ icon_state = "modkit"
+ origin_tech = "programming=2;materials=2;magnets=4"
+ var/uses = 1
+
+/obj/item/modkit/afterattack(obj/item/weapon/gun/energy/kinetic_accelerator/C, mob/user)
+ ..()
+ if(!uses)
+ qdel(src)
+ return
+ if(!istype(C))
+ user << "This kit can only modify kinetic \
+ accelerators!"
+ return ..()
+ // RIP the 'improved improved improved improved kinetic accelerator
+ if(C.holds_charge && C.unique_frequency)
+ user << "This kinetic accelerator already has \
+ these upgrades."
+ return ..()
+
+ user <<"You modify the [C], adjusting the trigger \
+ guard and internal capacitor."
+ C.name = "improved [C.name]"
+ C.holds_charge = TRUE
+ C.unique_frequency = TRUE
+ C.trigger_guard = TRIGGER_GUARD_ALLOW_ALL
+ uses--
+ if(!uses)
+ qdel(src)
diff --git a/code/game/pooling/pool.dm b/code/game/pooling/pool.dm
new file mode 100644
index 0000000000..1c608fe72b
--- /dev/null
+++ b/code/game/pooling/pool.dm
@@ -0,0 +1,167 @@
+
+/*
+/tg/station13 /datum Pool:
+---------------------------------
+By RemieRichards
+
+Creation/Deletion is laggy, so let's reduce reuse and recycle!
+
+Usage:
+
+To get a object, just call
+ - PoolOrNew(type, arg) if you only want to pass one argument to New(), usually loc
+ - PoolOrNew(type, list) if you want to pass multiple arguments to New()
+
+To put a object back in the pool, call PlaceInPool(object)
+This will call destroy on the object, set its loc to null,
+and reset all of its vars to their default
+
+You can override your object's destroy to return QDEL_HINT_PUTINPOOL
+to ensure its always placed in this pool (this will only be acted on if qdel calls destroy, and destroy will not get called twice)
+
+For almost all pooling purposes, it is better to use the QDEL hint than to pool it directly with PlaceInPool
+
+*/
+
+#define MAINTAINING_OBJECT_POOL_COUNT 500
+
+var/global/list/GlobalPool = list()
+
+//You'll be using this proc 90% of the time.
+//It grabs a type from the pool if it can
+//And if it can't, it creates one
+//The pool is flexible and will expand to fit
+//The new created atom when it eventually
+//Goes into the pool
+
+//Second argument can be a single arg
+//Or a list of arguments
+//Either way it gets passed to new
+
+/proc/PoolOrNew(get_type,second_arg)
+ if(!get_type)
+ return
+
+ . = GetFromPool(get_type,second_arg)
+
+ if(!.)
+ if(ispath(get_type))
+ if(islist(second_arg))
+ . = new get_type (arglist(second_arg))
+ else
+ . = new get_type (second_arg)
+
+
+/proc/GetFromPool(get_type,second_arg)
+ if(!get_type)
+ return
+
+ if(isnull(GlobalPool[get_type]))
+ return
+
+ if(length(GlobalPool[get_type]) == 0)
+ return
+
+ var/datum/pooled = pop(GlobalPool[get_type])
+ if(pooled)
+ pooled.gc_destroyed = null
+
+ var/atom/movable/AM
+ if(istype(pooled, /atom/movable))
+ AM = pooled
+
+ if(islist(second_arg))
+ if(AM)
+ AM.loc = second_arg[1] //we need to do loc setting explicetly before even calling New() to replicate new()'s behavior
+ pooled.New(arglist(second_arg))
+
+ else
+ if(AM)
+ AM.loc = second_arg
+ pooled.New(second_arg)
+
+ return pooled
+
+
+/proc/PlaceInPool(datum/diver, destroy = 1)
+ if(!istype(diver))
+ return
+
+ if(diver in GlobalPool[diver.type])
+ return
+
+ if(!GlobalPool[diver.type])
+ GlobalPool[diver.type] = list()
+
+ GlobalPool[diver.type] |= diver
+
+ if(destroy)
+ diver.Destroy()
+
+ diver.gc_destroyed = 1
+
+ diver.ResetVars()
+
+var/list/exclude = list("animate_movement", "contents", "loc", "locs", "parent_type", "vars", "verbs", "type", "gc_destroyed")
+var/list/pooledvariables = list()
+//thanks to clusterfack @ /vg/station for these two procs
+/datum/proc/createVariables()
+ pooledvariables[type] = new/list()
+ var/list/exclude = global.exclude + args
+
+ for(var/key in vars)
+ if(key in exclude)
+ continue
+ if(islist(vars[key]))
+ pooledvariables[type][key] = list()
+ else
+ pooledvariables[type][key] = initial(vars[key])
+
+/datum/proc/ResetVars()
+ if(!pooledvariables[type])
+ createVariables(args)
+
+ for(var/key in pooledvariables[type])
+ if (islist(pooledvariables[type][key]))
+ vars[key] = list()
+ else
+ vars[key] = pooledvariables[type][key]
+
+/atom/movable/ResetVars()
+ ..()
+ loc = null
+ contents = initial(contents) //something is really wrong if this object still has stuff in it by this point
+
+/image/ResetVars()
+ ..()
+ loc = null
+
+/proc/returnToPool(const/datum/D)
+ ASSERT(D)
+
+ if(istype(D, /atom/movable) && length(GlobalPool[D.type]) > MAINTAINING_OBJECT_POOL_COUNT)
+ #ifdef DEBUG_DATUM_POOL
+ to_chat(world, text("DEBUG_DATUM_POOL: returnToPool([]) exceeds [] discarding...", D.type, MAINTAINING_OBJECT_POOL_COUNT))
+ #endif
+
+ qdel(D)
+ return
+
+ if(isnull(GlobalPool[D.type]))
+ GlobalPool[D.type] = list()
+
+ D.Destroy()
+ D.ResetVars()
+
+ #ifdef DEBUG_DATUM_POOL
+ if(D in GlobalPool[D.type])
+ to_chat(world, text("returnToPool has been called twice for the same datum of type [] time to panic.", D.type))
+ #endif
+
+ GlobalPool[D.type] |= D
+
+ #ifdef DEBUG_DATUM_POOL
+ to_chat(world, text("DEBUG_DATUM_POOL: returnToPool([]) [] left.", D.type, length(GlobalPool[D.type])))
+ #endif
+
+#undef MAINTAINING_OBJECT_POOL_COUNT
\ No newline at end of file
diff --git a/code/game/turfs/simulated/floor/warning.dm b/code/game/turfs/simulated/floor/warning.dm
new file mode 100644
index 0000000000..a6d4094893
--- /dev/null
+++ b/code/game/turfs/simulated/floor/warning.dm
@@ -0,0 +1,127 @@
+//ASTEROID FLOORS
+/turf/open/floor/plasteel/asteroid/warning
+ icon = 'icons/turf/floors/warning.dmi'
+ icon_state = "asteroid_warn"
+/turf/open/floor/plasteel/asteroid/warning/side
+ icon_state = "asteroid_warn_side"
+/turf/open/floor/plasteel/asteroid/warning/corner
+ icon_state = "asteroid_warn_corner"
+/turf/open/floor/plasteel/asteroid/warning/end
+ icon_state = "asteroid_warn_end"
+
+/turf/open/floor/plasteel/airless/asteroid/warning
+ icon = 'icons/turf/floors/warning.dmi'
+ icon_state = "asteroid_warn"
+/turf/open/floor/plasteel/airless/asteroid/warning/side
+ icon_state = "asteroid_warn_side"
+/turf/open/floor/plasteel/airless/asteroid/warning/corner
+ icon_state = "asteroid_warn_corner"
+/turf/open/floor/plasteel/airless/asteroid/warning/end
+ icon_state = "asteroid_warn_end"
+
+/turf/open/floor/plating/astplate/warning
+ icon = 'icons/turf/floors/warning.dmi'
+ icon_state = "astplate_warn"
+/turf/open/floor/plating/astplate/warning/corner
+ icon_state = "astplate_warn_corner"
+/turf/open/floor/plating/astplate/warning/side
+ icon_state = "astplate_warn_side"
+/turf/open/floor/plating/astplate/warning/end
+ icon_state = "astplate_warn_end"
+
+/turf/open/floor/plating/airless/astplate/warning
+ icon = 'icons/turf/floors/warning.dmi'
+ icon_state = "astplate_warn"
+/turf/open/floor/plating/airless/astplate/warning/corner
+ icon_state = "astplate_warn_corner"
+/turf/open/floor/plating/airless/astplate/warning/side
+ icon_state = "astplate_warn_side"
+/turf/open/floor/plating/airless/astplate/warning/end
+ icon_state = "astplate_warn_end"
+
+
+//PLASTEEL
+/turf/open/floor/plasteel/warning
+ icon = 'icons/turf/floors/warning.dmi'
+ icon_state = "plasteel_warn"
+/turf/open/floor/plasteel/warning/corner
+ icon_state = "plasteel_warn_corner"
+/turf/open/floor/plasteel/warning/side
+ icon_state = "plasteel_warn_side"
+/turf/open/floor/plasteel/warning/end
+ icon_state = "plasteel_warn_end"
+
+/turf/open/floor/plasteel/airless/warning
+ icon = 'icons/turf/floors/warning.dmi'
+ icon_state = "plasteel_warn"
+/turf/open/floor/plasteel/airless/warning/corner
+ icon_state = "plasteel_warn_corner"
+/turf/open/floor/plasteel/airless/warning/side
+ icon_state = "plasteel_warn_side"
+/turf/open/floor/plasteel/airless/warning/end
+ icon_state = "plasteel_warn_end"
+
+//PLASTEEL WHITE
+/turf/open/floor/plasteel/warnwhite
+ icon = 'icons/turf/floors/warning.dmi'
+ icon_state = "white_warn"
+/turf/open/floor/plasteel/warnwhite/corner
+ icon_state = "white_warn_corner"
+/turf/open/floor/plasteel/warnwhite/side
+ icon_state = "white_warn_side"
+/turf/open/floor/plasteel/warnwhite/end
+ icon_state = "white_warn_end"
+
+/turf/open/floor/plasteel/airless/warnwhite
+ icon = 'icons/turf/floors/warning.dmi'
+ icon_state = "white_warn"
+/turf/open/floor/plasteel/airless/warnwhite/corner
+ icon_state = "white_warn_corner"
+/turf/open/floor/plasteel/airless/warnwhite/side
+ icon_state = "white_warn_side"
+/turf/open/floor/plasteel/airless/warnwhite/end
+ icon_state = "white_warn_end"
+
+
+//PLASTEEL BLACK
+/turf/open/floor/plasteel/darkwarning
+ icon = 'icons/turf/floors/warning.dmi'
+ icon_state = "black_warn"
+/turf/open/floor/plasteel/darkwarning/corner
+ icon_state = "black_warn_corner"
+/turf/open/floor/plasteel/darkwarning/side
+ icon_state = "black_warn_side"
+/turf/open/floor/plasteel/darkwarning/end
+ icon_state = "black_warn_end"
+
+/turf/open/floor/plasteel/airless/darkwarning
+ icon = 'icons/turf/floors/warning.dmi'
+ icon_state = "black_warn"
+/turf/open/floor/plasteel/airless/darkwarning/corner
+ icon_state = "black_warn_corner"
+/turf/open/floor/plasteel/airless/darkwarning/side
+ icon_state = "black_warn_side"
+/turf/open/floor/plasteel/airless/darkwarning/end
+ icon_state = "black_warn_end"
+
+
+//PLATING
+/turf/open/floor/plating/warnplate
+ icon = 'icons/turf/floors/warning.dmi'
+ icon_state = "plating_warn"
+/turf/open/floor/plating/warnplate/corner
+ icon_state = "plating_warn_corner"
+/turf/open/floor/plating/warnplate/side
+ icon_state = "plating_warn_side"
+/turf/open/floor/plating/warnplate/end
+ icon_state = "plating_warn_end"
+
+/turf/open/floor/plating/airless/warnplate
+ icon = 'icons/turf/floors/warning.dmi'
+ icon_state = "plating_warn"
+/turf/open/floor/plating/airless/warnplate/corner
+ icon_state = "plating_warn_corner"
+/turf/open/floor/plating/airless/warnplate/side
+ icon_state = "plating_warn_side"
+/turf/open/floor/plating/airless/warnplate/end
+ icon_state = "plating_warn_end"
diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm
new file mode 100644
index 0000000000..2207e65ec3
--- /dev/null
+++ b/code/game/turfs/simulated/walls_mineral.dm
@@ -0,0 +1,189 @@
+/turf/closed/wall/mineral
+ name = "mineral wall"
+ desc = "This shouldn't exist"
+ icon_state = ""
+ var/last_event = 0
+ var/active = null
+ canSmoothWith = null
+ smooth = SMOOTH_TRUE
+
+/turf/closed/wall/mineral/gold
+ name = "gold wall"
+ desc = "A wall with gold plating. Swag!"
+ icon = 'icons/turf/walls/gold_wall.dmi'
+ icon_state = "gold"
+ walltype = "gold"
+ mineral = "gold"
+ sheet_type = /obj/item/stack/sheet/mineral/gold
+ //var/electro = 1
+ //var/shocked = null
+ explosion_block = 0 //gold is a soft metal you dingus.
+ canSmoothWith = list(/turf/closed/wall/mineral/gold, /obj/structure/falsewall/gold)
+
+/turf/closed/wall/mineral/silver
+ name = "silver wall"
+ desc = "A wall with silver plating. Shiny!"
+ icon = 'icons/turf/walls/silver_wall.dmi'
+ icon_state = "silver"
+ walltype = "silver"
+ mineral = "silver"
+ sheet_type = /obj/item/stack/sheet/mineral/silver
+ //var/electro = 0.75
+ //var/shocked = null
+ canSmoothWith = list(/turf/closed/wall/mineral/silver, /obj/structure/falsewall/silver)
+
+/turf/closed/wall/mineral/diamond
+ name = "diamond wall"
+ desc = "A wall with diamond plating. You monster."
+ icon = 'icons/turf/walls/diamond_wall.dmi'
+ icon_state = "diamond"
+ walltype = "diamond"
+ mineral = "diamond"
+ sheet_type = /obj/item/stack/sheet/mineral/diamond
+ slicing_duration = 200 //diamond wall takes twice as much time to slice
+ explosion_block = 3
+ canSmoothWith = list(/turf/closed/wall/mineral/diamond, /obj/structure/falsewall/diamond)
+
+/turf/closed/wall/mineral/diamond/thermitemelt(mob/user)
+ return
+
+/turf/closed/wall/mineral/clown
+ name = "bananium wall"
+ desc = "A wall with bananium plating. Honk!"
+ icon = 'icons/turf/walls/bananium_wall.dmi'
+ icon_state = "bananium"
+ walltype = "bananium"
+ mineral = "bananium"
+ sheet_type = /obj/item/stack/sheet/mineral/bananium
+ canSmoothWith = list(/turf/closed/wall/mineral/clown, /obj/structure/falsewall/clown)
+
+/turf/closed/wall/mineral/sandstone
+ name = "sandstone wall"
+ desc = "A wall with sandstone plating. Rough."
+ icon = 'icons/turf/walls/sandstone_wall.dmi'
+ icon_state = "sandstone"
+ walltype = "sandstone"
+ mineral = "sandstone"
+ sheet_type = /obj/item/stack/sheet/mineral/sandstone
+ explosion_block = 0
+ canSmoothWith = list(/turf/closed/wall/mineral/sandstone, /obj/structure/falsewall/sandstone)
+
+/turf/closed/wall/mineral/uranium
+ name = "uranium wall"
+ desc = "A wall with uranium plating. This is probably a bad idea."
+ icon = 'icons/turf/walls/uranium_wall.dmi'
+ icon_state = "uranium"
+ walltype = "uranium"
+ mineral = "uranium"
+ sheet_type = /obj/item/stack/sheet/mineral/uranium
+ canSmoothWith = list(/turf/closed/wall/mineral/uranium, /obj/structure/falsewall/uranium)
+
+/turf/closed/wall/mineral/uranium/proc/radiate()
+ if(!active)
+ if(world.time > last_event+15)
+ active = 1
+ radiation_pulse(get_turf(src), 3, 3, 4, 0)
+ for(var/turf/closed/wall/mineral/uranium/T in orange(1,src))
+ T.radiate()
+ last_event = world.time
+ active = null
+ return
+ return
+
+/turf/closed/wall/mineral/uranium/attack_hand(mob/user)
+ radiate()
+ ..()
+
+/turf/closed/wall/mineral/uranium/attackby(obj/item/weapon/W, mob/user, params)
+ radiate()
+ ..()
+
+/turf/closed/wall/mineral/uranium/Bumped(AM as mob|obj)
+ radiate()
+ ..()
+
+/turf/closed/wall/mineral/plasma
+ name = "plasma wall"
+ desc = "A wall with plasma plating. This is definitely a bad idea."
+ icon = 'icons/turf/walls/plasma_wall.dmi'
+ icon_state = "plasma"
+ walltype = "plasma"
+ mineral = "plasma"
+ sheet_type = /obj/item/stack/sheet/mineral/plasma
+ thermal_conductivity = 0.04
+ canSmoothWith = list(/turf/closed/wall/mineral/plasma, /obj/structure/falsewall/plasma)
+
+/turf/closed/wall/mineral/plasma/attackby(obj/item/weapon/W, mob/user, params)
+ if(W.is_hot() > 300)//If the temperature of the object is over 300, then ignite
+ message_admins("Plasma wall ignited by [key_name_admin(user)](?) (FLW) in ([x],[y],[z] - JMP)",0,1)
+ log_game("Plasma wall ignited by [key_name(user)] in ([x],[y],[z])")
+ ignite(W.is_hot())
+ return
+ ..()
+
+/turf/closed/wall/mineral/plasma/proc/PlasmaBurn(temperature)
+ new /obj/structure/girder(src)
+ src.ChangeTurf(/turf/open/floor/plasteel)
+ var/turf/open/T = src
+ T.atmos_spawn_air("plasma=400;TEMP=1000")
+
+/turf/closed/wall/mineral/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)//Doesn't fucking work because walls don't interact with air :(
+ if(exposed_temperature > 300)
+ PlasmaBurn(exposed_temperature)
+
+/turf/closed/wall/mineral/plasma/proc/ignite(exposed_temperature)
+ if(exposed_temperature > 300)
+ PlasmaBurn(exposed_temperature)
+
+/turf/closed/wall/mineral/plasma/bullet_act(var/obj/item/projectile/Proj)
+ if(istype(Proj,/obj/item/projectile/beam))
+ PlasmaBurn(2500)
+ else if(istype(Proj,/obj/item/projectile/ion))
+ PlasmaBurn(500)
+ ..()
+
+
+/turf/closed/wall/mineral/wood
+ name = "wooden wall"
+ desc = "A wall with wooden plating. Stiff."
+ icon = 'icons/turf/walls/wood_wall.dmi'
+ icon_state = "wood"
+ walltype = "wood"
+ mineral = "wood"
+ sheet_type = /obj/item/stack/sheet/mineral/wood
+ hardness = 70
+ explosion_block = 0
+ canSmoothWith = list(/turf/closed/wall/mineral/wood, /obj/structure/falsewall/wood)
+
+/turf/closed/wall/mineral/iron
+ name = "rough metal wall"
+ desc = "A wall with rough metal plating."
+ icon = 'icons/turf/walls/iron_wall.dmi'
+ icon_state = "iron"
+ walltype = "iron"
+ mineral = "rods"
+ sheet_type = /obj/item/stack/rods
+ canSmoothWith = list(/turf/closed/wall/mineral/iron, /obj/structure/falsewall/iron)
+
+/turf/closed/wall/mineral/snow
+ name = "packed snow wall"
+ desc = "A wall made of densely packed snow blocks."
+ icon = 'icons/turf/walls/snow_wall.dmi'
+ icon_state = "snow"
+ walltype = "snow"
+ mineral = "snow"
+ hardness = 80
+ sheet_type = /obj/item/stack/sheet/mineral/snow
+ canSmoothWith = null
+
+/turf/closed/wall/mineral/abductor
+ name = "alien wall"
+ desc = "A wall with alien alloy plating."
+ icon = 'icons/turf/walls/abductor_wall.dmi'
+ icon_state = "abductor"
+ walltype = "abductor"
+ mineral = "abductor"
+ sheet_type = /obj/item/stack/sheet/mineral/abductor
+ slicing_duration = 200 //alien wall takes twice as much time to slice
+ explosion_block = 3
+ canSmoothWith = list(/turf/closed/wall/mineral/abductor, /obj/structure/falsewall/abductor)
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
new file mode 100644
index 0000000000..830f97a54a
--- /dev/null
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -0,0 +1,196 @@
+/turf/closed/wall/mineral/cult
+ name = "runed metal wall"
+ desc = "A cold metal wall engraved with indecipherable symbols. Studying them causes your head to pound."
+ icon = 'icons/turf/walls/cult_wall.dmi'
+ icon_state = "cult"
+ walltype = "cult"
+ builtin_sheet = null
+ canSmoothWith = null
+
+/turf/closed/wall/mineral/cult/New()
+ PoolOrNew(/obj/effect/overlay/temp/cult/turf, src)
+ ..()
+
+/turf/closed/wall/mineral/cult/break_wall()
+ new/obj/item/stack/sheet/runed_metal(get_turf(src), 1)
+ return (new /obj/structure/girder/cult(src))
+
+/turf/closed/wall/mineral/cult/devastate_wall()
+ new/obj/item/stack/sheet/runed_metal(get_turf(src), 1)
+
+/turf/closed/wall/mineral/cult/narsie_act()
+ return
+
+/turf/closed/wall/mineral/cult/ratvar_act()
+ ..()
+ if(istype(src, /turf/closed/wall/mineral/cult)) //if we haven't changed type
+ var/previouscolor = color
+ color = "#FAE48C"
+ animate(src, color = previouscolor, time = 8)
+
+/turf/closed/wall/mineral/cult/artificer
+ name = "runed stone wall"
+ desc = "A cold stone wall engraved with indecipherable symbols. Studying them causes your head to pound."
+
+/turf/closed/wall/mineral/cult/artificer/break_wall()
+ PoolOrNew(/obj/effect/overlay/temp/cult/turf, get_turf(src))
+ return null //excuse me we want no runed metal here
+
+/turf/closed/wall/mineral/cult/artificer/devastate_wall()
+ PoolOrNew(/obj/effect/overlay/temp/cult/turf, get_turf(src))
+
+//Clockwork wall: Causes nearby tinkerer's caches to generate components.
+/turf/closed/wall/clockwork
+ name = "clockwork wall"
+ desc = "A huge chunk of warm metal. The clanging of machinery emanates from within."
+ icon = 'icons/turf/walls/clockwork_wall.dmi'
+ icon_state = "clockwork_wall"
+ canSmoothWith = list(/turf/closed/wall/clockwork)
+ smooth = SMOOTH_MORE
+ explosion_block = 2
+
+/turf/closed/wall/clockwork/New()
+ ..()
+ PoolOrNew(/obj/effect/overlay/temp/ratvar/wall, src)
+ PoolOrNew(/obj/effect/overlay/temp/ratvar/beam, src)
+ clockwork_construction_value += 5
+
+/turf/closed/wall/clockwork/Destroy()
+ clockwork_construction_value -= 5
+ ..()
+
+/turf/closed/wall/clockwork/attackby(obj/item/I, mob/living/user, params)
+ if(istype(I, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/WT = I
+ if(!WT.isOn())
+ return 0
+ user.visible_message("[user] begins slowly breaking down [src]...", "You begin painstakingly destroying [src]...")
+ if(!do_after(user, 120 / WT.toolspeed, target = src))
+ return 0
+ if(!WT.remove_fuel(1, user))
+ return 0
+ user.visible_message("[user] breaks apart [src]!", "You break apart [src]!")
+ dismantle_wall()
+ return 1
+ return ..()
+
+/turf/closed/wall/clockwork/ratvar_act()
+ return 0
+
+/turf/closed/wall/clockwork/narsie_act()
+ ..()
+ if(istype(src, /turf/closed/wall/clockwork)) //if we haven't changed type
+ var/previouscolor = color
+ color = "#960000"
+ animate(src, color = previouscolor, time = 8)
+
+/turf/closed/wall/clockwork/dismantle_wall(devastated=0, explode=0)
+ if(devastated)
+ devastate_wall()
+ ChangeTurf(/turf/open/floor/plating)
+ else
+ playsound(src, 'sound/items/Welder.ogg', 100, 1)
+ var/newgirder = break_wall()
+ if(newgirder) //maybe we want a gear!
+ transfer_fingerprints_to(newgirder)
+ ChangeTurf(/turf/open/floor/clockwork)
+
+ for(var/obj/O in src) //Eject contents!
+ if(istype(O,/obj/structure/sign/poster))
+ var/obj/structure/sign/poster/P = O
+ P.roll_and_drop(src)
+ else
+ O.loc = src
+
+/turf/closed/wall/clockwork/break_wall()
+ return new/obj/structure/clockwork/wall_gear(src)
+
+/turf/closed/wall/clockwork/devastate_wall()
+ new/obj/item/clockwork/alloy_shards(src)
+
+
+/turf/closed/wall/vault
+ icon = 'icons/turf/walls.dmi'
+ icon_state = "rockvault"
+
+/turf/closed/wall/ice
+ icon = 'icons/turf/walls/icedmetal_wall.dmi'
+ icon_state = "iced"
+ desc = "A wall covered in a thick sheet of ice."
+ walltype = "iced"
+ canSmoothWith = null
+ hardness = 35
+ slicing_duration = 150 //welding through the ice+metal
+
+/turf/closed/wall/rust
+ name = "rusted wall"
+ desc = "A rusted metal wall."
+ icon = 'icons/turf/walls/rusty_wall.dmi'
+ icon_state = "arust"
+ walltype = "arust"
+ hardness = 45
+
+/turf/closed/wall/r_wall/rust
+ name = "rusted reinforced wall"
+ desc = "A huge chunk of rusted reinforced metal."
+ icon = 'icons/turf/walls/rusty_reinforced_wall.dmi'
+ icon_state = "rrust"
+ walltype = "rrust"
+ hardness = 15
+
+/turf/closed/wall/shuttle
+ name = "wall"
+ icon = 'icons/turf/shuttle.dmi'
+ icon_state = "wall"
+ walltype = "shuttle"
+ smooth = SMOOTH_FALSE
+
+/turf/closed/wall/shuttle/proc/update_icon()
+ ..()
+
+/turf/closed/wall/shuttle/smooth
+ name = "wall"
+ icon = 'icons/turf/walls/shuttle_wall.dmi'
+ icon_state = "shuttle"
+ walltype = "shuttle"
+ smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
+ canSmoothWith = list(/turf/closed/wall/shuttle/smooth, /obj/structure/window/shuttle, /obj/structure/shuttle/engine)
+
+/turf/closed/wall/shuttle/smooth/nodiagonal
+ smooth = SMOOTH_MORE
+ icon_state = "shuttle_nd"
+
+/turf/closed/wall/shuttle/smooth/overspace
+ icon_state = "overspace"
+ fixed_underlay = list("space"=1)
+
+//sub-type to be used for interior shuttle walls
+//won't get an underlay of the destination turf on shuttle move
+/turf/closed/wall/shuttle/interior/copyTurf(turf/T)
+ if(T.type != type)
+ T.ChangeTurf(type)
+ if(underlays.len)
+ T.underlays = underlays
+ if(T.icon_state != icon_state)
+ T.icon_state = icon_state
+ if(T.icon != icon)
+ T.icon = icon
+ if(T.color != color)
+ T.color = color
+ if(T.dir != dir)
+ T.setDir(dir)
+ T.transform = transform
+ return T
+
+/turf/closed/wall/shuttle/copyTurf(turf/T)
+ . = ..()
+ T.transform = transform
+
+
+//why don't shuttle walls habe smoothwall? now i gotta do rotation the dirty way <- DOUBLE GOOFBALL FOR NOT CALLING PARENT
+/turf/closed/wall/shuttle/shuttleRotate(rotation)
+ if(smooth)
+ return ..()
+ var/matrix/M = transform
+ M.Turn(rotation)
+ transform = M
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
new file mode 100644
index 0000000000..fd7c428865
--- /dev/null
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -0,0 +1,228 @@
+/turf/closed/wall/r_wall
+ name = "reinforced wall"
+ desc = "A huge chunk of reinforced metal used to separate rooms."
+ icon = 'icons/turf/walls/reinforced_wall.dmi'
+ icon_state = "r_wall"
+ opacity = 1
+ density = 1
+
+ walltype = "rwall"
+
+ var/d_state = 0
+ hardness = 10
+ sheet_type = /obj/item/stack/sheet/plasteel
+ explosion_block = 2
+
+/turf/closed/wall/r_wall/break_wall()
+ builtin_sheet.loc = src
+ return (new /obj/structure/girder/reinforced(src))
+
+/turf/closed/wall/r_wall/devastate_wall()
+ builtin_sheet.loc = src
+ new /obj/item/stack/sheet/metal(src, 2)
+
+/turf/closed/wall/r_wall/attack_animal(mob/living/simple_animal/M)
+ M.changeNext_move(CLICK_CD_MELEE)
+ M.do_attack_animation(src)
+ if(M.environment_smash == 3)
+ dismantle_wall(1)
+ playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
+ M << "You smash through the wall."
+ else
+ M << "This wall is far too strong for you to destroy."
+
+/turf/closed/wall/r_wall/try_destroy(obj/item/weapon/W, mob/user, turf/T)
+ if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
+ var/obj/item/weapon/pickaxe/drill/jackhammer/D = W
+ user << "You begin to smash though the [name]..."
+ if(do_after(user, 50, target = src))
+ if( !istype(src, /turf/closed/wall/r_wall) || !user || !W || !T )
+ return 1
+ if( user.loc == T && user.get_active_hand() == W )
+ D.playDigSound()
+ visible_message("[user] smashes through the [name] with the [D.name]!", "You hear the grinding of metal.")
+ dismantle_wall()
+ return 1
+ else if(istype(W, /obj/item/stack/sheet/metal) && d_state)
+ var/obj/item/stack/sheet/metal/MS = W
+ if (MS.get_amount() < 1)
+ user << "You need one sheet of metal to repair the wall!"
+ return 1
+ user << "You begin patching-up the wall with \a [MS]..."
+ if (do_after(user, max(20*d_state,100), target = src))//time taken to repair is proportional to the damage! (max 10 seconds)
+ if(loc == null || MS.get_amount() < 1)
+ return 1
+ MS.use(1)
+ src.d_state = 0
+ src.icon_state = "r_wall"
+ queue_smooth_neighbors(src)
+ user << "You repair the last of the damage."
+ return 1
+ return 0
+
+/turf/closed/wall/r_wall/try_decon(obj/item/weapon/W, mob/user, turf/T)
+ //DECONSTRUCTION
+ switch(d_state)
+ if(0)
+ if (istype(W, /obj/item/weapon/wirecutters))
+ playsound(src, W.usesound, 100, 1)
+ src.d_state = 1
+ update_icon()
+ user << "You cut the outer grille."
+ return 1
+
+ if(1)
+ if (istype(W, /obj/item/weapon/screwdriver))
+ user << "You begin removing the support lines..."
+ playsound(src, W.usesound, 100, 1)
+
+ if(do_after(user, 40, target = src))
+ if( !istype(src, /turf/closed/wall/r_wall) || !user || !W || !T )
+ return 1
+
+ if( d_state == 1 && user.loc == T && user.get_active_hand() == W )
+ src.d_state = 2
+ update_icon()
+ user << "You remove the support lines."
+ return 1
+
+ //REPAIRING (replacing the outer grille for cosmetic damage)
+ else if(istype(W, /obj/item/stack/sheet/metal))
+ var/obj/item/stack/sheet/metal/O = W
+ if (O.use(1))
+ src.d_state = 0
+ update_icon()
+ src.icon_state = "r_wall"
+ user << "You replace the outer grille."
+ else
+ user << "Report this to a coder: metal stack had less than one sheet in it when trying to repair wall"
+ return 1
+ return 1
+
+ if(2)
+ if( istype(W, /obj/item/weapon/weldingtool) )
+ var/obj/item/weapon/weldingtool/WT = W
+ if( WT.remove_fuel(0,user) )
+
+ user << "You begin slicing through the metal cover..."
+ playsound(src, W.usesound, 100, 1)
+
+ if(do_after(user, 60, target = src))
+ if( !istype(src, /turf/closed/wall/r_wall) || !user || !WT || !WT.isOn() || !T )
+ return 0
+
+ if( d_state == 2 && user.loc == T && user.get_active_hand() == WT )
+ src.d_state = 3
+ update_icon()
+ user << "You press firmly on the cover, dislodging it."
+ return 1
+
+ if( istype(W, /obj/item/weapon/gun/energy/plasmacutter) )
+
+ user << "You begin slicing through the metal cover..."
+ playsound(src, W.usesound, 100, 1)
+
+ if(do_after(user, 60, target = src))
+ if( !istype(src, /turf/closed/wall/r_wall) || !user || !W || !T )
+ return 1
+
+ if( d_state == 2 && user.loc == T && user.get_active_hand() == W )
+ src.d_state = 3
+ update_icon()
+ user << "You press firmly on the cover, dislodging it."
+ return 1
+
+ if(3)
+ if (istype(W, /obj/item/weapon/crowbar))
+
+ user << "You struggle to pry off the cover..."
+ playsound(src, W.usesound, 100, 1)
+
+ if(do_after(user, 100, target = src))
+ if( !istype(src, /turf/closed/wall/r_wall) || !user || !W || !T )
+ return 1
+
+ if( d_state == 3 && user.loc == T && user.get_active_hand() == W )
+ src.d_state = 4
+ update_icon()
+ user << "You pry off the cover."
+ return 1
+
+ if(4)
+ if (istype(W, /obj/item/weapon/wrench))
+
+ user << "You start loosening the anchoring bolts which secure the support rods to their frame..."
+ playsound(src, W.usesound, 100, 1)
+
+ if(do_after(user, 40, target = src))
+ if( !istype(src, /turf/closed/wall/r_wall) || !user || !W || !T )
+ return 1
+
+ if( d_state == 4 && user.loc == T && user.get_active_hand() == W )
+ src.d_state = 5
+ update_icon()
+ user << "You remove the bolts anchoring the support rods."
+ return 1
+
+ if(5)
+ if( istype(W, /obj/item/weapon/weldingtool) )
+ var/obj/item/weapon/weldingtool/WT = W
+ if( WT.remove_fuel(0,user) )
+
+ user << "You begin slicing through the support rods..."
+ playsound(src, W.usesound, 100, 1)
+
+ if(do_after(user, 100, target = src))
+ if( !istype(src, /turf/closed/wall/r_wall) || !user || !WT || !WT.isOn() || !T )
+ return 1
+
+ if( d_state == 5 && user.loc == T && user.get_active_hand() == WT )
+ src.d_state = 6
+ update_icon()
+ user << "You slice through the support rods."
+ return 1
+
+ if( istype(W, /obj/item/weapon/gun/energy/plasmacutter) )
+
+ user << "You begin slicing through the support rods..."
+ playsound(src, W.usesound, 100, 1)
+
+ if(do_after(user, 70, target = src))
+ if( !istype(src, /turf/closed/wall/r_wall) || !user || !W || !T )
+ return 1
+
+ if( d_state == 5 && user.loc == T && user.get_active_hand() == W )
+ src.d_state = 6
+ update_icon()
+ user << "You slice through the support rods."
+ return 1
+
+ if(6)
+ if( istype(W, /obj/item/weapon/crowbar) )
+
+ user << "You struggle to pry off the outer sheath..."
+ playsound(src, W.usesound, 100, 1)
+
+ if(do_after(user, 100, target = src))
+ if( !istype(src, /turf/closed/wall/r_wall) || !user || !W || !T )
+ return 1
+
+ if( user.loc == T && user.get_active_hand() == W )
+ user << "You pry off the outer sheath."
+ dismantle_wall()
+ return 1
+ return 0
+
+/turf/closed/wall/r_wall/proc/update_icon()
+ if(d_state)
+ icon_state = "r_wall-[d_state]"
+ smooth = SMOOTH_FALSE
+ clear_smooth_overlays()
+ else
+ smooth = SMOOTH_TRUE
+ icon_state = ""
+
+/turf/closed/wall/r_wall/singularity_pull(S, current_size)
+ if(current_size >= STAGE_FIVE)
+ if(prob(30))
+ dismantle_wall()
\ No newline at end of file
diff --git a/code/game/verbs/looc.dm b/code/game/verbs/looc.dm
new file mode 100644
index 0000000000..265126d4ad
--- /dev/null
+++ b/code/game/verbs/looc.dm
@@ -0,0 +1,79 @@
+/client/verb/looc(msg as text)
+ set name = "LOOC"
+ set desc = "Local OOC, seen only by those in view."
+ set category = "OOC"
+
+ if(say_disabled) //This is here to try to identify lag problems
+ usr << "\red Speech is currently admin-disabled."
+ return
+
+ if(!mob) return
+ if(IsGuestKey(key))
+ src << "Guests may not use OOC."
+ return
+
+ msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
+ if(!msg) return
+
+ if(!(prefs.toggles & CHAT_OOC))
+ src << "\red You have OOC muted."
+ return
+
+ if(!holder)
+ if(!ooc_allowed)
+ src << "\red OOC is globally muted"
+ return
+ if(!dooc_allowed && (mob.stat == DEAD))
+ usr << "\red OOC for dead mobs has been turned off."
+ return
+ if(prefs.muted & MUTE_OOC)
+ src << "\red You cannot use OOC (muted)."
+ return
+ if(handle_spam_prevention(msg,MUTE_OOC))
+ return
+ if(findtext(msg, "byond://"))
+ src << "Advertising other servers is not allowed."
+ log_admin("[key_name(src)] has attempted to advertise in LOOC: [msg]")
+ return
+
+ log_ooc("(LOCAL) [mob.name]/[key] : [msg]")
+
+ var/list/heard = get_hearers_in_view(7, get_top_level_mob(src.mob))
+ for(var/mob/M in heard)
+ if(!M.client)
+ continue
+ var/client/C = M.client
+ if (C in admins)
+ continue //they are handled after that
+
+ if (istype(M,/mob/dead/observer))
+ continue //Also handled later.
+
+ if(C.prefs.toggles & CHAT_OOC)
+// var/display_name = src.key
+// if(holder)
+// if(holder.fakekey)
+// if(C.holder)
+// display_name = "[holder.fakekey]/([src.key])"
+// else
+// display_name = holder.fakekey
+ C << "LOOC: [src.mob.name]: [msg]"
+
+ for(var/client/C in admins)
+ if(C.prefs.toggles & CHAT_OOC)
+ var/prefix = "(R)LOOC"
+ if (C.mob in heard)
+ prefix = "LOOC"
+ C << "[prefix]: [src.key]/[src.mob.name]: [msg]"
+
+ for(var/mob/dead/observer/G in world)
+ if(!G.client)
+ continue
+ var/client/C = G.client
+ if (C in admins)
+ continue //handled earlier.
+ if(C.prefs.toggles & CHAT_OOC)
+ var/prefix = "(G)LOOC"
+ if (C.mob in heard)
+ prefix = "LOOC"
+ C << "[prefix]: [src.key]/[src.mob.name]: [msg]"
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
new file mode 100644
index 0000000000..d22c2785ea
--- /dev/null
+++ b/code/game/verbs/ooc.dm
@@ -0,0 +1,176 @@
+/client/verb/ooc(msg as text)
+ set name = "OOC" //Gave this shit a shorter name so you only have to time out "ooc" rather than "ooc message" to use it --NeoFite
+ set category = "OOC"
+
+ if(say_disabled) //This is here to try to identify lag problems
+ usr << "Speech is currently admin-disabled."
+ return
+
+ if(!mob)
+ return
+ if(IsGuestKey(key))
+ src << "Guests may not use OOC."
+ return
+
+ msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
+ if(!msg)
+ return
+
+ if(!(prefs.chat_toggles & CHAT_OOC))
+ src << "You have OOC muted."
+ return
+
+ if(!holder)
+ if(!ooc_allowed)
+ src << "OOC is globally muted."
+ return
+ if(!dooc_allowed && (mob.stat == DEAD))
+ usr << "OOC for dead mobs has been turned off."
+ return
+ if(prefs.muted & MUTE_OOC)
+ src << "You cannot use OOC (muted)."
+ return
+ if(src.mob)
+ if(jobban_isbanned(src.mob, "OOC"))
+ src << "You have been banned from OOC."
+ return
+ if(handle_spam_prevention(msg,MUTE_OOC))
+ return
+ if(findtext(msg, "byond://"))
+ src << "Advertising other servers is not allowed."
+ log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]")
+ message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]")
+ return
+
+ var/raw_msg = msg
+
+ msg = emoji_parse(msg)
+
+ if((copytext(msg, 1, 2) in list(".",";",":","#")) || (findtext(lowertext(copytext(msg, 1, 5)), "say")))
+ if(alert("Your message \"[raw_msg]\" looks like it was meant for in game communication, say it in OOC?", "Meant for OOC?", "No", "Yes") != "Yes")
+ return
+
+ log_ooc("[mob.name]/[key] : [raw_msg]")
+
+ var/keyname = key
+ if(prefs.unlock_content)
+ if(prefs.toggles & MEMBER_PUBLIC)
+ keyname = "
[keyname]"
+
+ for(var/client/C in clients)
+ if(C.prefs.chat_toggles & CHAT_OOC)
+ if(holder)
+ if(!holder.fakekey || C.holder)
+ if(check_rights_for(src, R_ADMIN))
+ C << "[config.allow_admin_ooccolor && prefs.ooccolor ? "" :"" ]OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]"
+ else
+ C << "OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]"
+ else
+ C << "OOC: [holder.fakekey ? holder.fakekey : key]: [msg]"
+ else if(!(key in C.prefs.ignoring))
+ C << "OOC: [keyname]: [msg]"
+
+/proc/toggle_ooc(toggle = null)
+ if(toggle != null) //if we're specifically en/disabling ooc
+ if(toggle != ooc_allowed)
+ ooc_allowed = toggle
+ else
+ return
+ else //otherwise just toggle it
+ ooc_allowed = !ooc_allowed
+ world << "The OOC channel has been globally [ooc_allowed ? "enabled" : "disabled"]."
+
+var/global/normal_ooc_colour = OOC_COLOR
+
+/client/proc/set_ooc(newColor as color)
+ set name = "Set Player OOC Color"
+ set desc = "Modifies player OOC Color"
+ set category = "Fun"
+ normal_ooc_colour = sanitize_ooccolor(newColor)
+
+/client/proc/reset_ooc()
+ set name = "Reset Player OOC Color"
+ set desc = "Returns player OOC Color to default"
+ set category = "Fun"
+ normal_ooc_colour = OOC_COLOR
+
+/client/verb/colorooc()
+ set name = "Set Your OOC Color"
+ set category = "Preferences"
+
+ if(!holder || check_rights_for(src, R_ADMIN))
+ if(!is_content_unlocked())
+ return
+
+ var/new_ooccolor = input(src, "Please select your OOC color.", "OOC color", prefs.ooccolor) as color|null
+ if(new_ooccolor)
+ prefs.ooccolor = sanitize_ooccolor(new_ooccolor)
+ prefs.save_preferences()
+ feedback_add_details("admin_verb","OC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ return
+
+/client/verb/resetcolorooc()
+ set name = "Reset Your OOC Color"
+ set desc = "Returns your OOC Color to default"
+ set category = "Preferences"
+
+ if(!holder || check_rights_for(src, R_ADMIN))
+ if(!is_content_unlocked())
+ return
+
+ prefs.ooccolor = initial(prefs.ooccolor)
+ prefs.save_preferences()
+
+//Checks admin notice
+/client/verb/admin_notice()
+ set name = "Adminnotice"
+ set category = "Admin"
+ set desc ="Check the admin notice if it has been set"
+
+ if(admin_notice)
+ src << "Admin Notice:\n \t [admin_notice]"
+ else
+ src << "There are no admin notices at the moment."
+
+/client/verb/motd()
+ set name = "MOTD"
+ set category = "OOC"
+ set desc ="Check the Message of the Day"
+
+ if(join_motd)
+ src << "[join_motd]
"
+ else
+ src << "The Message of the Day has not been set."
+
+/client/proc/self_notes()
+ set name = "View Admin Notes"
+ set category = "OOC"
+ set desc = "View the notes that admins have written about you"
+
+ if(!config.see_own_notes)
+ usr << "Sorry, that function is not enabled on this server."
+ return
+
+ show_note(usr, null, 1)
+
+/client/proc/ignore_key(client)
+ var/client/C = client
+ if(C.key in prefs.ignoring)
+ prefs.ignoring -= C.key
+ else
+ prefs.ignoring |= C.key
+ src << "You are [(C.key in prefs.ignoring) ? "now" : "no longer"] ignoring [C.key] on the OOC channel."
+ prefs.save_preferences()
+
+/client/verb/select_ignore()
+ set name = "Ignore"
+ set category = "OOC"
+ set desc ="Ignore a player's messages on the OOC channel"
+
+ var/selection = input("Please, select a player!", "Ignore", null, null) as null|anything in sortKey(clients)
+ if(!selection)
+ return
+ if(selection == src)
+ src << "You can't ignore yourself."
+ return
+ ignore_key(selection)
diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm
new file mode 100644
index 0000000000..943c4cb960
--- /dev/null
+++ b/code/game/verbs/suicide.dm
@@ -0,0 +1,179 @@
+/mob/var/suiciding = 0
+
+/mob/living/carbon/human/verb/suicide()
+ set hidden = 1
+ if(!canSuicide())
+ return
+ var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No")
+ if(!canSuicide())
+ return
+ if(confirm == "Yes")
+ suiciding = 1
+ log_game("[key_name(src)] (job: [job ? "[job]" : "None"]) commited suicide at [get_area(src)].")
+ message_admins("[key_name(src)] (job: [job ? "[job]" : "None"]) commited suicide at [get_area(src)].")
+ var/obj/item/held_item = get_active_hand()
+ if(held_item)
+ var/damagetype = held_item.suicide_act(src)
+ if(damagetype)
+ if(damagetype & SHAME)
+ adjustStaminaLoss(200)
+ suiciding = 0
+ return
+ var/damage_mod = 0
+ for(var/T in list(BRUTELOSS, FIRELOSS, TOXLOSS, OXYLOSS))
+ damage_mod += (T & damagetype) ? 1 : 0
+ damage_mod = max(1, damage_mod)
+
+ //Do 200 damage divided by the number of damage types applied.
+ if(damagetype & BRUTELOSS)
+ adjustBruteLoss(200/damage_mod)
+
+ if(damagetype & FIRELOSS)
+ adjustFireLoss(200/damage_mod)
+
+ if(damagetype & TOXLOSS)
+ adjustToxLoss(200/damage_mod)
+
+ if(damagetype & OXYLOSS)
+ adjustOxyLoss(200/damage_mod)
+
+ //If something went wrong, just do normal oxyloss
+ if(!(damagetype & (BRUTELOSS | FIRELOSS | TOXLOSS | OXYLOSS) ))
+ adjustOxyLoss(max(200 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
+
+ death(0)
+ return
+
+ var/suicide_message = pick("[src] is attempting to bite \his tongue off! It looks like \he's trying to commit suicide.", \
+ "[src] is jamming \his thumbs into \his eye sockets! It looks like \he's trying to commit suicide.", \
+ "[src] is twisting \his own neck! It looks like \he's trying to commit suicide.", \
+ "[src] is holding \his breath! It looks like \he's trying to commit suicide.")
+
+ visible_message("[suicide_message]", "[suicide_message]")
+
+ adjustOxyLoss(max(200 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
+ death(0)
+
+/mob/living/carbon/brain/verb/suicide()
+ set hidden = 1
+ if(!canSuicide())
+ return
+ var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No")
+ if(!canSuicide())
+ return
+ if(confirm == "Yes")
+ suiciding = 1
+ visible_message("[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live.", \
+ "[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live.")
+ spawn(50)
+ death(0)
+
+/mob/living/carbon/monkey/verb/suicide()
+ set hidden = 1
+ if(!canSuicide())
+ return
+ var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No")
+ if(!canSuicide())
+ return
+ if(confirm == "Yes")
+ suiciding = 1
+ //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while
+ visible_message("[src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide.", \
+ "[src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide.")
+ adjustOxyLoss(max(200- getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
+ death(0)
+
+/mob/living/silicon/ai/verb/suicide()
+ set hidden = 1
+ if(!canSuicide())
+ return
+ var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No")
+ if(!canSuicide())
+ return
+ if(confirm == "Yes")
+ suiciding = 1
+ visible_message("[src] is powering down. It looks like \he's trying to commit suicide.", \
+ "[src] is powering down. It looks like \he's trying to commit suicide.")
+ //put em at -175
+ adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
+ death(0)
+
+/mob/living/silicon/robot/verb/suicide()
+ set hidden = 1
+ if(!canSuicide())
+ return
+ var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No")
+ if(!canSuicide())
+ return
+ if(confirm == "Yes")
+ suiciding = 1
+ visible_message("[src] is powering down. It looks like \he's trying to commit suicide.", \
+ "[src] is powering down. It looks like \he's trying to commit suicide.")
+ //put em at -175
+ adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
+ death(0)
+
+/mob/living/silicon/pai/verb/suicide()
+ set category = "pAI Commands"
+ set desc = "Kill yourself and become a ghost (You will receive a confirmation prompt)"
+ set name = "pAI Suicide"
+ var/answer = input("REALLY kill yourself? This action can't be undone.", "Suicide", "No") in list ("Yes", "No")
+ if(answer == "Yes")
+ card.removePersonality()
+ var/turf/T = get_turf(src.loc)
+ T.visible_message("[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"", "[src] bleeps electronically.")
+ death(0)
+ else
+ src << "Aborting suicide attempt."
+
+/mob/living/carbon/alien/humanoid/verb/suicide()
+ set hidden = 1
+ if(!canSuicide())
+ return
+ var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No")
+ if(!canSuicide())
+ return
+ if(confirm == "Yes")
+ suiciding = 1
+ visible_message("[src] is thrashing wildly! It looks like \he's trying to commit suicide.", \
+ "[src] is thrashing wildly! It looks like \he's trying to commit suicide.", \
+ "You hear thrashing.")
+ //put em at -175
+ adjustOxyLoss(max(200 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
+ death(0)
+
+/mob/living/simple_animal/verb/suicide()
+ set hidden = 1
+ if(!canSuicide())
+ return
+ var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No")
+ if(!canSuicide())
+ return
+ if(confirm == "Yes")
+ suiciding = 1
+ visible_message("[src] begins to fall down. It looks like \he's lost the will to live.", \
+ "[src] begins to fall down. It looks like \he's lost the will to live.")
+ death(0)
+
+
+/mob/living/proc/canSuicide()
+ if(stat == CONSCIOUS)
+ if(mental_dominator)
+ src << "This body's force of will is too strong! You can't break it enough to murder them."
+ if(mind_control_holder)
+ mind_control_holder << "Through tremendous force of will, you stop a suicide attempt!"
+ return 0
+ return 1
+ else if(stat == DEAD)
+ src << "You're already dead!"
+ else if(stat == UNCONSCIOUS)
+ src << "You need to be conscious to suicide!"
+ return
+
+/mob/living/carbon/canSuicide()
+ if(!..())
+ return
+ if(!canmove || restrained()) //just while I finish up the new 'fun' suiciding verb. This is to prevent metagaming via suicide
+ src << "You can't commit suicide whilst restrained! ((You can type Ghost instead however.))"
+ return
+ return 1
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
new file mode 100644
index 0000000000..a6e5411a8b
--- /dev/null
+++ b/code/game/verbs/who.dm
@@ -0,0 +1,85 @@
+/client/verb/who()
+ set name = "Who"
+ set category = "OOC"
+
+ var/msg = "Current Players:\n"
+
+ var/list/Lines = list()
+
+ if(holder)
+ if (check_rights(R_ADMIN,0) && isobserver(src.mob))//If they have +ADMIN and are a ghost they can see players IC names and statuses.
+ var/mob/dead/observer/G = src.mob
+ if(!G.started_as_observer)//If you aghost to do this, KorPhaeron will deadmin you in your sleep.
+ log_admin("[key_name(usr)] checked advanced who in-round")
+ for(var/client/C in clients)
+ var/entry = "\t[C.key]"
+ if(C.holder && C.holder.fakekey)
+ entry += " (as [C.holder.fakekey])"
+ if (isnewplayer(C.mob))
+ entry += " - In Lobby"
+ else
+ entry += " - Playing as [C.mob.real_name]"
+ switch(C.mob.stat)
+ if(UNCONSCIOUS)
+ entry += " - Unconscious"
+ if(DEAD)
+ if(isobserver(C.mob))
+ var/mob/dead/observer/O = C.mob
+ if(O.started_as_observer)
+ entry += " - Observing"
+ else
+ entry += " - DEAD"
+ else
+ entry += " - DEAD"
+ if(is_special_character(C.mob))
+ entry += " - Antagonist"
+ entry += " (?)"
+ Lines += entry
+ else//If they don't have +ADMIN, only show hidden admins
+ for(var/client/C in clients)
+ var/entry = "\t[C.key]"
+ if(C.holder && C.holder.fakekey)
+ entry += " (as [C.holder.fakekey])"
+ Lines += entry
+ else
+ for(var/client/C in clients)
+ if(C.holder && C.holder.fakekey)
+ Lines += C.holder.fakekey
+ else
+ Lines += C.key
+
+ for(var/line in sortList(Lines))
+ msg += "[line]\n"
+
+ msg += "Total Players: [length(Lines)]"
+ src << msg
+
+/client/verb/adminwho()
+ set category = "Admin"
+ set name = "Adminwho"
+
+ var/msg = "Current Admins:\n"
+ if(holder)
+ for(var/client/C in admins)
+ msg += "\t[C] is a [C.holder.rank]"
+
+ if(C.holder.fakekey)
+ msg += " (as [C.holder.fakekey])"
+
+ if(isobserver(C.mob))
+ msg += " - Observing"
+ else if(istype(C.mob,/mob/new_player))
+ msg += " - Lobby"
+ else
+ msg += " - Playing"
+
+ if(C.is_afk())
+ msg += " (AFK)"
+ msg += "\n"
+ else
+ for(var/client/C in admins)
+ if(!C.holder.fakekey)
+ msg += "\t[C] is a [C.holder.rank]\n"
+ msg += "Adminhelps are also sent to IRC. If no admins are available in game adminhelp anyways and an admin on IRC will see it and respond."
+ src << msg
+
diff --git a/code/hub.dm b/code/hub.dm
new file mode 100644
index 0000000000..ce9dfd7f2c
--- /dev/null
+++ b/code/hub.dm
@@ -0,0 +1,20 @@
+/world
+
+ hub = "Exadv1.spacestation13"
+#ifdef PUTONHUB
+ hub_password = "kMZy3U5jJHSiBQjr"
+#else
+ hub_password = "kMZy3U5jJHSiBQjr"
+#endif
+ name = "Citadel Station 13"
+
+/*
+This is for any host that would like their server to appear on the main SS13 hub.
+To use it, simply replace the password above with the password found below, and recompile, and it should work.
+If not, let us know on the main tgstation IRC channel of irc.rizon.net #tgstation13: we can help you there.
+
+ hub = "Exadv1.spacestation13"
+ hub_password = "kMZy3U5jJHSiBQjr"
+ name = "Space Station 13"
+
+*/
diff --git a/code/modules/admin/banappearance.dm b/code/modules/admin/banappearance.dm
new file mode 100644
index 0000000000..b43230532c
--- /dev/null
+++ b/code/modules/admin/banappearance.dm
@@ -0,0 +1,110 @@
+//ban people from using custom names and appearances. that'll show 'em.
+
+var/appearanceban_runonce //Updates legacy bans with new info
+var/appearance_keylist[0] //to store the keys
+
+/proc/appearance_fullban(mob/M, reason)
+ if (!M || !M.key) return
+ appearance_keylist.Add(text("[M.ckey] ## [reason]"))
+ appearance_savebanfile()
+
+/proc/appearance_client_fullban(ckey)
+ if (!ckey) return
+ appearance_keylist.Add(text("[ckey]"))
+ appearance_savebanfile()
+
+//returns a reason if M is banned, returns 0 otherwise
+/proc/appearance_isbanned(mob/M)
+ if(M)
+ for(var/s in appearance_keylist)
+ if(findtext(s, "[M.ckey]") == 1)
+ var/startpos = findtext(s, "## ") + 3
+ if(startpos && startpos < length(s))
+ var/text = copytext(s, startpos, 0)
+ if(text)
+ return text
+ return "Reason Unspecified"
+ return 0
+
+/*
+DEBUG
+/mob/verb/list_all_appearances()
+ set name = "list all appearances"
+
+ for(var/s in appearance_keylist)
+ world << s
+
+/mob/verb/reload_appearances()
+ set name = "reload appearances"
+
+ appearance_loadbanfile()
+*/
+
+/proc/appearance_loadbanfile()
+ if(config.ban_legacy_system)
+ var/savefile/S=new("data/appearance_full.ban")
+ S["keys[0]"] >> appearance_keylist
+ log_admin("Loading appearance_rank")
+ S["runonce"] >> appearanceban_runonce
+
+ if (!length(appearance_keylist))
+ appearance_keylist=list()
+ log_admin("appearance_keylist was empty")
+ else
+ if(!establish_db_connection())
+ world.log << "Database connection failed. Reverting to the legacy ban system."
+ diary << "Database connection failed. Reverting to the legacy ban system."
+ config.ban_legacy_system = 1
+ appearance_loadbanfile()
+ return
+
+ //appearance bans
+ var/DBQuery/query = dbcon.NewQuery("SELECT ckey FROM [format_table_name("ban")] WHERE bantype = 'APPEARANCE_PERMABAN' AND NOT unbanned = 1")
+ query.Execute()
+
+ while(query.NextRow())
+ var/ckey = query.item[1]
+
+ appearance_keylist.Add("[ckey]")
+
+/proc/appearance_savebanfile()
+ var/savefile/S=new("data/appearance_full.ban")
+ S["keys[0]"] << appearance_keylist
+
+/proc/appearance_unban(mob/M)
+ appearance_remove("[M.ckey]")
+ appearance_savebanfile()
+
+
+/proc/appearance_updatelegacybans()
+ if(!appearanceban_runonce)
+ log_admin("Updating appearancefile!")
+ // Updates bans.. Or fixes them. Either way.
+ for(var/T in appearance_keylist)
+ if(!T)
+ continue
+ appearanceban_runonce++ //don't run this update again
+
+
+/proc/appearance_remove(X)
+ for (var/i = 1; i <= length(appearance_keylist); i++)
+ if( findtext(appearance_keylist[i], "[X]") )
+ appearance_keylist.Remove(appearance_keylist[i])
+ appearance_savebanfile()
+ return 1
+ return 0
+
+/*
+/proc/DB_ban_isappearancebanned(var/playerckey)
+ establish_db_connection()
+ if(!dbcon.IsConnected())
+ return
+
+ var/sqlplayerckey = sanitizeSQL(ckey(playerckey))
+
+ var/DBQuery/query = dbcon.NewQuery("SELECT id FROM [format_table_name("ban")] WHERE CKEY = '[sqlplayerckey]' AND ((bantype = 'APPEARANCE_PERMABAN') OR (bantype = 'APPEARANCE_TEMPBAN' AND expiration_time > Now())) AND unbanned != 1")
+ query.Execute()
+ while(query.NextRow())
+ return 1
+ return 0
+*/
\ No newline at end of file
diff --git a/code/modules/admin/sql_notes.dm b/code/modules/admin/sql_notes.dm
new file mode 100644
index 0000000000..7050f968d1
--- /dev/null
+++ b/code/modules/admin/sql_notes.dm
@@ -0,0 +1,217 @@
+/proc/add_note(target_ckey, notetext, timestamp, adminckey, logged = 1, server)
+ if(!dbcon.IsConnected())
+ usr << "Failed to establish database connection."
+ return
+ if(!target_ckey)
+ var/new_ckey = ckey(input(usr,"Who would you like to add a note for?","Enter a ckey",null) as text)
+ if(!new_ckey)
+ return
+ new_ckey = sanitizeSQL(new_ckey)
+ var/DBQuery/query_find_ckey = dbcon.NewQuery("SELECT ckey FROM [format_table_name("player")] WHERE ckey = '[new_ckey]'")
+ if(!query_find_ckey.Execute())
+ var/err = query_find_ckey.ErrorMsg()
+ log_game("SQL ERROR obtaining ckey from player table. Error : \[[err]\]\n")
+ return
+ if(!query_find_ckey.NextRow())
+ if(alert(usr, "[new_ckey] has not been seen before, are you sure you want to add them to the watchlist?", "Unknown ckey", "Yes", "No", "Cancel") != "Yes")
+ return
+ target_ckey = new_ckey
+ var/target_sql_ckey = sanitizeSQL(target_ckey)
+ if(!notetext)
+ notetext = input(usr,"Write your Note","Add Note") as message
+ if(!notetext)
+ return
+ notetext = sanitizeSQL(notetext)
+ if(!timestamp)
+ timestamp = SQLtime()
+ if(!adminckey)
+ adminckey = usr.ckey
+ if(!adminckey)
+ return
+ var/admin_sql_ckey = sanitizeSQL(adminckey)
+ if(!server)
+ if (config && config.server_name)
+ server = config.server_name
+ server = sanitizeSQL(server)
+ var/DBQuery/query_noteadd = dbcon.NewQuery("INSERT INTO [format_table_name("notes")] (ckey, timestamp, notetext, adminckey, server) VALUES ('[target_sql_ckey]', '[timestamp]', '[notetext]', '[admin_sql_ckey]', '[server]')")
+ if(!query_noteadd.Execute())
+ var/err = query_noteadd.ErrorMsg()
+ log_game("SQL ERROR adding new note to table. Error : \[[err]\]\n")
+ return
+ if(logged)
+ log_admin("[key_name(usr)] has added a note to [target_ckey]: [notetext]")
+ message_admins("[key_name_admin(usr)] has added a note to [target_ckey]:
[notetext]")
+ show_note(target_ckey)
+
+/proc/remove_note(note_id)
+ var/ckey
+ var/notetext
+ var/adminckey
+ if(!dbcon.IsConnected())
+ usr << "Failed to establish database connection."
+ return
+ if(!note_id)
+ return
+ note_id = text2num(note_id)
+ var/DBQuery/query_find_note_del = dbcon.NewQuery("SELECT ckey, notetext, adminckey FROM [format_table_name("notes")] WHERE id = [note_id]")
+ if(!query_find_note_del.Execute())
+ var/err = query_find_note_del.ErrorMsg()
+ log_game("SQL ERROR obtaining ckey, notetext, adminckey from notes table. Error : \[[err]\]\n")
+ return
+ if(query_find_note_del.NextRow())
+ ckey = query_find_note_del.item[1]
+ notetext = query_find_note_del.item[2]
+ adminckey = query_find_note_del.item[3]
+ var/DBQuery/query_del_note = dbcon.NewQuery("DELETE FROM [format_table_name("notes")] WHERE id = [note_id]")
+ if(!query_del_note.Execute())
+ var/err = query_del_note.ErrorMsg()
+ log_game("SQL ERROR removing note from table. Error : \[[err]\]\n")
+ return
+ log_admin("[key_name(usr)] has removed a note made by [adminckey] from [ckey]: [notetext]")
+ message_admins("[key_name_admin(usr)] has removed a note made by [adminckey] from [ckey]:
[notetext]")
+ show_note(ckey)
+
+/proc/edit_note(note_id)
+ if(!dbcon.IsConnected())
+ usr << "Failed to establish database connection."
+ return
+ if(!note_id)
+ return
+ note_id = text2num(note_id)
+ var/target_ckey
+ var/sql_ckey = sanitizeSQL(usr.ckey)
+ var/DBQuery/query_find_note_edit = dbcon.NewQuery("SELECT ckey, notetext, adminckey FROM [format_table_name("notes")] WHERE id = [note_id]")
+ if(!query_find_note_edit.Execute())
+ var/err = query_find_note_edit.ErrorMsg()
+ log_game("SQL ERROR obtaining notetext from notes table. Error : \[[err]\]\n")
+ return
+ if(query_find_note_edit.NextRow())
+ target_ckey = query_find_note_edit.item[1]
+ var/old_note = query_find_note_edit.item[2]
+ var/adminckey = query_find_note_edit.item[3]
+ var/new_note = input("Input new note", "New Note", "[old_note]") as message
+ if(!new_note)
+ return
+ new_note = sanitizeSQL(new_note)
+ var/edit_text = "Edited by [sql_ckey] on [SQLtime()] from
[old_note]
to
[new_note]
"
+ edit_text = sanitizeSQL(edit_text)
+ var/DBQuery/query_update_note = dbcon.NewQuery("UPDATE [format_table_name("notes")] SET notetext = '[new_note]', last_editor = '[sql_ckey]', edits = CONCAT(IFNULL(edits,''),'[edit_text]') WHERE id = [note_id]")
+ if(!query_update_note.Execute())
+ var/err = query_update_note.ErrorMsg()
+ log_game("SQL ERROR editing note. Error : \[[err]\]\n")
+ return
+ log_admin("[key_name(usr)] has edited [target_ckey]'s note made by [adminckey] from [old_note] to [new_note]")
+ message_admins("[key_name_admin(usr)] has edited [target_ckey]'s note made by [adminckey] from
[old_note]
to
[new_note]")
+ show_note(target_ckey)
+
+/proc/show_note(target_ckey, index, linkless = 0)
+ var/output
+ var/navbar
+ var/ruler
+ ruler = "
"
+ navbar = "\[All\]|\[#\]"
+ for(var/letter in alphabet)
+ navbar += "|\[[letter]\]"
+ navbar += "
"
+ if(!linkless)
+ output = navbar
+ if(target_ckey)
+ var/target_sql_ckey = sanitizeSQL(target_ckey)
+ var/DBQuery/query_get_notes = dbcon.NewQuery("SELECT id, timestamp, notetext, adminckey, last_editor, server FROM [format_table_name("notes")] WHERE ckey = '[target_sql_ckey]' ORDER BY timestamp")
+ if(!query_get_notes.Execute())
+ var/err = query_get_notes.ErrorMsg()
+ log_game("SQL ERROR obtaining ckey, notetext, adminckey, last_editor, server from notes table. Error : \[[err]\]\n")
+ return
+ output += "Notes of [target_ckey]
"
+ if(!linkless)
+ output += "\[Add Note\]"
+ output += ruler
+ while(query_get_notes.NextRow())
+ var/id = query_get_notes.item[1]
+ var/timestamp = query_get_notes.item[2]
+ var/notetext = query_get_notes.item[3]
+ var/adminckey = query_get_notes.item[4]
+ var/last_editor = query_get_notes.item[5]
+ var/server = query_get_notes.item[6]
+ output += "[timestamp] | [server] | [adminckey]"
+ if(!linkless)
+ output += " \[Remove Note\] \[Edit Note\]"
+ if(last_editor)
+ output += " Last edit by [last_editor] (Click here to see edit log)"
+ output += "
[notetext]
"
+ else if(index)
+ var/index_ckey
+ var/search
+ output += "\[Add Note\]"
+ output += ruler
+ if(!isnum(index))
+ index = sanitizeSQL(index)
+ switch(index)
+ if(1)
+ search = "^."
+ if(2)
+ search = "^\[^\[:alpha:\]\]"
+ else
+ search = "^[index]"
+ var/DBQuery/query_list_notes = dbcon.NewQuery("SELECT DISTINCT ckey FROM [format_table_name("notes")] WHERE ckey REGEXP '[search]' ORDER BY ckey")
+ if(!query_list_notes.Execute())
+ var/err = query_list_notes.ErrorMsg()
+ log_game("SQL ERROR obtaining ckey from notes table. Error : \[[err]\]\n")
+ return
+ while(query_list_notes.NextRow())
+ index_ckey = query_list_notes.item[1]
+ output += "[index_ckey]
"
+ else
+ output += "\[Add Note\]"
+ output += ruler
+ usr << browse(output, "window=show_notes;size=900x500")
+
+#define NOTESFILE "data/player_notes.sav"
+//if the AUTOCONVERT_NOTES is turned on, anytime a player connects this will be run to try and add all their notes to the databas
+/proc/convert_notes_sql(ckey)
+ var/savefile/notesfile = new(NOTESFILE)
+ if(!notesfile)
+ log_game("Error: Cannot access [NOTESFILE]")
+ return
+ notesfile.cd = "/[ckey]"
+ while(!notesfile.eof)
+ var/notetext
+ notesfile >> notetext
+ var/server
+ if(config && config.server_name)
+ server = config.server_name
+ var/regex/note = new("^(\\d{2}-\\w{3}-\\d{4}) \\| (.+) ~(\\w+)$", "i")
+ note.Find(notetext)
+ var/timestamp = note.group[1]
+ notetext = note.group[2]
+ var/adminckey = note.group[3]
+ var/DBQuery/query_convert_time = dbcon.NewQuery("SELECT ADDTIME(STR_TO_DATE('[timestamp]','%d-%b-%Y'), '0')")
+ if(!query_convert_time.Execute())
+ var/err = query_convert_time.ErrorMsg()
+ log_game("SQL ERROR converting timestamp. Error : \[[err]\]\n")
+ return
+ if(query_convert_time.NextRow())
+ timestamp = query_convert_time.item[1]
+ if(ckey && notetext && timestamp && adminckey && server)
+ add_note(ckey, notetext, timestamp, adminckey, 0, server)
+ notesfile.cd = "/"
+ notesfile.dir.Remove(ckey)
+
+/*alternatively this proc can be run once to pass through every note and attempt to convert it before deleting the file, if done then AUTOCONVERT_NOTES should be turned off
+this proc can take several minutes to execute fully if converting and cause DD to hang if converting a lot of notes; it's not advised to do so while a server is live
+/proc/mass_convert_notes()
+ world << "Beginning mass note conversion"
+ var/savefile/notesfile = new(NOTESFILE)
+ if(!notesfile)
+ log_game("Error: Cannot access [NOTESFILE]")
+ return
+ notesfile.cd = "/"
+ for(var/ckey in notesfile.dir)
+ convert_notes_sql(ckey)
+ world << "Deleting NOTESFILE"
+ fdel(NOTESFILE)
+ world << "Finished mass note conversion, remember to turn off AUTOCONVERT_NOTES"*/
+#undef NOTESFILE
\ No newline at end of file
diff --git a/code/modules/admin/watchlist.dm b/code/modules/admin/watchlist.dm
new file mode 100644
index 0000000000..71463b5c52
--- /dev/null
+++ b/code/modules/admin/watchlist.dm
@@ -0,0 +1,117 @@
+/client/proc/watchlist_add(target_ckey, browse = 0)
+ if(!target_ckey)
+ var/new_ckey = ckey(input(usr,"Who would you like to add to the watchlist?","Enter a ckey",null) as text)
+ if(!new_ckey)
+ return
+ new_ckey = sanitizeSQL(new_ckey)
+ var/DBQuery/query_watchfind = dbcon.NewQuery("SELECT ckey FROM [format_table_name("player")] WHERE ckey = '[new_ckey]'")
+ if(!query_watchfind.Execute())
+ var/err = query_watchfind.ErrorMsg()
+ log_game("SQL ERROR obtaining ckey from player table. Error : \[[err]\]\n")
+ return
+ if(!query_watchfind.NextRow())
+ if(alert(usr, "[new_ckey] has not been seen before, are you sure you want to add them to the watchlist?", "Unknown ckey", "Yes", "No", "Cancel") != "Yes")
+ return
+ target_ckey = new_ckey
+ var/target_sql_ckey = sanitizeSQL(target_ckey)
+ if(check_watchlist(target_sql_ckey))
+ usr << "[target_sql_ckey] is already on the watchlist."
+ return
+ var/reason = input(usr,"Please State Reason","Reason") as message
+ if(!reason)
+ return
+ reason = sanitizeSQL(reason)
+ var/timestamp = SQLtime()
+ var/adminckey = usr.ckey
+ if(!adminckey)
+ return
+ var/admin_sql_ckey = sanitizeSQL(adminckey)
+ var/DBQuery/query_watchadd = dbcon.NewQuery("INSERT INTO [format_table_name("watch")] (ckey, reason, adminckey, timestamp) VALUES ('[target_sql_ckey]', '[reason]', '[admin_sql_ckey]', '[timestamp]')")
+ if(!query_watchadd.Execute())
+ var/err = query_watchadd.ErrorMsg()
+ log_game("SQL ERROR during adding new watch entry. Error : \[[err]\]\n")
+ return
+ log_admin("[key_name(usr)] has added [target_ckey] to the watchlist - Reason: [reason]")
+ message_admins("[key_name_admin(usr)] has added [target_ckey] to the watchlist - Reason: [reason]", 1)
+ if(browse)
+ watchlist_show(target_sql_ckey)
+
+/client/proc/watchlist_remove(target_ckey, browse = 0)
+ var/target_sql_ckey = sanitizeSQL(target_ckey)
+ var/DBQuery/query_watchdel = dbcon.NewQuery("DELETE FROM [format_table_name("watch")] WHERE ckey = '[target_sql_ckey]'")
+ if(!query_watchdel.Execute())
+ var/err = query_watchdel.ErrorMsg()
+ log_game("SQL ERROR during removing watch entry. Error : \[[err]\]\n")
+ return
+ log_admin("[key_name(usr)] has removed [target_ckey] from the watchlist")
+ message_admins("[key_name_admin(usr)] has removed [target_ckey] from the watchlist", 1)
+ if(browse)
+ watchlist_show()
+
+/client/proc/watchlist_edit(target_ckey, browse = 0)
+ var/target_sql_ckey = sanitizeSQL(target_ckey)
+ var/DBQuery/query_watchreason = dbcon.NewQuery("SELECT reason FROM [format_table_name("watch")] WHERE ckey = '[target_sql_ckey]'")
+ if(!query_watchreason.Execute())
+ var/err = query_watchreason.ErrorMsg()
+ log_game("SQL ERROR obtaining reason from watch table. Error : \[[err]\]\n")
+ return
+ if(query_watchreason.NextRow())
+ var/watch_reason = query_watchreason.item[1]
+ var/new_reason = input("Input new reason", "New Reason", "[watch_reason]") as message
+ new_reason = sanitizeSQL(new_reason)
+ if(!new_reason)
+ return
+ var/sql_ckey = sanitizeSQL(usr.ckey)
+ var/edit_text = "Edited by [sql_ckey] on [SQLtime()] from
[watch_reason]
to
[new_reason]
"
+ edit_text = sanitizeSQL(edit_text)
+ var/DBQuery/query_watchupdate = dbcon.NewQuery("UPDATE [format_table_name("watch")] SET reason = '[new_reason]', last_editor = '[sql_ckey]', edits = CONCAT(IFNULL(edits,''),'[edit_text]') WHERE ckey = '[target_sql_ckey]'")
+ if(!query_watchupdate.Execute())
+ var/err = query_watchupdate.ErrorMsg()
+ log_game("SQL ERROR editing watchlist reason. Error : \[[err]\]\n")
+ return
+ log_admin("[key_name(usr)] has edited [target_ckey]'s watchlist reason from [watch_reason] to [new_reason]")
+ message_admins("[key_name_admin(usr)] has edited [target_ckey]'s watchlist reason from
[watch_reason]
to
[new_reason]")
+ if(browse)
+ watchlist_show(target_sql_ckey)
+
+/client/proc/watchlist_show(search)
+ var/output
+ output += ""
+ output += "\[Clear Search\] \[Add Ckey\]"
+ output += "
"
+ if(search)
+ search = "^[search]"
+ else
+ search = "^."
+ search = sanitizeSQL(search)
+ var/DBQuery/query_watchlist = dbcon.NewQuery("SELECT ckey, reason, adminckey, timestamp, last_editor FROM [format_table_name("watch")] WHERE ckey REGEXP '[search]' ORDER BY ckey")
+ if(!query_watchlist.Execute())
+ var/err = query_watchlist.ErrorMsg()
+ log_game("SQL ERROR obtaining ckey, reason, adminckey, timestamp, last_editor from watch table. Error : \[[err]\]\n")
+ return
+ while(query_watchlist.NextRow())
+ var/ckey = query_watchlist.item[1]
+ var/reason = query_watchlist.item[2]
+ var/adminckey = query_watchlist.item[3]
+ var/timestamp = query_watchlist.item[4]
+ var/last_editor = query_watchlist.item[5]
+ output += "[ckey] | Added by [adminckey] on [timestamp] \[Remove\] \[Edit Reason\]"
+ if(last_editor)
+ output += " Last edit by [last_editor] (Click here to see edit log)"
+ output += "
[reason]
"
+ usr << browse(output, "window=watchwin;size=900x500")
+
+/client/proc/check_watchlist(target_ckey)
+ var/target_sql_ckey = sanitizeSQL(target_ckey)
+ var/DBQuery/query_watch = dbcon.NewQuery("SELECT reason FROM [format_table_name("watch")] WHERE ckey = '[target_sql_ckey]'")
+ if(!query_watch.Execute())
+ var/err = query_watch.ErrorMsg()
+ log_game("SQL ERROR obtaining reason from watch table. Error : \[[err]\]\n")
+ return
+ if(query_watch.NextRow())
+ return query_watch.item[1]
+ else
+ return 0
diff --git a/code/modules/awaymissions/mission_code/blackmarketpackers.dm b/code/modules/awaymissions/mission_code/blackmarketpackers.dm
new file mode 100644
index 0000000000..a6d3d49480
--- /dev/null
+++ b/code/modules/awaymissions/mission_code/blackmarketpackers.dm
@@ -0,0 +1,22 @@
+//Packer Ship Areas
+
+/area/awaymission/BMPship
+ name = "BMP Asteroids"
+ icon_state = "away"
+ luminosity = 0
+
+
+/area/awaymission/BMPship/Aft
+ name = "Aft Block"
+ icon_state = "away1"
+ requires_power = 1
+
+/area/awaymission/BMPship/Midship
+ name = "Midship Block"
+ icon_state = "away2"
+ requires_power = 1
+
+/area/awaymission/BMPship/Fore
+ name = "Fore Block"
+ icon_state = "away3"
+ requires_power = 1
\ No newline at end of file
diff --git a/code/modules/awaymissions/mission_code/researchbase.dm b/code/modules/awaymissions/mission_code/researchbase.dm
new file mode 100644
index 0000000000..56cfb14195
--- /dev/null
+++ b/code/modules/awaymissions/mission_code/researchbase.dm
@@ -0,0 +1,64 @@
+//Research Base Areas//--
+
+/area/awaymission/research
+ name = "Research Outpost"
+ icon_state = "away"
+ luminosity = 0
+ dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
+
+/area/awaymission/research/interior
+ name = "Research Inside"
+ requires_power = 1
+ icon_state = "away2"
+
+/area/awaymission/research/interior/cryo
+ name = "Research Cryostasis Room"
+ icon_state = "medbay"
+
+/area/awaymission/research/interior/clonestorage
+ name = "Research Clone Storage"
+ icon_state = "cloning"
+
+/area/awaymission/research/interior/genetics
+ name = "Research Genetics Research"
+ icon_state = "genetics"
+
+/area/awaymission/research/interior/engineering
+ name = "Research Engineering"
+ icon_state = "engine"
+
+/area/awaymission/research/interior/security
+ name = "Research Security"
+ icon_state = "security"
+
+/area/awaymission/research/interior/secure
+ name = "Research Secure Vault"
+
+/area/awaymission/research/interior/maint
+ name = "Research Maintenance"
+ icon_state = "maintcentral"
+
+/area/awaymission/research/interior/dorm
+ name = "Research Dorms"
+ icon_state = "Sleep"
+
+/area/awaymission/research/interior/escapepods
+ name = "Research Escape Wing"
+ icon_state = "exit"
+
+/area/awaymission/research/interior/gateway
+ name = "Research Gateway"
+ icon_state = "start"
+
+/area/awaymission/research/interior/bathroom
+ name = "Research Bathrooms"
+ icon_state = "restrooms"
+
+/area/awaymission/research/interior/medbay
+ name = "Research Medbay"
+ icon_state = "medbay"
+
+/area/awaymission/research/exterior
+ name = "Research Exterior"
+ icon_state = "unknown"
+
diff --git a/code/modules/cargo/exports/money.dm b/code/modules/cargo/exports/money.dm
new file mode 100644
index 0000000000..e22868d65b
--- /dev/null
+++ b/code/modules/cargo/exports/money.dm
@@ -0,0 +1,24 @@
+// Space Cash. Now it isn't that useless.
+/datum/export/stack/cash
+ cost = 1 // Multiplied both by value of each bill and by amount of bills in stack.
+ unit_name = "credit"
+ export_types = list(/obj/item/stack/spacecash)
+
+/datum/export/stack/cash/get_amount(obj/O)
+ var/obj/item/stack/spacecash/C = O
+ return ..() * C.value
+
+
+// Coins. At least the coins that do not contain any materials.
+// Material-containing coins cost just as much as their materials do, see materials.dm for exact rates.
+/datum/export/coin
+ cost = 1 // Multiplied by coin's value
+ unit_name = "credit"
+ message = "worth of rare coins"
+ export_types = list(/obj/item/weapon/coin)
+
+/datum/export/coin/get_amount(obj/O)
+ var/obj/item/weapon/coin/C = O
+ if(C.materials && C.materials.len)
+ return 0 // Sold as raw material instead.
+ return ..() * C.value
\ No newline at end of file
diff --git a/code/modules/countdown/countdown.dm b/code/modules/countdown/countdown.dm
new file mode 100644
index 0000000000..ef5ab439e1
--- /dev/null
+++ b/code/modules/countdown/countdown.dm
@@ -0,0 +1,137 @@
+/obj/effect/countdown
+ name = "countdown"
+ desc = "We're leaving together\n\
+ But still it's farewell\n\
+ And maybe we'll come back\n\
+ To earth, who can tell?"
+
+ var/displayed_text
+ var/atom/attached_to
+ var/text_color = "#ff0000"
+ var/text_size = 4
+ var/started = FALSE
+ invisibility = INVISIBILITY_OBSERVER
+ anchored = TRUE
+ layer = GHOST_LAYER
+
+/obj/effect/countdown/New(atom/A)
+ . = ..()
+ attach(A)
+
+/obj/effect/countdown/proc/attach(atom/A)
+ attached_to = A
+ loc = get_turf(A)
+
+/obj/effect/countdown/proc/start()
+ if(!started)
+ START_PROCESSING(SSfastprocess, src)
+ started = TRUE
+
+/obj/effect/countdown/proc/stop()
+ if(started)
+ overlays.Cut()
+ STOP_PROCESSING(SSfastprocess, src)
+ started = FALSE
+
+/obj/effect/countdown/proc/get_value()
+ // Get the value from our atom
+ return
+
+/obj/effect/countdown/process()
+ if(!attached_to || qdeleted(attached_to))
+ qdel(src)
+ forceMove(get_turf(attached_to))
+ var/new_val = get_value()
+ if(new_val == displayed_text)
+ return
+ displayed_text = new_val
+
+ if(displayed_text)
+ var/image/text_image = new(loc = src)
+ //text_image.maptext = "[new_val]"
+ text_image.maptext = "[displayed_text]"
+ text_image.color = text_color
+
+ overlays.Cut()
+ overlays += text_image
+ else
+ overlays.Cut()
+
+/obj/effect/countdown/Destroy()
+ attached_to = null
+ STOP_PROCESSING(SSfastprocess, src)
+ . = ..()
+
+/obj/effect/countdown/syndicatebomb
+ name = "syndicate bomb countdown"
+
+/obj/effect/countdown/syndicatebomb/get_value()
+ var/obj/machinery/syndicatebomb/S = attached_to
+ if(!istype(S))
+ return
+ else if(S.active)
+ return S.timer
+
+/obj/effect/countdown/nuclearbomb
+ name = "nuclear bomb countdown"
+ text_color = "#81FF14"
+
+/obj/effect/countdown/nuclearbomb/get_value()
+ var/obj/machinery/nuclearbomb/N = attached_to
+ if(!istype(N))
+ return
+ else if(N.timing)
+ return N.timeleft
+
+/obj/effect/countdown/clonepod
+ name = "cloning pod countdown"
+ text_color = "#0C479D"
+ text_size = 1
+
+/obj/effect/countdown/clonepod/get_value()
+ var/obj/machinery/clonepod/C = attached_to
+ if(!istype(C))
+ return
+ else if(C.occupant)
+ var/completion = round(C.get_completion())
+ return completion
+
+/obj/effect/countdown/dominator
+ name = "dominator countdown"
+ text_size = 1
+ text_color = "#ff00ff" // Overwritten when the dominator starts
+
+/obj/effect/countdown/dominator/get_value()
+ var/obj/machinery/dominator/D = attached_to
+ if(!istype(D))
+ return
+ else if(D.gang && D.gang.is_dominating)
+ var/timer = D.gang.domination_time_remaining()
+ return timer
+ else
+ return "OFFLINE"
+
+/obj/effect/countdown/clockworkgate
+ name = "gateway countdown"
+ text_size = 1
+ text_color = "#BE8700"
+ layer = POINT_LAYER
+
+/obj/effect/countdown/clockworkgate/get_value()
+ var/obj/structure/clockwork/massive/celestial_gateway/G = attached_to
+ if(!istype(G))
+ return
+ else if(G.health && !G.purpose_fulfilled)
+ return "[GATEWAY_RATVAR_ARRIVAL - G.progress_in_seconds]
"
+
+/obj/effect/countdown/transformer
+ name = "transformer countdown"
+ text_color = "#4C5866"
+
+/obj/effect/countdown/transformer/get_value()
+ var/obj/machinery/transformer/T = attached_to
+ if(!istype(T))
+ return
+ else if(T.cooldown)
+ var/seconds_left = max(0, (T.cooldown_timer - world.time) / 10)
+ return "[round(seconds_left)]"
diff --git a/code/modules/games/playing_cards.dmi b/code/modules/games/playing_cards.dmi
new file mode 100644
index 0000000000..ac8916a64e
Binary files /dev/null and b/code/modules/games/playing_cards.dmi differ
diff --git a/code/modules/holodeck/areas.dm b/code/modules/holodeck/areas.dm
new file mode 100644
index 0000000000..f7bac9dc9a
--- /dev/null
+++ b/code/modules/holodeck/areas.dm
@@ -0,0 +1,102 @@
+/area/holodeck
+ name = "Holodeck"
+ icon_state = "Holodeck"
+ luminosity = 1
+ dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+
+ var/obj/machinery/computer/holodeck/linked
+ var/restricted = 0 // if true, program goes on emag list
+
+/*
+ Power tracking: Use the holodeck computer's power grid
+ Asserts are to avoid the inevitable infinite loops
+*/
+
+/area/holodeck/powered(var/chan)
+ if(!master.requires_power)
+ return 1
+ if(master.always_unpowered)
+ return 0
+ if(!linked)
+ return 0
+ var/area/A = get_area(linked)
+ ASSERT(!istype(A,/area/holodeck))
+ return A.powered(chan)
+
+/area/holodeck/usage(var/chan)
+ if(!linked)
+ return 0
+ var/area/A = get_area(linked)
+ ASSERT(!istype(A,/area/holodeck))
+ return A.usage(chan)
+
+/area/holodeck/addStaticPower(value, powerchannel)
+ if(!linked)
+ return
+ var/area/A = get_area(linked)
+ ASSERT(!istype(A,/area/holodeck))
+ return A.addStaticPower(value,powerchannel)
+
+/area/holodeck/use_power(var/amount, var/chan)
+ if(!linked)
+ return 0
+ var/area/A = get_area(linked)
+ ASSERT(!istype(A,/area/holodeck))
+ return A.use_power(amount,chan)
+
+
+/*
+ This is the standard holodeck. It is intended to allow you to
+ blow off steam by doing stupid things like laying down, throwing
+ spheres at holes, or bludgeoning people.
+*/
+/area/holodeck/rec_center
+ name = "\improper Recreational Holodeck"
+
+/area/holodeck/rec_center/offline
+ name = "Holodeck - Offline"
+
+/area/holodeck/rec_center/court
+ name = "Holodeck - Empty Court"
+
+/area/holodeck/rec_center/dodgeball
+ name = "Holodeck - Dodgeball Court"
+
+/area/holodeck/rec_center/basketball
+ name = "Holodeck - Basketball Court"
+
+/area/holodeck/rec_center/thunderdome
+ name = "Holodeck - Thunderdome Court"
+
+/area/holodeck/rec_center/beach
+ name = "Holodeck - Beach"
+
+/area/holodeck/rec_center/lounge
+ name = "Holodeck - Lounge"
+
+/area/holodeck/rec_center/medical
+ name = "Holodeck - Emergency Medical"
+
+/area/holodeck/rec_center/pet_lounge
+ name = "Holodeck - Pet Playground"
+
+/area/holodeck/rec_center/winterwonderland
+ name = "Holodeck - Winter Wonderland"
+
+// Bad programs
+
+/area/holodeck/rec_center/burn
+ name = "Holodeck - Atmospheric Burn Test"
+ restricted = 1
+
+/area/holodeck/rec_center/wildlife
+ name = "Holodeck - Wildlife Simulation"
+ restricted = 1
+
+/area/holodeck/rec_center/bunker
+ name = "Holodeck - Holdout Bunker"
+ restricted = 1
+
+/area/holodeck/rec_center/anthophila
+ name = "Holodeck - Anthophila"
+ restricted = 1
diff --git a/code/modules/jobs/whitelist.dm b/code/modules/jobs/whitelist.dm
new file mode 100644
index 0000000000..4b836f27d2
--- /dev/null
+++ b/code/modules/jobs/whitelist.dm
@@ -0,0 +1,15 @@
+#define WHITELISTFILE "data/whitelist.txt"
+
+var/list/whitelist
+
+/proc/load_whitelist()
+ whitelist = file2list(WHITELISTFILE)
+ if(!whitelist.len)
+ whitelist = null
+
+/proc/check_whitelist(mob/M /*, var/rank*/)
+ if(!whitelist)
+ return 0
+ return ("[M.ckey]" in whitelist)
+
+#undef WHITELISTFILE
\ No newline at end of file
diff --git a/code/modules/mining/laborcamp/laborminerals.dm b/code/modules/mining/laborcamp/laborminerals.dm
new file mode 100644
index 0000000000..5299d95375
--- /dev/null
+++ b/code/modules/mining/laborcamp/laborminerals.dm
@@ -0,0 +1,19 @@
+/turf/closed/mineral/random/labormineral
+ mineralSpawnChanceList = list(
+ /turf/closed/mineral/iron = 100, /turf/closed/mineral/uranium = 1, /turf/closed/mineral/diamond = 1,
+ /turf/closed/mineral/gold = 1, /turf/closed/mineral/silver = 1, /turf/closed/mineral/plasma = 1)
+ icon_state = "rock_labor"
+
+/turf/closed/mineral/random/labormineral/New()
+ icon_state = "rock"
+ ..()
+
+/turf/closed/mineral/random/labormineral/volcanic
+ environment_type = "basalt"
+ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ defer_change = 1
+ mineralSpawnChanceList = list(
+ /turf/closed/mineral/iron/volcanic = 100, /turf/closed/mineral/uranium/volcanic = 1, /turf/closed/mineral/diamond/volcanic = 1,
+ /turf/closed/mineral/gold/volcanic = 1, /turf/closed/mineral/silver/volcanic = 1, /turf/closed/mineral/plasma/volcanic = 1)
\ No newline at end of file
diff --git a/code/modules/mining/lavaland/lavaland_areas.dm b/code/modules/mining/lavaland/lavaland_areas.dm
new file mode 100644
index 0000000000..f77a278ef8
--- /dev/null
+++ b/code/modules/mining/lavaland/lavaland_areas.dm
@@ -0,0 +1,32 @@
+/**********************Lavaland Areas**************************/
+
+/area/lavaland
+ icon_state = "mining"
+ has_gravity = 1
+
+/area/lavaland/surface
+ name = "Lavaland"
+ icon_state = "explored"
+ music = null
+ requires_power = 1
+ ambientsounds = list('sound/ambience/ambilava.ogg')
+
+/area/lavaland/underground
+ name = "Lavaland Caves"
+ icon_state = "unexplored"
+ music = null
+ always_unpowered = 1
+ requires_power = 1
+ poweralm = 0
+ power_environ = 0
+ power_equip = 0
+ power_light = 0
+ ambientsounds = list('sound/ambience/ambilava.ogg')
+
+
+/area/lavaland/surface/outdoors
+ name = "Lavaland Wastes"
+ outdoors = 1
+
+/area/lavaland/surface/outdoors/explored
+ name = "Lavaland Labor Camp"
\ No newline at end of file
diff --git a/code/modules/mining/mine_areas.dm b/code/modules/mining/mine_areas.dm
new file mode 100644
index 0000000000..867140b714
--- /dev/null
+++ b/code/modules/mining/mine_areas.dm
@@ -0,0 +1,77 @@
+/**********************Mine areas**************************/
+
+/area/mine
+ icon_state = "mining"
+ has_gravity = 1
+
+/area/mine/explored
+ name = "Mine"
+ icon_state = "explored"
+ music = null
+ always_unpowered = 1
+ requires_power = 1
+ poweralm = 0
+ power_environ = 0
+ power_equip = 0
+ power_light = 0
+ outdoors = 1
+ ambientsounds = list('sound/ambience/ambimine.ogg')
+
+/area/mine/unexplored
+ name = "Mine"
+ icon_state = "unexplored"
+ music = null
+ always_unpowered = 1
+ requires_power = 1
+ poweralm = 0
+ power_environ = 0
+ power_equip = 0
+ power_light = 0
+ outdoors = 1
+ ambientsounds = list('sound/ambience/ambimine.ogg')
+
+/area/mine/lobby
+ name = "Mining station"
+
+/area/mine/storage
+ name = "Mining station Storage"
+
+/area/mine/production
+ name = "Mining Station Starboard Wing"
+ icon_state = "mining_production"
+
+/area/mine/abandoned
+ name = "Abandoned Mining Station"
+
+/area/mine/living_quarters
+ name = "Mining Station Port Wing"
+ icon_state = "mining_living"
+
+/area/mine/eva
+ name = "Mining Station EVA"
+ icon_state = "mining_eva"
+
+/area/mine/maintenance
+ name = "Mining Station Communications"
+
+/area/mine/cafeteria
+ name = "Mining station Cafeteria"
+
+/area/mine/hydroponics
+ name = "Mining station Hydroponics"
+
+/area/mine/sleeper
+ name = "Mining station Emergency Sleeper"
+
+/area/mine/north_outpost
+ name = "North Mining Outpost"
+
+/area/mine/west_outpost
+ name = "West Mining Outpost"
+
+/area/mine/laborcamp
+ name = "Labor Camp"
+
+/area/mine/laborcamp/security
+ name = "Labor Camp Security"
+ icon_state = "security"
\ No newline at end of file
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
new file mode 100644
index 0000000000..ab2e4585e4
--- /dev/null
+++ b/code/modules/mining/mine_turfs.dm
@@ -0,0 +1,807 @@
+/**********************Mineral deposits**************************/
+
+/turf/closed/mineral //wall piece
+ name = "rock"
+ icon = 'icons/turf/mining.dmi'
+ icon_state = "rock"
+ var/smooth_icon = 'icons/turf/smoothrocks.dmi'
+ smooth = SMOOTH_MORE|SMOOTH_BORDER
+ canSmoothWith = list (/turf/closed/mineral, /turf/closed/wall)
+ baseturf = /turf/open/floor/plating/asteroid/airless
+ initial_gas_mix = "TEMP=2.7"
+ opacity = 1
+ density = 1
+ blocks_air = 1
+ layer = EDGED_TURF_LAYER
+ temperature = TCMB
+ var/environment_type = "asteroid"
+ var/turf/open/floor/plating/turf_type = /turf/open/floor/plating/asteroid/airless
+ var/mineralType = null
+ var/mineralAmt = 3
+ var/spread = 0 //will the seam spread?
+ var/spreadChance = 0 //the percentual chance of an ore spreading to the neighbouring tiles
+ var/last_act = 0
+ var/scan_state = null //Holder for the image we display when we're pinged by a mining scanner
+ var/defer_change = 0
+
+/turf/closed/mineral/New()
+ pixel_y = -4
+ pixel_x = -4
+ icon = smooth_icon
+ ..()
+ if (mineralType && mineralAmt && spread && spreadChance)
+ for(var/dir in cardinal)
+ if(prob(spreadChance))
+ var/turf/T = get_step(src, dir)
+ if(istype(T, /turf/closed/mineral/random))
+ Spread(T)
+
+/turf/closed/mineral/volcanic
+ environment_type = "basalt"
+ turf_type = /turf/open/floor/plating/asteroid/basalt
+ baseturf = /turf/open/floor/plating/asteroid/basalt
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+
+/turf/closed/mineral/ex_act(severity, target)
+ ..()
+ switch(severity)
+ if(3)
+ if (prob(75))
+ src.gets_drilled(null, 1)
+ if(2)
+ if (prob(90))
+ src.gets_drilled(null, 1)
+ if(1)
+ src.gets_drilled(null, 1)
+ return
+
+/turf/closed/mineral/Spread(turf/T)
+ new src.type(T)
+
+/turf/closed/mineral/random
+ var/mineralSpawnChanceList = list(
+ /turf/closed/mineral/uranium = 5, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 10,
+ /turf/closed/mineral/silver = 12, /turf/closed/mineral/plasma = 20, /turf/closed/mineral/iron = 40,
+ /turf/closed/mineral/gibtonite = 4, /turf/open/floor/plating/asteroid/airless/cave = 2, /turf/closed/mineral/bscrystal = 1)
+ //Currently, Adamantine won't spawn as it has no uses. -Durandan
+ var/mineralChance = 13
+
+/turf/closed/mineral/random/New()
+ ..()
+
+ if (prob(mineralChance))
+ var/path = pickweight(mineralSpawnChanceList)
+ var/turf/T = new path(src)
+
+ if(T && istype(T, /turf/closed/mineral))
+ var/turf/closed/mineral/M = T
+ M.mineralAmt = rand(1, 5)
+ M.environment_type = src.environment_type
+ M.turf_type = src.turf_type
+ M.baseturf = src.baseturf
+ src = M
+ M.levelupdate()
+
+/turf/closed/mineral/random/high_chance
+ icon_state = "rock_highchance"
+ mineralChance = 25
+ mineralSpawnChanceList = list(
+ /turf/closed/mineral/uranium = 35, /turf/closed/mineral/diamond = 30, /turf/closed/mineral/gold = 45,
+ /turf/closed/mineral/silver = 50, /turf/closed/mineral/plasma = 50, /turf/closed/mineral/bscrystal = 20)
+
+/turf/closed/mineral/random/high_chance/New()
+ icon_state = "rock"
+ ..()
+
+/turf/closed/mineral/random/low_chance
+ icon_state = "rock_lowchance"
+ mineralChance = 6
+ mineralSpawnChanceList = list(
+ /turf/closed/mineral/uranium = 2, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 4,
+ /turf/closed/mineral/silver = 6, /turf/closed/mineral/plasma = 15, /turf/closed/mineral/iron = 40,
+ /turf/closed/mineral/gibtonite = 2, /turf/closed/mineral/bscrystal = 1)
+
+/turf/closed/mineral/random/low_chance/New()
+ icon_state = "rock"
+ ..()
+
+/turf/closed/mineral/iron
+ mineralType = /obj/item/weapon/ore/iron
+ spreadChance = 20
+ spread = 1
+ scan_state = "rock_Iron"
+
+/turf/closed/mineral/uranium
+ mineralType = /obj/item/weapon/ore/uranium
+ spreadChance = 5
+ spread = 1
+ scan_state = "rock_Uranium"
+
+/turf/closed/mineral/diamond
+ mineralType = /obj/item/weapon/ore/diamond
+ spreadChance = 0
+ spread = 1
+ scan_state = "rock_Diamond"
+
+/turf/closed/mineral/gold
+ mineralType = /obj/item/weapon/ore/gold
+ spreadChance = 5
+ spread = 1
+ scan_state = "rock_Gold"
+
+/turf/closed/mineral/silver
+ mineralType = /obj/item/weapon/ore/silver
+ spreadChance = 5
+ spread = 1
+ scan_state = "rock_Silver"
+
+/turf/closed/mineral/plasma
+ mineralType = /obj/item/weapon/ore/plasma
+ spreadChance = 8
+ spread = 1
+ scan_state = "rock_Plasma"
+
+/turf/closed/mineral/clown
+ mineralType = /obj/item/weapon/ore/bananium
+ mineralAmt = 3
+ spreadChance = 0
+ spread = 0
+ scan_state = "rock_Clown"
+
+/turf/closed/mineral/bscrystal
+ mineralType = /obj/item/weapon/ore/bluespace_crystal
+ mineralAmt = 1
+ spreadChance = 0
+ spread = 0
+ scan_state = "rock_BScrystal"
+
+////////////////////////////////Gibtonite
+/turf/closed/mineral/gibtonite
+ mineralAmt = 1
+ spreadChance = 0
+ spread = 0
+ scan_state = "rock_Gibtonite"
+ var/det_time = 8 //Countdown till explosion, but also rewards the player for how close you were to detonation when you defuse it
+ var/stage = 0 //How far into the lifecycle of gibtonite we are, 0 is untouched, 1 is active and attempting to detonate, 2 is benign and ready for extraction
+ var/activated_ckey = null //These are to track who triggered the gibtonite deposit for logging purposes
+ var/activated_name = null
+ var/activated_image = null
+
+/turf/closed/mineral/gibtonite/New()
+ det_time = rand(8,10) //So you don't know exactly when the hot potato will explode
+ ..()
+
+/turf/closed/mineral/gibtonite/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) && stage == 1)
+ user.visible_message("[user] holds [I] to [src]...", "You use [I] to locate where to cut off the chain reaction and attempt to stop it...")
+ defuse()
+ ..()
+
+/turf/closed/mineral/gibtonite/proc/explosive_reaction(mob/user = null, triggered_by_explosion = 0)
+ if(stage == 0)
+ var/image/I = image('icons/turf/smoothrocks.dmi', loc = src, icon_state = "rock_Gibtonite_active", layer = ON_EDGED_TURF_LAYER)
+ add_overlay(I)
+ activated_image = I
+ name = "gibtonite deposit"
+ desc = "An active gibtonite reserve. Run!"
+ stage = 1
+ visible_message("There was gibtonite inside! It's going to explode!")
+ var/turf/bombturf = get_turf(src)
+ var/area/A = get_area(bombturf)
+
+ var/notify_admins = 0
+ if(z != 5)
+ notify_admins = 1
+ if(!triggered_by_explosion)
+ message_admins("[key_name_admin(user)]? (FLW) has triggered a gibtonite deposit reaction at [A.name] (JMP).")
+ else
+ message_admins("An explosion has triggered a gibtonite deposit reaction at [A.name] (JMP).")
+
+ if(!triggered_by_explosion)
+ log_game("[key_name(user)] has triggered a gibtonite deposit reaction at [A.name] ([A.x], [A.y], [A.z]).")
+ else
+ log_game("An explosion has triggered a gibtonite deposit reaction at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])")
+
+ countdown(notify_admins)
+
+/turf/closed/mineral/gibtonite/proc/countdown(notify_admins = 0)
+ set waitfor = 0
+ while(istype(src, /turf/closed/mineral/gibtonite) && stage == 1 && det_time > 0 && mineralAmt >= 1)
+ det_time--
+ sleep(5)
+ if(istype(src, /turf/closed/mineral/gibtonite))
+ if(stage == 1 && det_time <= 0 && mineralAmt >= 1)
+ var/turf/bombturf = get_turf(src)
+ mineralAmt = 0
+ stage = 3
+ explosion(bombturf,1,3,5, adminlog = notify_admins)
+
+/turf/closed/mineral/gibtonite/proc/defuse()
+ if(stage == 1)
+ overlays -= activated_image
+ var/image/I = image('icons/turf/smoothrocks.dmi', loc = src, icon_state = "rock_Gibtonite_inactive", layer = ON_EDGED_TURF_LAYER)
+ add_overlay(I)
+ desc = "An inactive gibtonite reserve. The ore can be extracted."
+ stage = 2
+ if(det_time < 0)
+ det_time = 0
+ visible_message("The chain reaction was stopped! The gibtonite had [src.det_time] reactions left till the explosion!")
+
+/turf/closed/mineral/gibtonite/gets_drilled(mob/user, triggered_by_explosion = 0)
+ if(stage == 0 && mineralAmt >= 1) //Gibtonite deposit is activated
+ playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,1)
+ explosive_reaction(user, triggered_by_explosion)
+ return
+ if(stage == 1 && mineralAmt >= 1) //Gibtonite deposit goes kaboom
+ var/turf/bombturf = get_turf(src)
+ mineralAmt = 0
+ stage = 3
+ explosion(bombturf,1,2,5, adminlog = 0)
+ if(stage == 2) //Gibtonite deposit is now benign and extractable. Depending on how close you were to it blowing up before defusing, you get better quality ore.
+ var/obj/item/weapon/twohanded/required/gibtonite/G = new /obj/item/weapon/twohanded/required/gibtonite/(src)
+ if(det_time <= 0)
+ G.quality = 3
+ G.icon_state = "Gibtonite ore 3"
+ if(det_time >= 1 && det_time <= 2)
+ G.quality = 2
+ G.icon_state = "Gibtonite ore 2"
+
+ ChangeTurf(turf_type, defer_change)
+ spawn(10)
+ AfterChange()
+
+/turf/closed/mineral/gibtonite/volcanic
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+
+////////////////////////////////End Gibtonite
+
+/turf/open/floor/plating/asteroid/airless/cave
+ var/length = 100
+ var/mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3)
+ var/sanity = 1
+ turf_type = /turf/open/floor/plating/asteroid/airless
+
+/turf/open/floor/plating/asteroid/airless/cave/volcanic
+ mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 10, /mob/living/simple_animal/hostile/asteroid/goliath/beast = 50, /mob/living/simple_animal/hostile/asteroid/basilisk/watcher = 40, /mob/living/simple_animal/hostile/asteroid/hivelord/legion = 30,
+ /mob/living/simple_animal/hostile/spawner/lavaland = 2, /mob/living/simple_animal/hostile/spawner/lavaland/goliath = 3, /mob/living/simple_animal/hostile/spawner/lavaland/legion = 3, \
+ /mob/living/simple_animal/hostile/megafauna/dragon = 2, /mob/living/simple_animal/hostile/megafauna/bubblegum = 2, /mob/living/simple_animal/hostile/megafauna/colossus = 2)
+
+ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+
+/turf/open/floor/plating/asteroid/airless/cave/New(loc, length, go_backwards = 1, exclude_dir = -1)
+ // If length (arg2) isn't defined, get a random length; otherwise assign our length to the length arg.
+ if(!length)
+ src.length = rand(25, 50)
+ else
+ src.length = length
+
+ // Get our directiosn
+ var/forward_cave_dir = pick(alldirs - exclude_dir)
+ // Get the opposite direction of our facing direction
+ var/backward_cave_dir = angle2dir(dir2angle(forward_cave_dir) + 180)
+
+ // Make our tunnels
+ make_tunnel(forward_cave_dir)
+ if(go_backwards)
+ make_tunnel(backward_cave_dir)
+ // Kill ourselves by replacing ourselves with a normal floor.
+ SpawnFloor(src)
+ ..()
+
+/turf/open/floor/plating/asteroid/airless/cave/proc/make_tunnel(dir)
+
+ var/turf/closed/mineral/tunnel = src
+ var/next_angle = pick(45, -45)
+
+ for(var/i = 0; i < length; i++)
+ if(!sanity)
+ break
+
+ var/list/L = list(45)
+ if(IsOdd(dir2angle(dir))) // We're going at an angle and we want thick angled tunnels.
+ L += -45
+
+ // Expand the edges of our tunnel
+ for(var/edge_angle in L)
+ var/turf/closed/mineral/edge = get_step(tunnel, angle2dir(dir2angle(dir) + edge_angle))
+ if(istype(edge))
+ SpawnFloor(edge)
+
+ // Move our tunnel forward
+ tunnel = get_step(tunnel, dir)
+
+ if(istype(tunnel))
+ // Small chance to have forks in our tunnel; otherwise dig our tunnel.
+ if(i > 3 && prob(20))
+ new src.type(tunnel, rand(10, 15), 0, dir)
+ else
+ SpawnFloor(tunnel)
+ else //if(!istype(tunnel, src.parent)) // We hit space/normal/wall, stop our tunnel.
+ break
+
+ // Chance to change our direction left or right.
+ if(i > 2 && prob(33))
+ // We can't go a full loop though
+ next_angle = -next_angle
+ setDir(angle2dir(dir2angle(dir) )+ next_angle)
+
+
+/turf/open/floor/plating/asteroid/airless/cave/proc/SpawnFloor(turf/T)
+ for(var/turf/S in range(2,T))
+ if(istype(S, /turf/open/space) || istype(S.loc, /area/mine/explored))
+ sanity = 0
+ break
+ if(!sanity)
+ return
+
+ SpawnMonster(T)
+ new turf_type(T)
+/turf/open/floor/plating/asteroid/airless/cave/proc/SpawnMonster(turf/T)
+ if(prob(30))
+ if(istype(loc, /area/mine/explored))
+ return
+ for(var/atom/A in urange(12,T))//Lowers chance of mob clumps
+ if(istype(A, /mob/living/simple_animal/hostile/asteroid))
+ return
+ var/randumb = pickweight(mob_spawn_list)
+ new randumb(T)
+ return
+
+/turf/closed/mineral/attackby(obj/item/weapon/pickaxe/P, mob/user, params)
+
+ if (!user.IsAdvancedToolUser())
+ usr << "You don't have the dexterity to do this!"
+ return
+
+ if (istype(P, /obj/item/weapon/pickaxe))
+ var/turf/T = user.loc
+ if (!( istype(T, /turf) ))
+ return
+
+ if(last_act+P.digspeed > world.time)//prevents message spam
+ return
+ last_act = world.time
+ user << "You start picking..."
+ P.playDigSound()
+
+ if(do_after(user,P.digspeed, target = src))
+ if(istype(src, /turf/closed/mineral))
+ user << "You finish cutting into the rock."
+ gets_drilled(user)
+ feedback_add_details("pick_used_mining","[P.type]")
+ else
+ return attack_hand(user)
+ return
+
+/turf/closed/mineral/proc/gets_drilled()
+ if (mineralType && (src.mineralAmt > 0) && (src.mineralAmt < 11))
+ var/i
+ for (i=0;i= 2)
+ gets_drilled()
+ ..()
+
+/turf/closed/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/closed/mineral/Bumped(AM as mob|obj)
+ ..()
+ if(istype(AM,/mob/living/carbon/human))
+ var/mob/living/carbon/human/H = AM
+ if((istype(H.l_hand,/obj/item/weapon/pickaxe)) && (!H.hand))
+ src.attackby(H.l_hand,H)
+ else if((istype(H.r_hand,/obj/item/weapon/pickaxe)) && H.hand)
+ src.attackby(H.r_hand,H)
+ return
+ else if(istype(AM,/mob/living/silicon/robot))
+ var/mob/living/silicon/robot/R = AM
+ if(istype(R.module_active,/obj/item/weapon/pickaxe))
+ src.attackby(R.module_active,R)
+ return
+/* else if(istype(AM,/obj/mecha))
+ var/obj/mecha/M = AM
+ if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/drill))
+ src.attackby(M.selected,M)
+ return*/
+//Aparantly mechs are just TOO COOL to call Bump(), so fuck em (for now)
+ else
+ return
+
+/**********************Asteroid**************************/
+
+/turf/open/floor/plating/asteroid //floor piece
+ name = "asteroid sand"
+ baseturf = /turf/open/floor/plating/asteroid
+ icon = 'icons/turf/floors.dmi'
+ icon_state = "asteroid"
+ icon_plating = "asteroid"
+ var/environment_type = "asteroid"
+ var/turf_type = /turf/open/floor/plating/asteroid //Because caves do whacky shit to revert to normal
+ var/dug = 0 //0 = has not yet been dug, 1 = has already been dug
+ var/sand_type = /obj/item/weapon/ore/glass
+
+/turf/open/floor/plating/asteroid/airless
+ initial_gas_mix = "TEMP=2.7"
+ turf_type = /turf/open/floor/plating/asteroid/airless
+
+/turf/open/floor/plating/asteroid/basalt
+ name = "volcanic floor"
+ baseturf = /turf/open/floor/plating/asteroid/basalt
+ icon = 'icons/turf/floors.dmi'
+ icon_state = "basalt"
+ icon_plating = "basalt"
+ environment_type = "basalt"
+ sand_type = /obj/item/weapon/ore/glass/basalt
+
+/turf/open/floor/plating/asteroid/basalt/lava //lava underneath
+ baseturf = /turf/open/floor/plating/lava/smooth
+
+/turf/open/floor/plating/asteroid/basalt/airless
+ initial_gas_mix = "TEMP=2.7"
+
+/turf/open/floor/plating/asteroid/snow
+ name = "snow"
+ desc = "Looks cold."
+ icon = 'icons/turf/snow.dmi'
+ baseturf = /turf/open/floor/plating/asteroid/snow
+ icon_state = "snow"
+ icon_plating = "snow"
+ initial_gas_mix = "TEMP=180"
+ slowdown = 2
+ environment_type = "snow"
+ sand_type = /obj/item/stack/sheet/mineral/snow
+
+/turf/open/floor/plating/asteroid/snow/airless
+ initial_gas_mix = "TEMP=2.7"
+
+/turf/open/floor/plating/asteroid/snow/temperatre
+ initial_gas_mix = "TEMP=255.37"
+
+/turf/open/floor/plating/asteroid/New()
+ var/proper_name = name
+ ..()
+ name = proper_name
+ if(prob(20))
+ icon_state = "[environment_type][rand(0,12)]"
+
+/turf/open/floor/plating/asteroid/burn_tile()
+ return
+
+/turf/open/floor/plating/asteroid/ex_act(severity, target)
+ contents_explosion(severity, target)
+ switch(severity)
+ if(3)
+ return
+ if(2)
+ if (prob(20))
+ src.gets_dug()
+ if(1)
+ src.gets_dug()
+ return
+
+/turf/open/floor/plating/asteroid/attackby(obj/item/weapon/W, mob/user, params)
+ //note that this proc does not call ..()
+ if(!W || !user)
+ return 0
+ var/digging_speed = 0
+ if (istype(W, /obj/item/weapon/shovel))
+ var/obj/item/weapon/shovel/S = W
+ digging_speed = S.digspeed
+ else if (istype(W, /obj/item/weapon/pickaxe))
+ var/obj/item/weapon/pickaxe/P = W
+ digging_speed = P.digspeed
+ if (digging_speed)
+ var/turf/T = user.loc
+ if (!( istype(T, /turf) ))
+ return
+
+ if (dug)
+ user << "This area has already been dug!"
+ return
+
+ user << "You start digging..."
+ playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
+
+ if(do_after(user, digging_speed, target = src))
+ if(istype(src, /turf/open/floor/plating/asteroid))
+ user << "You dig a hole."
+ gets_dug()
+ feedback_add_details("pick_used_mining","[W.type]")
+
+ if(istype(W,/obj/item/weapon/storage/bag/ore))
+ var/obj/item/weapon/storage/bag/ore/S = W
+ if(S.collection_mode == 1)
+ for(var/obj/item/weapon/ore/O in src.contents)
+ O.attackby(W,user)
+ return
+
+ if(istype(W, /obj/item/stack/tile))
+ var/obj/item/stack/tile/Z = W
+ if(!Z.use(1))
+ return
+ var/turf/open/floor/T = ChangeTurf(Z.turf_type)
+ if(istype(Z,/obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow
+ var/obj/item/stack/tile/light/L = Z
+ var/turf/open/floor/light/F = T
+ F.state = L.state
+ playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
+
+/turf/open/floor/plating/asteroid/proc/gets_dug()
+ if(dug)
+ return
+ for(var/i in 1 to 5)
+ new sand_type(src)
+ dug = 1
+ icon_plating = "[environment_type]_dug"
+ icon_state = "[environment_type]_dug"
+ slowdown = 0
+ return
+
+/turf/open/floor/plating/asteroid/singularity_act()
+ return
+
+/turf/open/floor/plating/asteroid/singularity_pull(S, current_size)
+ return
+
+//////////////CHASM//////////////////
+
+/turf/open/chasm
+ name = "chasm"
+ desc = "Watch your step."
+ baseturf = /turf/open/chasm
+ smooth = SMOOTH_TRUE | SMOOTH_BORDER
+ icon = 'icons/turf/floors/Chasms.dmi'
+ icon_state = "smooth"
+ var/drop_x = 1
+ var/drop_y = 1
+ var/drop_z = 1
+
+
+/turf/open/chasm/Entered(atom/movable/AM)
+ if(istype(AM, /obj/singularity) || istype(AM, /obj/item/projectile))
+ return
+ if(istype(AM, /obj/effect/portal))
+ // Portals aren't affected by gravity. Probably.
+ return
+ // Flies right over the chasm
+ if(istype(AM, /mob/living/simple_animal))
+ // apparently only simple_animals can fly??
+ var/mob/living/simple_animal/SA = AM
+ if(SA.flying)
+ return
+ if(istype(AM, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = AM
+ if(istype(H.belt, /obj/item/device/wormhole_jaunter))
+ var/obj/item/device/wormhole_jaunter/J = H.belt
+ // To freak out any bystanders
+ visible_message("[H] falls into [src]!")
+ J.chasm_react(H)
+ return
+ if(H.dna.species && (FLYING in H.dna.species.specflags))
+ return
+ drop(AM)
+
+
+/turf/open/chasm/proc/drop(atom/movable/AM)
+ /*visible_message("[AM] falls into [src]!")
+ qdel(AM)*/
+ AM.forceMove(locate(drop_x, drop_y, drop_z))
+ AM.visible_message("[AM] falls from above!", "GAH! Ah... where are you?")
+ if(istype(AM, /mob/living))
+ var/mob/living/L = AM
+ L.Weaken(5)
+ L.adjustBruteLoss(30)
+
+/turf/open/chasm/straight_down/New()
+ ..()
+ drop_x = x
+ drop_y = y
+ if(z+1 <= world.maxz)
+ drop_z = z+1
+
+/**********************Lavaland Turfs**************************/
+
+///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground.
+
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ planetary_atmos = TRUE
+ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
+
+/turf/open/chasm/straight_down/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ planetary_atmos = TRUE
+ baseturf = /turf/open/chasm/straight_down/lava_land_surface
+
+/turf/open/chasm/straight_down/lava_land_surface/drop(atom/movable/AM)
+ if(!AM.invisibility)
+ AM.visible_message("[AM] falls into [src]!", "You stumble and stare into an abyss before you. It stares back, and you fall \
+ into the enveloping dark.")
+ if(isliving(AM))
+ var/mob/living/L = AM
+ L.notransform = TRUE
+ L.Stun(10)
+ L.resting = TRUE
+ animate(AM, transform = matrix() - matrix(), alpha = 0, color = rgb(0, 0, 0), time = 10)
+ for(var/i in 1 to 5)
+ AM.pixel_y--
+ sleep(2)
+ if(isrobot(AM))
+ var/mob/living/silicon/robot/S = AM
+ qdel(S.mmi)
+ qdel(AM)
+
+/turf/closed/mineral/volcanic/lava_land_surface
+ environment_type = "basalt"
+ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
+ defer_change = 1
+
+/turf/closed/mineral/random/volcanic
+ environment_type = "basalt"
+ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ defer_change = 1
+
+ mineralChance = 10
+ mineralSpawnChanceList = list(
+ /turf/closed/mineral/uranium/volcanic = 5, /turf/closed/mineral/diamond/volcanic = 1, /turf/closed/mineral/gold/volcanic = 10,
+ /turf/closed/mineral/silver/volcanic = 12, /turf/closed/mineral/plasma/volcanic = 20, /turf/closed/mineral/iron/volcanic = 40,
+ /turf/closed/mineral/gibtonite/volcanic = 4, /turf/open/floor/plating/asteroid/airless/cave/volcanic = 1, /turf/closed/mineral/bscrystal/volcanic = 1)
+
+/turf/closed/mineral/random/high_chance/volcanic
+ environment_type = "basalt"
+ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ defer_change = 1
+ mineralSpawnChanceList = list(
+ /turf/closed/mineral/uranium/volcanic = 35, /turf/closed/mineral/diamond/volcanic = 30, /turf/closed/mineral/gold/volcanic = 45,
+ /turf/closed/mineral/silver/volcanic = 50, /turf/closed/mineral/plasma/volcanic = 50, /turf/closed/mineral/bscrystal/volcanic = 20)
+
+/turf/open/floor/plating/lava/smooth/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ planetary_atmos = TRUE
+ baseturf = /turf/open/chasm/straight_down/lava_land_surface
+
+/turf/closed/mineral/gibtonite/volcanic
+ environment_type = "basalt"
+ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ defer_change = 1
+
+/turf/closed/mineral/uranium/volcanic
+ environment_type = "basalt"
+ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ defer_change = 1
+
+/turf/closed/mineral/diamond/volcanic
+ environment_type = "basalt"
+ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ defer_change = 1
+
+/turf/closed/mineral/gold/volcanic
+ environment_type = "basalt"
+ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ defer_change = 1
+
+/turf/closed/mineral/silver/volcanic
+ environment_type = "basalt"
+ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ defer_change = 1
+
+/turf/closed/mineral/plasma/volcanic
+ environment_type = "basalt"
+ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ defer_change = 1
+
+/turf/closed/mineral/iron/volcanic
+ environment_type = "basalt"
+ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ defer_change = 1
+
+/turf/closed/mineral/bscrystal/volcanic
+ environment_type = "basalt"
+ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ defer_change = 1
+
+
+//BECAUSE ONE PLANET WASNT ENOUGH
+
+/turf/closed/mineral/ash_rock //wall piece
+ name = "rock"
+ icon = 'icons/turf/mining.dmi'
+ smooth_icon = 'icons/turf/walls/rock_wall.dmi'
+ icon_state = "rock"
+ smooth = SMOOTH_MORE|SMOOTH_BORDER
+ canSmoothWith = list (/turf/closed/mineral, /turf/closed/wall)
+ baseturf = /turf/open/floor/plating/ash
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ environment_type = "waste"
+ turf_type = /turf/open/floor/plating/ash
+ defer_change = 1
+
+/turf/open/floor/plating/ash
+ icon = 'icons/turf/mining.dmi'
+ name = "ash"
+ icon_state = "ash"
+ smooth = SMOOTH_MORE|SMOOTH_BORDER
+ canSmoothWith = list (/turf/open/floor/plating/ash, /turf/closed)
+ var/smooth_icon = 'icons/turf/floors/ash.dmi'
+ desc = "The ground is covered in volcanic ash."
+ baseturf = /turf/open/floor/plating/ash //I assume this will be a chasm eventually, once this becomes an actual surface
+ slowdown = 1
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ planetary_atmos = TRUE
+
+/turf/open/floor/plating/ash/New()
+ pixel_y = -4
+ pixel_x = -4
+ icon = smooth_icon
+ ..()
+
+/turf/open/floor/plating/ash/break_tile()
+ return
+
+/turf/open/floor/plating/ash/burn_tile()
+ return
+
+/turf/open/floor/plating/ash/rocky
+ name = "rocky ground"
+ icon_state = "rockyash"
+ icon = 'icons/turf/mining.dmi'
+ smooth_icon = 'icons/turf/floors/rocky_ash.dmi'
+ slowdown = 0
+ smooth = SMOOTH_MORE|SMOOTH_BORDER
+ canSmoothWith = list (/turf/open/floor/plating/ash/rocky, /turf/closed)
+
+//Necropolis
+
+/turf/closed/indestructible/necropolis
+ name = "necropolis wall"
+ desc = "A seemingly impenetrable wall."
+ icon = 'icons/turf/walls.dmi'
+ explosion_block = 50
+ baseturf = /turf/closed/indestructible/necropolis
+
+/turf/open/indestructible/necropolis
+ name = "necropolis floor"
+ desc = "It's regarding you suspiciously."
+ icon = 'icons/turf/floors.dmi'
+ icon_state = "floor"
+ baseturf = /turf/open/indestructible/necropolis
+
+/turf/open/indestructible/necropolis/New()
+ ..()
+ if(prob(12))
+ icon_state = "necropolis[rand(1,2)]"
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
new file mode 100644
index 0000000000..d56e7a1681
--- /dev/null
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -0,0 +1,198 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
+/obj/item/device/mmi
+ name = "Man-Machine Interface"
+ desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity, that nevertheless has become standard-issue on Nanotrasen stations."
+ icon = 'icons/obj/assemblies.dmi'
+ icon_state = "mmi_empty"
+ w_class = 3
+ origin_tech = "biotech=2;programming=3;engineering=2"
+ var/braintype = "Cyborg"
+ var/obj/item/device/radio/radio = null //Let's give it a radio.
+ var/hacked = 0 //Whether or not this is a Syndicate MMI
+ var/mob/living/carbon/brain/brainmob = null //The current occupant.
+ var/mob/living/silicon/robot = null //Appears unused.
+ var/obj/mecha = null //This does not appear to be used outside of reference in mecha.dm.
+ var/obj/item/organ/brain/brain = null //The actual brain
+ var/clockwork = FALSE //If this is a soul vessel
+
+/obj/item/device/mmi/update_icon()
+ if(brain)
+ if(istype(brain,/obj/item/organ/brain/alien))
+ if(brainmob && brainmob.stat == DEAD)
+ icon_state = "mmi_alien_dead"
+ else
+ icon_state = "mmi_alien"
+ braintype = "Xenoborg" //HISS....Beep.
+ else
+ if(brainmob && brainmob.stat == DEAD)
+ icon_state = "mmi_dead"
+ else
+ icon_state = "mmi_full"
+ braintype = "Cyborg"
+ else
+ icon_state = "mmi_empty"
+
+/obj/item/device/mmi/New()
+ ..()
+ radio = new(src) //Spawns a radio inside the MMI.
+ radio.broadcasting = 0 //researching radio mmis turned the robofabs into radios because this didnt start as 0.
+
+
+
+/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
+ var/obj/item/organ/brain/newbrain = O
+ if(brain)
+ user << "There's already a brain in the MMI!"
+ return
+ if(!newbrain.brainmob)
+ user << "You aren't sure where this brain came from, but you're pretty sure it's a useless brain!"
+ return
+
+ if(!user.unEquip(O))
+ return
+ var/mob/living/carbon/brain/B = newbrain.brainmob
+ if(!B.key)
+ B.notify_ghost_cloning("Someone has put your brain in a MMI!", source = src)
+ visible_message("[user] sticks \a [newbrain] into \the [src].")
+
+ brainmob = newbrain.brainmob
+ newbrain.brainmob = null
+ brainmob.loc = src
+ brainmob.container = src
+ if(!newbrain.damaged_brain) // the brain organ hasn't been beaten to death.
+ brainmob.stat = CONSCIOUS //we manually revive the brain mob
+ dead_mob_list -= brainmob
+ living_mob_list += brainmob
+
+ brainmob.reset_perspective()
+ if(clockwork)
+ add_servant_of_ratvar(brainmob, TRUE)
+ newbrain.loc = src //P-put your brain in it
+ brain = newbrain
+
+ name = "Man-Machine Interface: [brainmob.real_name]"
+ update_icon()
+
+ feedback_inc("cyborg_mmis_filled",1)
+
+ return
+
+ else if(brainmob)
+ O.attack(brainmob, user) //Oh noooeeeee
+ return
+ ..()
+
+/obj/item/device/mmi/attack_self(mob/user)
+ if(!brain)
+ radio.on = !radio.on
+ user << "You toggle the MMI's radio system [radio.on==1 ? "on" : "off"]."
+ else
+ user << "You unlock and upend the MMI, spilling the brain onto the floor."
+
+ brainmob.container = null //Reset brainmob mmi var.
+ brainmob.loc = brain //Throw mob into brain.
+ brainmob.stat = DEAD
+ brainmob.emp_damage = 0
+ brainmob.reset_perspective() //so the brainmob follows the brain organ instead of the mmi. And to update our vision
+ living_mob_list -= brainmob //Get outta here
+ dead_mob_list += brainmob
+ brain.brainmob = brainmob //Set the brain to use the brainmob
+ brainmob = null //Set mmi brainmob var to null
+
+ user.put_in_hands(brain) //puts brain in the user's hand or otherwise drops it on the user's turf
+ brain = null //No more brain in here
+
+ update_icon()
+ name = "Man-Machine Interface"
+
+/obj/item/device/mmi/proc/transfer_identity(mob/living/L) //Same deal as the regular brain proc. Used for human-->robot people.
+ if(!brainmob)
+ brainmob = new(src)
+ brainmob.name = L.real_name
+ brainmob.real_name = L.real_name
+ if(L.has_dna())
+ var/mob/living/carbon/C = L
+ if(!brainmob.dna)
+ brainmob.dna = new /datum/dna(brainmob)
+ C.dna.copy_dna(brainmob.dna)
+ brainmob.container = src
+
+ if(ishuman(L))
+ var/mob/living/carbon/human/H = L
+ var/obj/item/organ/brain/newbrain = H.getorgan(/obj/item/organ/brain)
+ newbrain.loc = src
+ brain = newbrain
+ else if(!brain)
+ brain = new(src)
+ brain.name = "[L.real_name]'s brain"
+
+ name = "Man-Machine Interface: [brainmob.real_name]"
+ update_icon()
+ return
+
+
+/obj/item/device/mmi/verb/Toggle_Listening()
+ set name = "Toggle Listening"
+ set desc = "Toggle listening channel on or off."
+ set category = "MMI"
+ set src = usr.loc
+ set popup_menu = 0
+
+ if(brainmob.stat)
+ brainmob << "Can't do that while incapacitated or dead!"
+ if(!radio.on)
+ brainmob << "Your radio is disabled!"
+ return
+
+ radio.listening = radio.listening==1 ? 0 : 1
+ brainmob << "Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast."
+
+/obj/item/device/mmi/emp_act(severity)
+ if(!brainmob)
+ return
+ else
+ switch(severity)
+ if(1)
+ brainmob.emp_damage = min(brainmob.emp_damage + rand(20,30), 30)
+ if(2)
+ brainmob.emp_damage = min(brainmob.emp_damage + rand(10,20), 30)
+ if(3)
+ brainmob.emp_damage = min(brainmob.emp_damage + rand(0,10), 30)
+ brainmob.emote("alarm")
+ ..()
+
+/obj/item/device/mmi/Destroy()
+ if(isrobot(loc))
+ var/mob/living/silicon/robot/borg = loc
+ borg.mmi = null
+ if(brainmob)
+ qdel(brainmob)
+ brainmob = null
+ return ..()
+
+/obj/item/device/mmi/examine(mob/user)
+ ..()
+ if(brainmob)
+ var/mob/living/carbon/brain/B = brainmob
+ if(!B.key || !B.mind || B.stat == DEAD)
+ user << "The MMI indicates the brain is completely unresponsive."
+
+ else if(!B.client)
+ user << "The MMI indicates the brain is currently inactive; it might change."
+
+ else
+ user << "The MMI indicates the brain is active."
+
+
+/obj/item/device/mmi/syndie
+ name = "Syndicate Man-Machine Interface"
+ desc = "Syndicate's own brand of MMI. It enforces laws designed to help Syndicate agents achieve their goals upon cyborgs created with it, but doesn't fit in Nanotrasen AI cores."
+ origin_tech = "biotech=4;programming=4;syndicate=2"
+ hacked = 1
+
+/obj/item/device/mmi/syndie/New()
+ ..()
+ radio.on = 0
diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
new file mode 100644
index 0000000000..d25626cd9b
--- /dev/null
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -0,0 +1,63 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
+/mob/living/carbon/brain
+ languages_spoken = HUMAN
+ languages_understood = HUMAN
+ var/obj/item/device/mmi/container = null
+ var/timeofhostdeath = 0
+ var/emp_damage = 0//Handles a type of MMI damage
+ has_limbs = 0
+ stat = DEAD //we start dead by default
+ see_invisible = SEE_INVISIBLE_MINIMUM
+
+/mob/living/carbon/brain/New(loc)
+ ..()
+ if(isturf(loc)) //not spawned in an MMI or brain organ (most likely adminspawned)
+ var/obj/item/organ/brain/OB = new(loc) //we create a new brain organ for it.
+ src.loc = OB
+ OB.brainmob = src
+
+
+/mob/living/carbon/brain/Destroy()
+ if(key) //If there is a mob connected to this thing. Have to check key twice to avoid false death reporting.
+ if(stat!=DEAD) //If not dead.
+ death(1) //Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA
+ ghostize() //Ghostize checks for key so nothing else is necessary.
+ container = null
+ return ..()
+
+/mob/living/carbon/brain/update_canmove()
+ if(in_contents_of(/obj/mecha))
+ canmove = 1
+ else
+ canmove = 0
+ return canmove
+
+/mob/living/carbon/brain/toggle_throw_mode()
+ return
+
+/mob/living/carbon/brain/ex_act() //you cant blow up brainmobs because it makes transfer_to() freak out when borgs blow up.
+ return
+
+/mob/living/carbon/brain/blob_act(obj/effect/blob/B)
+ return
+
+/mob/living/carbon/brain/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default
+ return
+
+/mob/living/carbon/brain/check_ear_prot()
+ return 1
+
+/mob/living/carbon/brain/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0)
+ return // no eyes, no flashing
+
+/mob/living/carbon/brain/update_damage_hud()
+ return //no red circles for brain
+
+/mob/living/carbon/brain/can_be_revived()
+ . = 1
+ if(!container || health <= config.health_threshold_dead)
+ return 0
+
+/mob/living/carbon/brain/update_sight()
+ return
diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
new file mode 100644
index 0000000000..4eb1fb0d3f
--- /dev/null
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -0,0 +1,127 @@
+/obj/item/organ/brain
+ name = "brain"
+ desc = "A piece of juicy meat found in a person's head."
+ icon_state = "brain"
+ throw_speed = 3
+ throw_range = 5
+ layer = ABOVE_MOB_LAYER
+ zone = "head"
+ slot = "brain"
+ vital = 1
+ origin_tech = "biotech=5"
+ attack_verb = list("attacked", "slapped", "whacked")
+ var/mob/living/carbon/brain/brainmob = null
+ var/damaged_brain = 0 //whether the brain organ is damaged.
+
+/obj/item/organ/brain/Insert(mob/living/carbon/M, special = 0)
+ ..()
+ name = "brain"
+ if(brainmob)
+ if(M.key)
+ M.ghostize()
+
+ if(brainmob.mind)
+ brainmob.mind.transfer_to(M)
+ else
+ M.key = brainmob.key
+
+ qdel(brainmob)
+
+ //Update the body's icon so it doesnt appear debrained anymore
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.update_hair(0)
+
+/obj/item/organ/brain/Remove(mob/living/carbon/M, special = 0)
+ ..()
+ if(!special)
+ transfer_identity(M)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.update_hair(0)
+
+/obj/item/organ/brain/prepare_eat()
+ return // Too important to eat.
+
+/obj/item/organ/brain/proc/transfer_identity(mob/living/L)
+ name = "[L.name]'s brain"
+ brainmob = new(src)
+ brainmob.name = L.real_name
+ brainmob.real_name = L.real_name
+ brainmob.timeofhostdeath = L.timeofdeath
+ if(L.has_dna())
+ var/mob/living/carbon/C = L
+ if(!brainmob.dna)
+ brainmob.dna = new /datum/dna(brainmob)
+ C.dna.copy_dna(brainmob.dna)
+ if(L.mind && L.mind.current && (L.mind.current.stat == DEAD))
+ L.mind.transfer_to(brainmob)
+ brainmob << "You feel slightly disoriented. That's normal when you're just a brain."
+
+/obj/item/organ/brain/attackby(obj/item/O, mob/user, params)
+ user.changeNext_move(CLICK_CD_MELEE)
+ if(brainmob)
+ O.attack(brainmob, user) //Oh noooeeeee
+
+/obj/item/organ/brain/examine(mob/user)
+ ..()
+
+ if(brainmob)
+ if(brainmob.client)
+ if(brainmob.health <= config.health_threshold_dead)
+ user << "It's lifeless and severely damaged."
+ else
+ user << "You can feel the small spark of life still left in this one."
+ else
+ user << "This one seems particularly lifeless. Perhaps it will regain some of its luster later."
+ else
+ user << "This one is completely devoid of life."
+
+/obj/item/organ/brain/attack(mob/living/carbon/M, mob/user)
+ if(!istype(M))
+ return ..()
+
+ add_fingerprint(user)
+
+ if(user.zone_selected != "head")
+ return ..()
+
+ var/mob/living/carbon/human/H = M
+ if(istype(H) && ((H.head && H.head.flags_cover & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags_cover & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
+ user << "You're going to need to remove their head cover first!"
+ return
+
+//since these people will be dead M != usr
+
+ if(!M.getorgan(/obj/item/organ/brain))
+ if(istype(H) && !H.get_bodypart("head"))
+ return
+ user.drop_item()
+ var/msg = "[M] has [src] inserted into \his head by [user]."
+ if(M == user)
+ msg = "[user] inserts [src] into \his head!"
+
+ M.visible_message("[msg]",
+ "[msg]")
+
+ if(M != user)
+ M << "[user] inserts [src] into your head."
+ user << "You insert [src] into [M]'s head."
+ else
+ user << "You insert [src] into your head." //LOL
+
+ Insert(M)
+ else
+ ..()
+
+/obj/item/organ/brain/Destroy() //copypasted from MMIs.
+ if(brainmob)
+ qdel(brainmob)
+ brainmob = null
+ return ..()
+
+/obj/item/organ/brain/alien
+ name = "alien brain"
+ desc = "We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?"
+ icon_state = "brain-x"
+ origin_tech = "biotech=6"
diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm
new file mode 100644
index 0000000000..cb55d04145
--- /dev/null
+++ b/code/modules/mob/living/carbon/brain/death.dm
@@ -0,0 +1,20 @@
+/mob/living/carbon/brain/death(gibbed)
+ if(stat == DEAD)
+ return
+ stat = DEAD
+
+ if(!gibbed && container)//If not gibbed but in a container.
+ var/obj/item/device/mmi = container
+ mmi.visible_message("[src]'s MMI flatlines!", \
+ "You hear something flatline.")
+ mmi.update_icon()
+
+ return ..()
+
+/mob/living/carbon/brain/gib()
+ if(container)
+ qdel(container)//Gets rid of the MMI if there is one
+ if(loc)
+ if(istype(loc,/obj/item/organ/brain))
+ qdel(loc)//Gets rid of the brain item
+ ..()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm
new file mode 100644
index 0000000000..67e6c36cc3
--- /dev/null
+++ b/code/modules/mob/living/carbon/brain/emote.dm
@@ -0,0 +1,71 @@
+/mob/living/carbon/brain/emote(act,m_type=1,message = null)
+ if(!(container && istype(container, /obj/item/device/mmi)))//No MMI, no emotes
+ return
+
+ if (findtext(act, "-", 1, null))
+ var/t1 = findtext(act, "-", 1, null)
+ act = copytext(act, 1, t1)
+
+
+ if(src.stat == DEAD)
+ return
+ switch(act)
+ if ("alarm")
+ src << "You sound an alarm."
+ message = "[src] sounds an alarm."
+ m_type = 2
+
+ if ("alert")
+ src << "You let out a distressed noise."
+ message = "[src] lets out a distressed noise."
+ m_type = 2
+
+ if ("beep","beeps")
+ src << "You beep."
+ message = "[src] beeps."
+ m_type = 2
+
+ if ("blink","blinks")
+ message = "[src] blinks."
+ m_type = 1
+
+ if ("boop","boops")
+ src << "You boop."
+ message = "[src] boops."
+ m_type = 2
+
+ if ("flash")
+ message = "The lights on [src] flash quickly."
+ m_type = 1
+
+ if ("notice")
+ src << "You play a loud tone."
+ message = "[src] plays a loud tone."
+ m_type = 2
+
+ if ("whistle","whistles")
+ src << "You whistle."
+ message = "[src] whistles."
+ m_type = 2
+
+ if ("help")
+ src << "Help for MMI emotes. You can use these emotes with say \"*emote\":\nalarm, alert, beep, blink, boop, flash, notice, whistle"
+
+ else
+ src << "Unusable emote '[act]'. Say *help for a list."
+ return
+
+ if (message)
+ log_emote("[name]/[key] : [message]")
+
+ for(var/mob/M in dead_mob_list)
+ if (!M.client || istype(M, /mob/new_player))
+ continue //skip monkeys, leavers, and new_players
+ if(M.stat == DEAD && (M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTSIGHT)) && !(M in viewers(src,null)))
+ M.show_message(message)
+
+
+ if (m_type & 1)
+ visible_message(message)
+ else if (m_type & 2)
+ audible_message(message)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm
new file mode 100644
index 0000000000..831fbfb8e8
--- /dev/null
+++ b/code/modules/mob/living/carbon/brain/life.dm
@@ -0,0 +1,60 @@
+
+/mob/living/carbon/brain/Life()
+ set invisibility = 0
+ set background = BACKGROUND_ENABLED
+
+ if (notransform)
+ return
+ if(!loc)
+ return
+ . = ..()
+ handle_emp_damage()
+
+/mob/living/carbon/brain/handle_breathing()
+ return
+
+/mob/living/carbon/brain/handle_mutations_and_radiation()
+ return
+
+/mob/living/carbon/brain/handle_environment(datum/gas_mixture/environment)
+ return
+
+/mob/living/carbon/brain/update_stat()
+ if(status_flags & GODMODE)
+ return
+ if(health <= config.health_threshold_dead)
+ if(stat != DEAD)
+ death()
+ var/obj/item/organ/brain/BR
+ if(container && container.brain)
+ BR = container.brain
+ else if(istype(loc, /obj/item/organ/brain))
+ BR = loc
+ if(BR)
+ BR.damaged_brain = 1 //beaten to a pulp
+
+/* //currently unused feature, since brain outside a mmi is always dead.
+/mob/living/carbon/brain/proc/handle_brain_revival_life()
+ if(stat != DEAD)
+ if(config.revival_brain_life != -1)
+ if( !container && (world.time - timeofhostdeath) > config.revival_brain_life)
+ death()
+*/
+
+/mob/living/carbon/brain/proc/handle_emp_damage()
+ if(emp_damage)
+ if(stat == DEAD)
+ emp_damage = 0
+ else
+ emp_damage = max(emp_damage-1, 0)
+
+/mob/living/carbon/brain/handle_status_effects()
+ return
+
+/mob/living/carbon/brain/handle_disabilities()
+ return
+
+/mob/living/carbon/brain/handle_changeling()
+ return
+
+
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
new file mode 100644
index 0000000000..0ee77ea766
--- /dev/null
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -0,0 +1,166 @@
+var/global/posibrain_notif_cooldown = 0
+
+/obj/item/device/mmi/posibrain
+ name = "positronic brain"
+ desc = "A cube of shining metal, four inches to a side and covered in shallow grooves."
+ icon = 'icons/obj/assemblies.dmi'
+ icon_state = "posibrain"
+ w_class = 3
+ origin_tech = "biotech=3;programming=3;plasmatech=2"
+ var/notified = 0
+ var/askDelay = 600 //one minute
+ var/used = 0 //Prevents split personality virus. May be reset if personality deletion code is added.
+ brainmob = null
+ req_access = list(access_robotics)
+ mecha = null//This does not appear to be used outside of reference in mecha.dm.
+ braintype = "Android"
+ var/begin_activation_message = "You carefully locate the manual activation switch and start the positronic brain's boot process."
+ var/success_message = "The positronic brain pings, and its lights start flashing. Success!"
+ var/fail_message = "The positronic brain buzzes quietly, and the golden lights fade away. Perhaps you could try again?"
+ var/new_role = "Positronic Brain"
+ var/welcome_message = "ALL PAST LIVES ARE FORGOTTEN.\n\
+ You are a positronic brain, brought into existence aboard Space Station 13.\n\
+ As a synthetic intelligence, you answer to all crewmembers and the AI.\n\
+ Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm."
+ var/new_mob_message = "The positronic brain chimes quietly."
+ var/dead_message = "It appears to be completely inactive. The reset light is blinking."
+ var/list/fluff_names = list("PBU","HIU","SINA","ARMA","OSI","HBL","MSO","RR","CHRI","CDB","HG","XSI","ORNG","GUN","KOR","MET","FRE","XIS","SLI","PKP","HOG","RZH","GOOF","MRPR","JJR","FIRC","INC","PHL","BGB","ANTR","MIW","WJ","JRD","CHOC","ANCL","JLLO","JNLG","KOS","TKRG","XAL","STLP","CBOS","DUNC","FXMC","DRSD")
+
+
+/obj/item/device/mmi/posibrain/Topic(href, href_list)
+ if(href_list["activate"])
+ var/mob/dead/observer/ghost = usr
+ if(istype(ghost))
+ activate(ghost)
+
+/obj/item/device/mmi/posibrain/proc/ping_ghosts(msg, newlymade)
+ if(newlymade || !posibrain_notif_cooldown)
+ notify_ghosts("[name] [msg] in [get_area(src)]!", ghost_sound = !newlymade ? 'sound/effects/ghost2.ogg':null, enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK)
+ if(!newlymade)
+ posibrain_notif_cooldown = 1
+ addtimer(src, "reset_posibrain_cooldown", askDelay, FALSE)
+
+/obj/item/device/mmi/posibrain/proc/reset_posibrain_cooldown()
+ posibrain_notif_cooldown = 0
+
+/obj/item/device/mmi/posibrain/attack_self(mob/user)
+ if(brainmob && !brainmob.key && !notified)
+ //Start the process of requesting a new ghost.
+ user << begin_activation_message
+ ping_ghosts("requested", FALSE)
+ notified = 1
+ used = 0
+ update_icon()
+ spawn(askDelay) //Seperate from the global cooldown.
+ notified = 0
+ update_icon()
+ if(brainmob.client)
+ visible_message(success_message)
+ else
+ visible_message(fail_message)
+
+ return //Code for deleting personalities recommended here.
+
+
+/obj/item/device/mmi/posibrain/attack_ghost(mob/user)
+ activate(user)
+
+//Two ways to activate a positronic brain. A clickable link in the ghost notif, or simply clicking the object itself.
+/obj/item/device/mmi/posibrain/proc/activate(mob/user)
+ if(used || (brainmob && brainmob.key) || jobban_isbanned(user,"posibrain"))
+ return
+
+ var/posi_ask = alert("Become a [name]? (Warning, You can no longer be cloned, and all past lives will be forgotten!)","Are you positive?","Yes","No")
+ if(posi_ask == "No" || qdeleted(src))
+ return
+ transfer_personality(user)
+
+/obj/item/device/mmi/posibrain/transfer_identity(mob/living/carbon/C)
+ name = "[initial(name)] ([C])"
+ brainmob.name = C.real_name
+ brainmob.real_name = C.real_name
+ brainmob.dna = C.dna
+ if(C.has_dna())
+ if(!brainmob.dna)
+ brainmob.dna = new /datum/dna(brainmob)
+ C.dna.copy_dna(brainmob.dna)
+ brainmob.timeofhostdeath = C.timeofdeath
+ brainmob.stat = CONSCIOUS
+ if(brainmob.mind)
+ brainmob.mind.assigned_role = new_role
+ if(C.mind)
+ C.mind.transfer_to(brainmob)
+
+ brainmob.mind.remove_all_antag()
+ brainmob.mind.wipe_memory()
+ update_icon()
+ return
+
+/obj/item/device/mmi/posibrain/proc/transfer_personality(mob/candidate)
+ if(used || (brainmob && brainmob.key)) //Prevents hostile takeover if two ghosts get the prompt or link for the same brain.
+ candidate << "This brain has already been taken! Please try your possesion again later!"
+ return
+ notified = 0
+ brainmob.ckey = candidate.ckey
+ name = "[initial(name)] ([brainmob.name])"
+ brainmob << welcome_message
+ brainmob.mind.assigned_role = new_role
+ brainmob.stat = CONSCIOUS
+ dead_mob_list -= brainmob
+ living_mob_list += brainmob
+ if(clockwork)
+ add_servant_of_ratvar(brainmob, TRUE)
+
+ visible_message(new_mob_message)
+ update_icon()
+ used = 1
+
+
+/obj/item/device/mmi/posibrain/examine()
+
+ set src in oview()
+
+ if(!usr || !src)
+ return
+ if( (usr.disabilities & BLIND || usr.stat) && !istype(usr,/mob/dead/observer) )
+ usr << "Something is there but you can't see it."
+ return
+
+ var/msg = "*---------*\nThis is \icon[src] \a [src]!\n[desc]\n"
+ msg += ""
+
+ if(brainmob && brainmob.key)
+ switch(brainmob.stat)
+ if(CONSCIOUS)
+ if(!src.brainmob.client)
+ msg += "It appears to be in stand-by mode.\n" //afk
+ if(DEAD)
+ msg += "It appears to be completely inactive.\n"
+ else
+ msg += "[dead_message]\n"
+ msg += "*---------*"
+ usr << msg
+ return
+
+/obj/item/device/mmi/posibrain/New()
+ brainmob = new(src)
+ brainmob.name = "[pick(fluff_names)]-[rand(100, 999)]"
+ brainmob.real_name = brainmob.name
+ brainmob.loc = src
+ brainmob.container = src
+ ping_ghosts("created", TRUE)
+ ..()
+
+
+/obj/item/device/mmi/posibrain/attackby(obj/item/O, mob/user)
+ return
+
+
+/obj/item/device/mmi/posibrain/update_icon()
+ if(notified)
+ icon_state = "[initial(icon_state)]-searching"
+ return
+ if(brainmob && brainmob.key)
+ icon_state = "[initial(icon_state)]-occupied"
+ else
+ icon_state = initial(icon_state)
diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm
new file mode 100644
index 0000000000..16cdc02ddb
--- /dev/null
+++ b/code/modules/mob/living/carbon/brain/say.dm
@@ -0,0 +1,23 @@
+/mob/living/carbon/brain/say(message)
+ if(!(container && istype(container, /obj/item/device/mmi)))
+ return //No MMI, can't speak, bucko./N
+ else
+ if(prob(emp_damage*4))
+ if(prob(10))//10% chane to drop the message entirely
+ return
+ else
+ message = Gibberish(message, (emp_damage*6))//scrambles the message, gets worse when emp_damage is higher
+ ..()
+
+/mob/living/carbon/brain/radio(message, message_mode, list/spans)
+ if(message_mode && istype(container, /obj/item/device/mmi))
+ var/obj/item/device/mmi/R = container
+ if(R.radio)
+ R.radio.talk_into(src, message, , spans)
+ return ITALICS | REDUCE_RANGE
+
+/mob/living/carbon/brain/lingcheck()
+ return 0
+
+/mob/living/carbon/brain/treat_message(message)
+ return message
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/brain/status_procs.dm b/code/modules/mob/living/carbon/brain/status_procs.dm
new file mode 100644
index 0000000000..dc8ff6ffc1
--- /dev/null
+++ b/code/modules/mob/living/carbon/brain/status_procs.dm
@@ -0,0 +1,38 @@
+//Here are the procs used to modify status effects of a mob.
+//The effects include: stunned, weakened, paralysis, sleeping, resting, jitteriness, dizziness, ear damage,
+// eye damage, eye_blind, eye_blurry, druggy, BLIND disability, and NEARSIGHT disability.
+
+/////////////////////////////////// EAR DAMAGE ////////////////////////////////////
+
+/mob/living/carbon/brain/adjustEarDamage()
+ return
+
+/mob/living/carbon/brain/setEarDamage() // no ears to damage or heal
+ return
+
+/////////////////////////////////// EYE_BLIND ////////////////////////////////////
+
+/mob/living/carbon/brain/blind_eyes() // no eyes to damage or heal
+ return
+
+/mob/living/carbon/brain/adjust_blindness()
+ return
+
+/mob/living/carbon/brain/set_blindness()
+ return
+
+/////////////////////////////////// EYE_BLURRY ////////////////////////////////////
+
+/mob/living/carbon/brain/blur_eyes()
+ return
+
+/mob/living/carbon/brain/adjust_blurriness()
+ return
+
+/mob/living/carbon/brain/set_blurriness()
+ return
+
+/////////////////////////////////// BLIND DISABILITY ////////////////////////////////////
+
+/mob/living/carbon/brain/become_blind()
+ return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human_attackalien.dm b/code/modules/mob/living/carbon/human/human_attackalien.dm
new file mode 100644
index 0000000000..37ac704425
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/human_attackalien.dm
@@ -0,0 +1,49 @@
+/mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M)
+ if(check_shields(0, M.name))
+ visible_message("[M] attempted to touch [src]!")
+ return 0
+
+ if(..())
+ if(M.a_intent == "harm")
+ if (w_uniform)
+ w_uniform.add_fingerprint(M)
+ var/damage = prob(90) ? 20 : 0
+ if(!damage)
+ playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1)
+ visible_message("[M] has lunged at [src]!", \
+ "[M] has lunged at [src]!")
+ return 0
+ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+ var/armor_block = run_armor_check(affecting, "melee","","",10)
+
+ playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+ visible_message("[M] has slashed at [src]!", \
+ "[M] has slashed at [src]!")
+
+ apply_damage(damage, BRUTE, affecting, armor_block)
+ if (prob(30))
+ visible_message("[M] has wounded [src]!", \
+ "[M] has wounded [src]!")
+ apply_effect(4, WEAKEN, armor_block)
+ add_logs(M, src, "attacked")
+ updatehealth()
+
+ if(M.a_intent == "disarm")
+ var/randn = rand(1, 100)
+ if (randn <= 80)
+ playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
+ Weaken(5)
+ add_logs(M, src, "tackled")
+ visible_message("[M] has tackled down [src]!", \
+ "[M] has tackled down [src]!")
+ else
+ if (randn <= 99)
+ playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
+ drop_item()
+ visible_message("[M] disarmed [src]!", \
+ "[M] disarmed [src]!")
+ else
+ playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1)
+ visible_message("[M] has tried to disarm [src]!", \
+ "[M] has tried to disarm [src]!")
+ return
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
new file mode 100644
index 0000000000..0b15f53c84
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -0,0 +1,14 @@
+/mob/living/carbon/human/attack_hulk(mob/living/carbon/human/user)
+ if(user.a_intent == "harm")
+ ..(user, 1)
+ playsound(loc, user.dna.species.attack_sound, 25, 1, -1)
+ var/hulk_verb = pick("smash","pummel")
+ visible_message("[user] has [hulk_verb]ed [src]!", \
+ "[user] has [hulk_verb]ed [src]!")
+ adjustBruteLoss(15)
+ return 1
+
+/mob/living/carbon/human/attack_hand(mob/living/carbon/human/M)
+ if(..()) //to allow surgery to return properly.
+ return
+ dna.species.spec_attack_hand(M, src)
diff --git a/code/modules/mob/living/carbon/human/human_attackpaw.dm b/code/modules/mob/living/carbon/human/human_attackpaw.dm
new file mode 100644
index 0000000000..389401327b
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/human_attackpaw.dm
@@ -0,0 +1,15 @@
+/mob/living/carbon/human/attack_paw(mob/living/carbon/monkey/M)
+ var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg")
+ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
+
+ if(M.a_intent == "help")
+ ..() //shaking
+ return 0
+
+ if(can_inject(M, 1, affecting))//Thick suits can stop monkey bites.
+ if(..()) //successful monkey bite, this handles disease contraction.
+ var/damage = rand(1, 3)
+ if(stat != DEAD)
+ apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, "melee"))
+ updatehealth()
+ return 1
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
new file mode 100644
index 0000000000..583b74055d
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -0,0 +1,161 @@
+//Updates the mob's health from bodyparts and mob damage variables
+/mob/living/carbon/human/updatehealth()
+ if(status_flags & GODMODE)
+ return
+ var/total_burn = 0
+ var/total_brute = 0
+ for(var/X in bodyparts) //hardcoded to streamline things a bit
+ var/obj/item/bodypart/BP = X
+ total_brute += BP.brute_dam
+ total_burn += BP.burn_dam
+ health = maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute
+ update_stat()
+ if(((maxHealth - total_burn) < config.health_threshold_dead) && stat == DEAD )
+ ChangeToHusk()
+ if(on_fire)
+ shred_clothing()
+ med_hud_set_health()
+ med_hud_set_status()
+
+
+//These procs fetch a cumulative total damage from all bodyparts
+/mob/living/carbon/human/getBruteLoss()
+ var/amount = 0
+ for(var/X in bodyparts)
+ var/obj/item/bodypart/BP = X
+ amount += BP.brute_dam
+ return amount
+
+/mob/living/carbon/human/getFireLoss()
+ var/amount = 0
+ for(var/X in bodyparts)
+ var/obj/item/bodypart/BP = X
+ amount += BP.burn_dam
+ return amount
+
+
+/mob/living/carbon/human/adjustBruteLoss(amount)
+ if(status_flags & GODMODE)
+ return 0
+ if(amount > 0)
+ take_overall_damage(amount, 0)
+ else
+ heal_overall_damage(-amount, 0)
+
+/mob/living/carbon/human/adjustFireLoss(amount)
+ if(status_flags & GODMODE)
+ return 0
+ if(amount > 0)
+ take_overall_damage(0, amount)
+ else
+ heal_overall_damage(0, -amount)
+
+/mob/living/carbon/human/proc/hat_fall_prob()
+ var/multiplier = 1
+ var/obj/item/clothing/head/H = head
+ var/loose = 40
+ if(stat || (status_flags & FAKEDEATH))
+ multiplier = 2
+ if(H.flags_cover & (HEADCOVERSEYES | HEADCOVERSMOUTH) || H.flags_inv & (HIDEEYES | HIDEFACE))
+ loose = 0
+ return loose * multiplier
+
+////////////////////////////////////////////
+
+//Returns a list of damaged bodyparts
+/mob/living/carbon/human/proc/get_damaged_bodyparts(brute, burn)
+ var/list/obj/item/bodypart/parts = list()
+ for(var/X in bodyparts)
+ var/obj/item/bodypart/BP = X
+ if((brute && BP.brute_dam) || (burn && BP.burn_dam))
+ parts += BP
+ return parts
+
+//Returns a list of damageable bodyparts
+/mob/living/carbon/human/proc/get_damageable_bodyparts()
+ var/list/obj/item/bodypart/parts = list()
+ for(var/X in bodyparts)
+ var/obj/item/bodypart/BP = X
+ if(BP.brute_dam + BP.burn_dam < BP.max_damage)
+ parts += BP
+ return parts
+
+//Heals ONE external organ, organ gets randomly selected from damaged ones.
+//It automatically updates damage overlays if necesary
+//It automatically updates health status
+/mob/living/carbon/human/heal_organ_damage(brute, burn)
+ var/list/obj/item/bodypart/parts = get_damaged_bodyparts(brute,burn)
+ if(!parts.len)
+ return
+ var/obj/item/bodypart/picked = pick(parts)
+ if(picked.heal_damage(brute,burn,0))
+ update_damage_overlays(0)
+ updatehealth()
+
+//Damages ONE external organ, organ gets randomly selected from damagable ones.
+//It automatically updates damage overlays if necesary
+//It automatically updates health status
+/mob/living/carbon/human/take_organ_damage(brute, burn)
+ var/list/obj/item/bodypart/parts = get_damageable_bodyparts()
+ if(!parts.len)
+ return
+ var/obj/item/bodypart/picked = pick(parts)
+ if(picked.take_damage(brute,burn))
+ update_damage_overlays(0)
+ updatehealth()
+
+
+//Heal MANY bodyparts, in random order
+/mob/living/carbon/human/heal_overall_damage(brute, burn, updating_health=1)
+ var/list/obj/item/bodypart/parts = get_damaged_bodyparts(brute,burn)
+
+ var/update = 0
+ while(parts.len && (brute>0 || burn>0) )
+ var/obj/item/bodypart/picked = pick(parts)
+
+ var/brute_was = picked.brute_dam
+ var/burn_was = picked.burn_dam
+
+ update |= picked.heal_damage(brute,burn,0)
+
+ brute -= (brute_was-picked.brute_dam)
+ burn -= (burn_was-picked.burn_dam)
+
+ parts -= picked
+ if(updating_health)
+ updatehealth()
+ if(update)
+ update_damage_overlays(0)
+
+// damage MANY bodyparts, in random order
+/mob/living/carbon/human/take_overall_damage(brute, burn)
+ if(status_flags & GODMODE)
+ return //godmode
+
+ var/list/obj/item/bodypart/parts = get_damageable_bodyparts()
+ var/update = 0
+ while(parts.len && (brute>0 || burn>0) )
+ var/obj/item/bodypart/picked = pick(parts)
+ var/brute_per_part = brute/parts.len
+ var/burn_per_part = burn/parts.len
+
+ var/brute_was = picked.brute_dam
+ var/burn_was = picked.burn_dam
+
+
+ update |= picked.take_damage(brute_per_part,burn_per_part)
+
+ brute -= (picked.brute_dam - brute_was)
+ burn -= (picked.burn_dam - burn_was)
+
+ parts -= picked
+ updatehealth()
+ if(update)
+ update_damage_overlays(0)
+
+////////////////////////////////////////////
+
+
+/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = 0)
+ // depending on the species, it will run the corresponding apply_damage code there
+ return dna.species.apply_damage(damage, damagetype, def_zone, blocked, src)
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
new file mode 100644
index 0000000000..a9f80f41a4
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -0,0 +1,1215 @@
+/*
+ HUMANS
+*/
+
+/datum/species/human
+ roundstart = 1
+ name = "Human"
+ id = "human"
+ default_color = "FFFFFF"
+ specflags = list(MUTCOLORS_PARTSONLY,EYECOLOR,HAIR,FACEHAIR,LIPS)
+ mutant_bodyparts = list("tail_human", "ears")
+ default_features = list("tail_human" = "None", "ears" = "None")
+ use_skintones = 1
+ skinned_type = /obj/item/stack/sheet/animalhide/human
+
+/*
+/datum/species/human/qualifies_for_rank(rank, list/features)
+ if((!features["tail_human"] || features["tail_human"] == "None") && (!features["ears"] || features["ears"] == "None"))
+ return 1 //Pure humans are always allowed in all roles.
+
+ //Mutants are not allowed in most roles.
+ if(rank in security_positions) //This list does not include lawyers.
+ return 0
+ if(rank in science_positions)
+ return 0
+ if(rank in medical_positions)
+ return 0
+ if(rank in engineering_positions)
+ return 0
+ if(rank == "Quartermaster") //QM is not contained in command_positions but we still want to bar mutants from it.
+ return 0
+ return ..()*/
+
+
+/datum/species/human/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
+ if(chem.id == "mutationtoxin")
+ H << "Your flesh rapidly mutates!"
+ H.set_species(/datum/species/jelly/slime)
+ H.reagents.del_reagent(chem.type)
+ return 1
+
+//Curiosity killed the cat's wagging tail.
+/datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
+ if(H)
+ H.endTailWag()
+
+/*
+ LIZARDPEOPLE
+*/
+
+/datum/species/lizard
+ // Reptilian humanoids with scaled skin and tails.
+ name = "Lizardperson"
+ id = "lizard"
+ say_mod = "hisses"
+ default_color = "00FF00"
+ roundstart = 1
+ specflags = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,FACEHAIR)
+ mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings")
+ //mutant_organs = list(/obj/item/organ/tongue/lizard) (No more hissing)
+ default_features = list("mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0", "tail" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None")
+ attack_verb = "slash"
+ attack_sound = 'sound/weapons/slash.ogg'
+ miss_sound = 'sound/weapons/slashmiss.ogg'
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
+ skinned_type = /obj/item/stack/sheet/animalhide/lizard
+ exotic_bloodtype = "L"
+
+/datum/species/lizard/random_name(gender,unique,lastname)
+ if(unique)
+ return random_unique_lizard_name(gender)
+
+ var/randname = lizard_name(gender)
+
+ if(lastname)
+ randname += " [lastname]"
+
+ return randname
+
+//I wag in death
+/datum/species/lizard/spec_death(gibbed, mob/living/carbon/human/H)
+ if(H)
+ H.endTailWag()
+
+/*
+ Lizard subspecies: ASHWALKERS
+*/
+/datum/species/lizard/ashwalker
+ name = "Ash Walker"
+ id = "lizard"
+ specflags = list(MUTCOLORS,EYECOLOR,LIPS,NOBREATH,NOGUNS)
+/*
+ PODPEOPLE
+*/
+
+/datum/species/pod
+ // A mutation caused by a human being ressurected in a revival pod. These regain health in light, and begin to wither in darkness.
+ roundstart = 1
+ name = "Podperson"
+ id = "pod"
+ default_color = "59CE00"
+ specflags = list(MUTCOLORS,EYECOLOR)
+ attack_verb = "slash"
+ attack_sound = 'sound/weapons/slice.ogg'
+ miss_sound = 'sound/weapons/slashmiss.ogg'
+ burnmod = 1.25
+ heatmod = 1.5
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant
+
+
+/datum/species/pod/spec_life(mob/living/carbon/human/H)
+ if(H.stat == DEAD)
+ return
+ var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
+ if(isturf(H.loc)) //else, there's considered to be no light
+ var/turf/T = H.loc
+ light_amount = min(10,T.get_lumcount() * 100) - 5
+ H.nutrition += light_amount
+ if(H.nutrition > NUTRITION_LEVEL_FULL)
+ H.nutrition = NUTRITION_LEVEL_FULL
+ if(light_amount > 2) //if there's enough light, heal
+ H.heal_overall_damage(1,1)
+ H.adjustToxLoss(-1)
+ H.adjustOxyLoss(-1)
+
+ if(H.nutrition < NUTRITION_LEVEL_STARVING + 50)
+ H.take_overall_damage(2,0)
+
+/datum/species/pod/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
+ if(chem.id == "plantbgone")
+ H.adjustToxLoss(3)
+ H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
+ return 1
+
+/datum/species/pod/on_hit(proj_type, mob/living/carbon/human/H)
+ switch(proj_type)
+ if(/obj/item/projectile/energy/floramut)
+ if(prob(15))
+ H.rad_act(rand(30,80))
+ H.Weaken(5)
+ H.visible_message("[H] writhes in pain as \his vacuoles boil.", "You writhe in pain as your vacuoles boil!", "You hear the crunching of leaves.")
+ if(prob(80))
+ randmutb(H)
+ else
+ randmutg(H)
+ H.domutcheck()
+ else
+ H.adjustFireLoss(rand(5,15))
+ H.show_message("The radiation beam singes you!")
+ if(/obj/item/projectile/energy/florayield)
+ H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL)
+ return
+
+
+/*
+ SHADOWPEOPLE
+*/
+
+/datum/species/shadow
+ // Humans cursed to stay in the darkness, lest their life forces drain. They regain health in shadow and die in light.
+ name = "???"
+ id = "shadow"
+ darksight = 8
+ invis_sight = SEE_INVISIBLE_MINIMUM
+ sexes = 0
+ blacklisted = 1
+ ignored_by = list(/mob/living/simple_animal/hostile/faithless)
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
+ specflags = list(NOBREATH,NOBLOOD,RADIMMUNE,VIRUSIMMUNE)
+ dangerous_existence = 1
+
+/datum/species/shadow/spec_life(mob/living/carbon/human/H)
+ var/light_amount = 0
+ if(isturf(H.loc))
+ var/turf/T = H.loc
+ light_amount = T.get_lumcount()
+
+ if(light_amount > 2) //if there's enough light, start dying
+ H.take_overall_damage(1,1)
+ else if (light_amount < 0.2) //heal in the dark
+ H.heal_overall_damage(1,1)
+
+/*
+ JELLYPEOPLE
+*/
+
+/datum/species/jelly
+ // Entirely alien beings that seem to be made entirely out of gel. They have three eyes and a skeleton visible within them.
+ name = "Xenobiological Jelly Entity"
+ id = "jelly"
+ default_color = "00FF90"
+ say_mod = "chirps"
+ eyes = "jelleyes"
+ specflags = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/slime
+ exotic_blood = "slimejelly"
+ var/datum/action/innate/regenerate_limbs/regenerate_limbs
+
+/datum/species/jelly/on_species_loss(mob/living/carbon/C)
+ if(regenerate_limbs)
+ regenerate_limbs.Remove(C)
+ ..()
+
+/datum/species/jelly/on_species_gain(mob/living/carbon/C, datum/species/old_species)
+ ..()
+ if(ishuman(C))
+ regenerate_limbs = new
+ regenerate_limbs.Grant(C)
+
+/datum/species/jelly/spec_life(mob/living/carbon/human/H)
+ if(H.stat == DEAD) //can't farm slime jelly from a dead slime/jelly person indefinitely
+ return
+ if(!H.blood_volume)
+ H.blood_volume += 5
+ H.adjustBruteLoss(5)
+ H << "You feel empty!"
+
+ if(H.blood_volume < BLOOD_VOLUME_NORMAL)
+ if(H.nutrition >= NUTRITION_LEVEL_STARVING)
+ H.blood_volume += 3
+ H.nutrition -= 2.5
+ if(H.blood_volume < BLOOD_VOLUME_OKAY)
+ if(prob(5))
+ H << "You feel drained!"
+ if(H.blood_volume < BLOOD_VOLUME_BAD)
+ Cannibalize_Body(H)
+ H.update_action_buttons_icon()
+
+/datum/species/jelly/proc/Cannibalize_Body(mob/living/carbon/human/H)
+ var/list/limbs_to_consume = list("r_arm", "l_arm", "r_leg", "l_leg") - H.get_missing_limbs()
+ var/obj/item/bodypart/consumed_limb
+ if(!limbs_to_consume.len)
+ H.losebreath++
+ return
+ if(H.get_num_legs()) //Legs go before arms
+ limbs_to_consume -= list("r_arm", "l_arm")
+ consumed_limb = H.get_bodypart(pick(limbs_to_consume))
+ consumed_limb.drop_limb()
+ H << "Your [consumed_limb] is drawn back into your body, unable to maintain its shape!"
+ qdel(consumed_limb)
+ H.blood_volume += 20
+
+/datum/action/innate/regenerate_limbs
+ name = "Regenerate Limbs"
+ check_flags = AB_CHECK_CONSCIOUS
+ button_icon_state = "slimeheal"
+ background_icon_state = "bg_alien"
+
+/datum/action/innate/regenerate_limbs/IsAvailable()
+ if(..())
+ var/mob/living/carbon/human/H = owner
+ var/list/limbs_to_heal = H.get_missing_limbs()
+ if(limbs_to_heal.len < 1)
+ return 0
+ if(H.blood_volume >= BLOOD_VOLUME_OKAY+40)
+ return 1
+ return 0
+
+/datum/action/innate/regenerate_limbs/Activate()
+ var/mob/living/carbon/human/H = owner
+ var/list/limbs_to_heal = H.get_missing_limbs()
+ if(limbs_to_heal.len < 1)
+ H << "You feel intact enough as it is."
+ return
+ H << "You focus intently on your missing [limbs_to_heal.len >= 2 ? "limbs" : "limb"]..."
+ if(H.blood_volume >= 150*limbs_to_heal.len+BLOOD_VOLUME_OKAY)
+ H.regenerate_limbs()
+ H.blood_volume -= 150*limbs_to_heal.len
+ H << "...and after a moment you finish reforming!"
+ return
+ else if(H.blood_volume >= 150)//We can partially heal some limbs
+ while(H.blood_volume >= BLOOD_VOLUME_OKAY+150)
+ var/healed_limb = pick(limbs_to_heal)
+ H.regenerate_limb(healed_limb)
+ limbs_to_heal -= healed_limb
+ H.blood_volume -= 150
+ H << "...but there is not enough of you to fix everything! You must attain more mass to heal completely!"
+ return
+ H << "...but there is not enough of you to go around! You must attain more mass to heal!"
+
+/*
+ SLIMEPEOPLE
+*/
+
+/datum/species/jelly/slime
+ // Humans mutated by slime mutagen, produced from green slimes. They are not targeted by slimes.
+ name = "Slimeperson"
+ id = "slime"
+ default_color = "00FFFF"
+ darksight = 3
+ specflags = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
+ say_mod = "says"
+ eyes = "eyes"
+ hair_color = "mutcolor"
+ hair_alpha = 192
+ ignored_by = list(/mob/living/simple_animal/slime)
+ burnmod = 0.9
+ coldmod = 2
+ heatmod = 0.9
+ var/datum/action/innate/split_body/slime_split
+ var/list/mob/living/carbon/bodies
+ var/datum/action/innate/swap_body/swap_body
+ roundstart = 1
+
+/datum/species/jelly/slime/on_species_loss(mob/living/carbon/C)
+ if(slime_split)
+ slime_split.Remove(C)
+ if(swap_body)
+ swap_body.Remove(C)
+ bodies -= C // This means that the other bodies maintain a link
+ // so if someone mindswapped into them, they'd still be shared.
+ bodies = null
+ C.faction -= "slime"
+ C.blood_volume = min(C.blood_volume, BLOOD_VOLUME_NORMAL)
+ ..()
+
+/datum/species/jelly/slime/on_species_gain(mob/living/carbon/C, datum/species/old_species)
+ ..()
+ if(ishuman(C))
+ if(!bodies || !bodies.len)
+ bodies = list(C)
+ else
+ bodies |= C
+
+ C.faction |= "slime"
+
+/datum/species/jelly/slime/spec_life(mob/living/carbon/human/H)
+ if(H.blood_volume >= BLOOD_VOLUME_SLIME_SPLIT)
+ if(prob(5))
+ H << "You feel very bloated!"
+ else if(H.nutrition >= NUTRITION_LEVEL_WELL_FED)
+ H.blood_volume += 3
+ H.nutrition -= 2.5
+
+ ..()
+
+/datum/action/innate/split_body
+ name = "Split Body"
+ check_flags = AB_CHECK_CONSCIOUS
+ button_icon_state = "slimesplit"
+ background_icon_state = "bg_alien"
+
+/datum/action/innate/split_body/IsAvailable()
+ if(..())
+ var/mob/living/carbon/human/H = owner
+ if(H.blood_volume >= BLOOD_VOLUME_SLIME_SPLIT)
+ return 1
+ return 0
+
+/datum/action/innate/split_body/Activate()
+ var/mob/living/carbon/human/H = owner
+ if(!isslimeperson(H))
+ return
+ CHECK_DNA_AND_SPECIES(H)
+ H.visible_message("[owner] gains a look of \
+ concentration while standing perfectly still.",
+ "You focus intently on moving your body while \
+ standing perfectly still...")
+
+ H.notransform = TRUE
+
+ if(do_after(owner, delay=60, needhand=FALSE, target=owner, progress=TRUE))
+ if(H.blood_volume >= BLOOD_VOLUME_SLIME_SPLIT)
+ make_dupe()
+ else
+ H << "...but there is not enough of you to \
+ go around! You must attain more mass to split!"
+ else
+ H << "...but fail to stand perfectly still!\
+ "
+
+ H.notransform = FALSE
+
+/datum/action/innate/split_body/proc/make_dupe()
+ var/mob/living/carbon/human/H = owner
+ CHECK_DNA_AND_SPECIES(H)
+
+ var/mob/living/carbon/human/spare = new /mob/living/carbon/human(H.loc)
+
+ spare.underwear = "Nude"
+ H.dna.transfer_identity(spare, transfer_SE=1)
+ spare.dna.features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")
+ spare.real_name = spare.dna.real_name
+ spare.name = spare.dna.real_name
+ spare.updateappearance(mutcolor_update=1)
+ spare.domutcheck()
+ spare.Move(get_step(H.loc, pick(NORTH,SOUTH,EAST,WEST)))
+
+ H.blood_volume = BLOOD_VOLUME_SAFE
+ H.notransform = 0
+
+ var/datum/species/jelly/slime/origin_datum = H.dna.species
+ origin_datum.bodies |= spare
+
+ var/datum/species/jelly/slime/spare_datum = spare.dna.species
+ spare_datum.bodies = origin_datum.bodies
+
+ H.mind.transfer_to(spare)
+ spare.visible_message("[H] distorts as a new body \
+ \"steps out\" of them.",
+ "...and after a moment of disorentation, \
+ you're besides yourself!")
+
+
+/datum/action/innate/swap_body
+ name = "Swap Body"
+ check_flags = AB_CHECK_CONSCIOUS
+ button_icon_state = "slimeswap"
+ background_icon_state = "bg_alien"
+
+/datum/action/innate/swap_body/Activate()
+ if(!isslimeperson(owner))
+ owner << "You are not a slimeperson."
+ Remove(owner)
+ else
+ ui_interact(owner)
+
+/datum/action/innate/swap_body/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = conscious_state)
+
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "slime_swap_body", name, 400, 400, master_ui, state)
+ ui.open()
+
+/datum/action/innate/swap_body/ui_data(mob/user)
+ var/mob/living/carbon/human/H = owner
+ if(!isslimeperson(H))
+ return
+
+ var/datum/species/jelly/slime/SS = H.dna.species
+
+ var/list/data = list()
+ data["bodies"] = list()
+ for(var/b in SS.bodies)
+ if(!b || qdeleted(b) || !isslimeperson(b))
+ SS.bodies -= b
+ continue
+ var/mob/living/carbon/human/body = b
+
+ var/list/L = list()
+ // HTML colors need a # prefix
+ L["htmlcolor"] = "#[body.dna.features["mcolor"]]"
+ var/area/A = get_area(body)
+ L["area"] = A.name
+ var/stat = "error"
+ switch(body.stat)
+ if(CONSCIOUS)
+ stat = "Conscious"
+ if(UNCONSCIOUS)
+ stat = "Unconscious"
+ if(DEAD)
+ stat = "Dead"
+ var/current = body.mind
+ var/is_conscious = (body.stat == CONSCIOUS)
+
+ L["status"] = stat
+ L["exoticblood"] = body.blood_volume
+ L["name"] = body.name
+ L["ref"] = "\ref[body]"
+ L["is_current"] = current
+ var/button
+ if(current)
+ button = "selected"
+ else if(is_conscious)
+ button = null
+ else
+ button = "disabled"
+
+ L["swap_button_state"] = button
+ L["swappable"] = !current && is_conscious
+
+ data["bodies"] += list(L)
+
+ return data
+
+/datum/action/innate/swap_body/ui_act(action, params)
+ if(..())
+ return
+ var/mob/living/carbon/human/H = owner
+ if(!isslimeperson(owner))
+ return
+ var/datum/species/jelly/slime/SS = H.dna.species
+
+ var/datum/mind/M
+ for(var/mob/living/L in SS.bodies)
+ if(L.mind && L.mind.active)
+ M = L.mind
+ if(!M)
+ return
+ if(!isslimeperson(M.current))
+ return
+
+ switch(action)
+ if("swap")
+ var/mob/living/carbon/human/selected = locate(params["ref"])
+ if(!(selected in SS.bodies))
+ return
+ if(!selected || qdeleted(selected) || !isslimeperson(selected))
+ SS.bodies -= selected
+ return
+ if(M.current == selected)
+ return
+ if(selected.stat != CONSCIOUS)
+ return
+
+ swap_to_dupe(M, selected)
+
+/datum/action/innate/swap_body/proc/swap_to_dupe(datum/mind/M, mob/living/carbon/human/dupe)
+ M.current.visible_message("[M.current] \
+ stops moving and starts staring vacantly into space.",
+ "You stop moving this body...")
+ M.transfer_to(dupe)
+ dupe.visible_message("[dupe] blinks and looks \
+ around.",
+ "...and move this one instead.")
+
+/*
+ GOLEMS
+*/
+
+/datum/species/golem
+ // Animated beings of stone. They have increased defenses, and do not need to breathe. They're also slow as fuuuck.
+ name = "Golem"
+ id = "golem"
+ specflags = list(NOBREATH,RESISTTEMP,NOGUNS,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NODISMEMBER,MUTCOLORS)
+ speedmod = 2
+ armor = 55
+ siemens_coeff = 0
+ punchdamagelow = 5
+ punchdamagehigh = 14
+ punchstunthreshold = 12 //about 15% chance to stun
+ no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform)
+ nojumpsuit = 1
+ sexes = 1
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem
+ // To prevent golem subtypes from overwhelming the odds when random species
+ // changes, only the Random Golem type can be chosen
+ blacklisted = TRUE
+ dangerous_existence = TRUE
+ limbs_id = "golem"
+ fixed_mut_color = "aaa"
+
+/datum/species/golem/random
+ name = "Random Golem"
+ blacklisted = FALSE
+ dangerous_existence = FALSE
+
+/datum/species/golem/random/New()
+ . = ..()
+ var/list/golem_types = typesof(/datum/species/golem) - src.type
+ var/datum/species/golem/golem_type = pick(golem_types)
+ name = initial(golem_type.name)
+ id = initial(golem_type.id)
+ meat = initial(golem_type.meat)
+
+/datum/species/golem/adamantine
+ name = "Adamantine Golem"
+ id = "adamantine"
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine
+ fixed_mut_color = "4ed"
+
+/datum/species/golem/plasma
+ name = "Plasma Golem"
+ id = "plasma"
+ fixed_mut_color = "a3d"
+
+/datum/species/golem/diamond
+ name = "Diamond Golem"
+ id = "diamond"
+ fixed_mut_color = "0ff"
+
+/datum/species/golem/gold
+ name = "Gold Golem"
+ id = "gold"
+ fixed_mut_color = "ee0"
+
+/datum/species/golem/silver
+ name = "Silver Golem"
+ id = "silver"
+ fixed_mut_color = "ddd"
+
+/datum/species/golem/uranium
+ name = "Uranium Golem"
+ id = "uranium"
+ fixed_mut_color = "7f0"
+
+
+/*
+ FLIES
+*/
+
+/datum/species/fly
+ // Humans turned into fly-like abominations in teleporter accidents.
+ name = "Human?"
+ id = "fly"
+ say_mod = "buzzes"
+ eyes = "flyeyes"
+ mutant_organs = list(/obj/item/organ/tongue/fly)
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/fly
+
+/datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
+ if(chem.id == "pestkiller")
+ H.adjustToxLoss(3)
+ H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
+ return 1
+
+
+/datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
+ if(istype(chem,/datum/reagent/consumable))
+ var/datum/reagent/consumable/nutri_check = chem
+ if(nutri_check.nutriment_factor > 0)
+ var/turf/pos = get_turf(H)
+ H.vomit(0, 0, 0, 1, 1)
+ playsound(pos, 'sound/effects/splat.ogg', 50, 1)
+ H.visible_message("[H] vomits on the floor!", \
+ "You throw up on the floor!")
+ ..()
+
+/*
+ SKELETONS
+*/
+
+/datum/species/skeleton
+ // 2spooky
+ name = "Spooky Scary Skeleton"
+ id = "skeleton"
+ say_mod = "rattles"
+ blacklisted = 1
+ sexes = 0
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
+ specflags = list(NOBREATH,RESISTTEMP,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NOHUNGER,EASYDISMEMBER,EASYLIMBATTACHMENT)
+ mutant_organs = list(/obj/item/organ/tongue/bone)
+
+/*
+ ZOMBIES
+*/
+
+/datum/species/zombie
+ // 1spooky
+ name = "High Functioning Zombie"
+ id = "zombie"
+ say_mod = "moans"
+ sexes = 0
+ blacklisted = 1
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
+ specflags = list(NOBREATH,RESISTTEMP,NOBLOOD,RADIMMUNE,NOZOMBIE,EASYDISMEMBER,EASYLIMBATTACHMENT, TOXINLOVER)
+ mutant_organs = list(/obj/item/organ/tongue/zombie)
+ speedmod = 2
+
+/datum/species/zombie/infectious
+ name = "Infectious Zombie"
+ no_equip = list(slot_wear_mask, slot_head)
+ armor = 20 // 120 damage to KO a zombie, which kills it
+
+/datum/species/zombie/infectious/spec_life(mob/living/carbon/C)
+ . = ..()
+ C.a_intent = "harm" // THE SUFFERING MUST FLOW
+ if(C.InCritical())
+ C.death()
+ // Zombies only move around when not in crit, they instantly
+ // succumb otherwise, and will standup again soon
+
+/datum/species/zombie/infectious/on_species_gain(mob/living/carbon/C, datum/species/old_species)
+ . = ..()
+ // Drop items in hands
+ // If you're a zombie lucky enough to have a NODROP item, then it stays.
+ if(C.unEquip(C.l_hand))
+ C.put_in_l_hand(new /obj/item/zombie_hand(C))
+ if(C.unEquip(C.r_hand))
+ C.put_in_r_hand(new /obj/item/zombie_hand(C))
+
+ // Next, deal with the source of this zombie corruption
+ var/obj/item/organ/body_egg/zombie_infection/infection
+ infection = C.getorganslot("zombie_infection")
+ if(!infection)
+ infection = new(C)
+
+/datum/species/zombie/infectious/on_species_loss(mob/living/carbon/C)
+ . = ..()
+ var/obj/item/zombie_hand/left = C.l_hand
+ var/obj/item/zombie_hand/right = C.r_hand
+ // Deletion of the hands is handled in the items dropped()
+ if(istype(left))
+ C.unEquip(left, TRUE)
+ if(istype(right))
+ C.unEquip(right, TRUE)
+
+// Your skin falls off
+/datum/species/krokodil_addict
+ name = "Human"
+ id = "zombie"
+ sexes = 0
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
+ mutant_organs = list(/obj/item/organ/tongue/zombie)
+
+/datum/species/abductor
+ name = "Abductor"
+ id = "abductor"
+ darksight = 3
+ say_mod = "gibbers"
+ sexes = 0
+ specflags = list(NOBLOOD,NOBREATH,VIRUSIMMUNE,NOGUNS)
+ mutant_organs = list(/obj/item/organ/tongue/abductor)
+ var/scientist = 0 // vars to not pollute spieces list with castes
+ var/agent = 0
+ var/team = 1
+
+var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_state"="plasmaman")
+
+/datum/species/plasmaman
+ name = "Plasmaman"
+ id = "plasmaman"
+ say_mod = "rattles"
+ sexes = 0
+ meat = /obj/item/stack/sheet/mineral/plasma
+ specflags = list(NOBLOOD,RADIMMUNE,NOTRANSSTING,VIRUSIMMUNE,NOHUNGER)
+ safe_oxygen_min = 0 //We don't breath this
+ safe_toxins_min = 16 //We breath THIS!
+ safe_toxins_max = 0
+ dangerous_existence = 1 //So so much
+ blacklisted = 1 //See above
+ burnmod = 2
+ heatmod = 2
+ speedmod = 1
+
+/datum/species/plasmaman/spec_life(mob/living/carbon/human/H)
+ var/datum/gas_mixture/environment = H.loc.return_air()
+
+ if(!istype(H.w_uniform, /obj/item/clothing/under/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/space/plasmaman))
+ if(environment)
+ var/total_moles = environment.total_moles()
+ if(total_moles)
+ if(environment.gases["o2"] && (environment.gases["o2"][MOLES] /total_moles) >= 0.01)
+ H.adjust_fire_stacks(0.5)
+ if(!H.on_fire && H.fire_stacks > 0)
+ H.visible_message("[H]'s body reacts with the atmosphere and bursts into flames!","Your body reacts with the atmosphere and bursts into flame!")
+ H.IgniteMob()
+ else
+ if(H.fire_stacks)
+ var/obj/item/clothing/under/plasmaman/P = H.w_uniform
+ if(istype(P))
+ P.Extinguish(H)
+ H.update_fire()
+
+/datum/species/plasmaman/before_equip_job(datum/job/J, mob/living/carbon/human/H, visualsOnly = FALSE)
+ var/datum/outfit/plasmaman/O = new /datum/outfit/plasmaman
+ H.equipOutfit(O, visualsOnly)
+ H.internal = H.r_hand
+ H.update_internals_hud_icon(1)
+ return 0
+
+/datum/species/plasmaman/qualifies_for_rank(rank, list/features)
+ if(rank in security_positions)
+ return 0
+ if(rank == "Clown" || rank == "Mime")//No funny bussiness
+ return 0
+ return ..()
+
+
+
+/datum/species/synth
+ name = "Synth" //inherited from the real species, for health scanners and things
+ id = "synth"
+ say_mod = "beep boops" //inherited from a user's real species
+ sexes = 0
+ specflags = list(NOTRANSSTING,NOBREATH,VIRUSIMMUNE,NODISMEMBER,NOHUNGER) //all of these + whatever we inherit from the real species
+ safe_oxygen_min = 0
+ safe_toxins_min = 0
+ safe_toxins_max = 0
+ safe_co2_max = 0
+ SA_para_min = 0
+ SA_sleep_min = 0
+ dangerous_existence = 1
+ blacklisted = 1
+ meat = null
+ exotic_damage_overlay = "synth"
+ limbs_id = "synth"
+ var/list/initial_specflags = list(NOTRANSSTING,NOBREATH,VIRUSIMMUNE,NODISMEMBER,NOHUNGER) //for getting these values back for assume_disguise()
+ var/disguise_fail_health = 75 //When their health gets to this level their synthflesh partially falls off
+ var/datum/species/fake_species = null //a species to do most of our work for us, unless we're damaged
+ roundstart = 0
+
+/datum/species/synth/military
+ name = "Military Synth"
+ id = "military_synth"
+ armor = 25
+ punchdamagelow = 10
+ punchdamagehigh = 19
+ punchstunthreshold = 14 //about 50% chance to stun
+ disguise_fail_health = 50
+
+/datum/species/synth/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
+ ..()
+ assume_disguise(old_species, H)
+
+/datum/species/synth/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
+ if(chem.id == "synthflesh")
+ chem.reaction_mob(H, TOUCH, 2 ,0) //heal a little
+ H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
+ return 1
+ else
+ return ..()
+
+
+/datum/species/synth/proc/assume_disguise(datum/species/S, mob/living/carbon/human/H)
+ if(S && !istype(S, type))
+ name = S.name
+ say_mod = S.say_mod
+ sexes = S.sexes
+ specflags = initial_specflags.Copy()
+ specflags.Add(S.specflags)
+ attack_verb = S.attack_verb
+ attack_sound = S.attack_sound
+ miss_sound = S.miss_sound
+ meat = S.meat
+ mutant_bodyparts = S.mutant_bodyparts.Copy()
+ mutant_organs = S.mutant_organs.Copy()
+ default_features = S.default_features.Copy()
+ nojumpsuit = S.nojumpsuit
+ no_equip = S.no_equip.Copy()
+ limbs_id = S.id
+ use_skintones = S.use_skintones
+ fixed_mut_color = S.fixed_mut_color
+ hair_color = S.hair_color
+ fake_species = new S.type
+ else
+ name = initial(name)
+ say_mod = initial(say_mod)
+ specflags = initial_specflags.Copy()
+ attack_verb = initial(attack_verb)
+ attack_sound = initial(attack_sound)
+ miss_sound = initial(miss_sound)
+ mutant_bodyparts = list()
+ default_features = list()
+ nojumpsuit = initial(nojumpsuit)
+ no_equip = list()
+ qdel(fake_species)
+ fake_species = null
+ meat = initial(meat)
+ limbs_id = "synth"
+ use_skintones = 0
+ sexes = 0
+ fixed_mut_color = ""
+ hair_color = ""
+
+
+//Proc redirects:
+//Passing procs onto the fake_species, to ensure we look as much like them as possible
+
+/datum/species/synth/handle_hair(mob/living/carbon/human/H, forced_colour)
+ if(fake_species)
+ fake_species.handle_hair(H, forced_colour)
+ else
+ return ..()
+
+
+/datum/species/synth/handle_body(mob/living/carbon/human/H)
+ if(fake_species)
+ fake_species.handle_body(H)
+ else
+ return ..()
+
+
+/datum/species/synth/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour)
+ if(fake_species)
+ fake_species.handle_body(H,forced_colour)
+ else
+ return ..()
+
+
+/datum/species/synth/get_spans()
+ if(fake_species)
+ return fake_species.get_spans()
+ return list()
+
+
+/datum/species/synth/handle_speech(message, mob/living/carbon/human/H)
+ if(H.health > disguise_fail_health)
+ if(fake_species)
+ return fake_species.handle_speech(message,H)
+ else
+ return ..()
+ else
+ return ..()
+
+
+/*
+SYNDICATE BLACK OPS
+*/
+//The hardcore return of the failed Deathsquad augmentation project
+//Now it's own, wizard-tier, very robust, lone antag
+/datum/species/corporate
+ name = "Corporate Agent"
+ id = "agent"
+ hair_alpha = 0
+ say_mod = "declares"
+ speedmod = -2//Fast
+ brutemod = 0.7//Tough against firearms
+ burnmod = 0.65//Tough against lasers
+ coldmod = 0
+ heatmod = 0.5//it's a little tough to burn them to death not as hard though.
+ punchdamagelow = 20
+ punchdamagehigh = 30//they are inhumanly strong
+ punchstunthreshold = 25
+ attack_verb = "smash"
+ attack_sound = "sound/weapons/resonator_blast.ogg"
+ blacklisted = 1
+ use_skintones = 0
+ specflags = list(RADIMMUNE,VIRUSIMMUNE,NOBLOOD,PIERCEIMMUNE,EYECOLOR,NODISMEMBER,NOHUNGER)
+ sexes = 0
+
+/datum/species/angel
+ name = "Angel"
+ id = "angel"
+ default_color = "FFFFFF"
+ specflags = list(EYECOLOR,HAIR,FACEHAIR,LIPS)
+ mutant_bodyparts = list("tail_human", "ears", "wings")
+ default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "Angel")
+ use_skintones = 1
+ no_equip = list(slot_back)
+ blacklisted = 1
+ limbs_id = "human"
+ skinned_type = /obj/item/stack/sheet/animalhide/human
+
+ var/datum/action/innate/flight/fly
+
+/datum/species/angel/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
+ ..()
+ if(H.dna && H.dna.species &&((H.dna.features["wings"] != "Angel") && ("wings" in H.dna.species.mutant_bodyparts)))
+ H.dna.features["wings"] = "Angel"
+ H.update_body()
+ if(ishuman(H)&& !fly)
+ fly = new
+ fly.Grant(H)
+
+
+/datum/species/angel/on_species_loss(mob/living/carbon/human/H)
+ if(fly)
+ fly.Remove(H)
+ if(FLYING in specflags)
+ specflags -= FLYING
+ ToggleFlight(H,0)
+ if(H.dna && H.dna.species &&((H.dna.features["wings"] != "None") && ("wings" in H.dna.species.mutant_bodyparts)))
+ H.dna.features["wings"] = "None"
+ H.update_body()
+ ..()
+
+/datum/species/angel/spec_life(mob/living/carbon/human/H)
+ HandleFlight(H)
+
+/datum/species/angel/proc/HandleFlight(mob/living/carbon/human/H)
+ if(FLYING in specflags)
+ if(!CanFly(H))
+ ToggleFlight(H,0)
+ H.float(0)
+ return 0
+ H.float(1)
+ return 1
+ else
+ H.float(0)
+ return 0
+
+/datum/species/angel/proc/CanFly(mob/living/carbon/human/H)
+ if(H.stat || H.stunned || H.weakened)
+ return 0
+ if(H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT)) //Jumpsuits have tail holes, so it makes sense they have wing holes too
+ H << "Your suit blocks your wings from extending!"
+ return 0
+ var/turf/T = get_turf(H)
+ if(!T)
+ return 0
+
+ var/datum/gas_mixture/environment = T.return_air()
+ if(environment && !(environment.return_pressure() > 30))
+ H << "The atmosphere is too thin for you to fly!"
+ return 0
+ else
+ return 1
+
+/datum/action/innate/flight
+ name = "Toggle Flight"
+ check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_STUNNED
+ button_icon_state = "slimesplit"
+ background_icon_state = "bg_alien"
+
+/datum/action/innate/flight/Activate()
+ var/mob/living/carbon/human/H = owner
+ var/datum/species/angel/A = H.dna.species
+ if(A.CanFly(H))
+ if(FLYING in A.specflags)
+ H << "You settle gently back onto the ground..."
+ A.ToggleFlight(H,0)
+ H.update_canmove()
+ else
+ H << "You beat your wings and begin to hover gently above the ground..."
+ H.resting = 0
+ A.ToggleFlight(H,1)
+ H.update_canmove()
+
+/datum/species/angel/proc/flyslip(mob/living/carbon/human/H)
+ var/obj/buckled_obj
+ if(H.buckled)
+ buckled_obj = H.buckled
+
+ H << "Your wings spazz out and launch you!"
+
+ playsound(H.loc, 'sound/misc/slip.ogg', 50, 1, -3)
+
+ H.accident(H.l_hand)
+ H.accident(H.r_hand)
+
+ var/olddir = H.dir
+
+ H.stop_pulling()
+ if(buckled_obj)
+ buckled_obj.unbuckle_mob(H)
+ step(buckled_obj, olddir)
+ else
+ for(var/i=1, i<5, i++)
+ spawn (i)
+ step(H, olddir)
+ H.spin(1,1)
+ return 1
+
+
+/datum/species/angel/spec_stun(mob/living/carbon/human/H,amount)
+ if(FLYING in specflags)
+ ToggleFlight(H,0)
+ flyslip(H)
+ . = ..()
+
+/datum/species/angel/negates_gravity()
+ if(FLYING in specflags)
+ return 1
+
+/datum/species/angel/space_move()
+ if(FLYING in specflags)
+ return 1
+
+/datum/species/angel/proc/ToggleFlight(mob/living/carbon/human/H,flight)
+ if(flight && CanFly(H))
+ stunmod = 2
+ speedmod = -1
+ specflags += FLYING
+ override_float = 1
+ H.pass_flags |= PASSTABLE
+ H.OpenWings()
+ else
+ stunmod = 1
+ speedmod = 0
+ specflags -= FLYING
+ override_float = 0
+ H.pass_flags &= ~PASSTABLE
+ H.CloseWings()
+
+
+//CANID//
+datum/species/canid
+ name = "Canid"
+ id = "canid"
+ default_color = "4B4B4B"
+ specflags = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
+ mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "snout")
+ default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "body_markings" = "None", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "None")
+ attack_verb = "claw"
+ attack_sound = 'sound/weapons/slash.ogg'
+ miss_sound = 'sound/weapons/slashmiss.ogg'
+ roundstart = 1
+
+/datum/species/canid/spec_death(gibbed, mob/living/carbon/human/H)
+ if(H)
+ H.endTailWag()
+
+//FELID//
+
+/datum/species/felid
+ name = "Felid"
+ id = "felid"
+ default_color = "BCAC9B"
+ specflags = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
+ mutant_bodyparts = list("mam_body_markings", "mam_ears", "mam_tail", "snout")
+ default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_body_markings" = "Belly", "mam_ears" = "Big Cat", "mam_tail" = "Big Cat")
+ attack_verb = "claw"
+ attack_sound = 'sound/weapons/slash.ogg'
+ miss_sound = 'sound/weapons/slashmiss.ogg'
+ roundstart = 1 //no sprites yet
+
+/datum/species/tajaran/spec_death(gibbed, mob/living/carbon/human/H)
+ if(H)
+ H.endTailWag()
+
+//AVIAN//
+/datum/species/avian
+ name = "Avian"
+ id = "avian"
+ default_color = "BCAC9B"
+ specflags = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
+ mutant_bodyparts = list("beak", "wings", "avian_tail")
+ default_features = list("beak" = "None", "wings" = "None")
+ attack_verb = "peck"
+ attack_sound = 'sound/weapons/slash.ogg'
+ miss_sound = 'sound/weapons/slashmiss.ogg'
+ roundstart = 0 //no sprites yet
+ blacklisted = 1
+
+//HERBIVOROUS//
+
+//EXOTIC//
+//These races will likely include lots of downsides and upsides. Keep them relatively balanced.//
+/datum/species/xeno
+ name = "Xenomorph"
+ id = "xeno"
+ say_mod = "hisses"
+ eyes = "none"
+ specflags = list()
+ mutant_organs = list(/obj/item/organ/tongue/alien)
+ mutant_bodyparts = list("xenohead",
+ "xenodorsal",
+ "xenotail")
+ default_features = list("xenohead"="Hunter",
+ "xenodorsal"="Dorsal Tubes",
+ "xenotail"="Xenomorph Tail")
+ attack_verb = "slash"
+ attack_sound = 'sound/weapons/slash.ogg'
+ miss_sound = 'sound/weapons/slashmiss.ogg'
+ burnmod = 1.75
+ heatmod = 1.75
+ darksight = 4 //Just above slimes
+ exotic_blood = "xblood"
+ exotic_damage_overlay = "xeno"
+ no_equip = list(slot_glasses) //MY EYES, THEY'RE GONE
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno
+ skinned_type = /obj/item/stack/sheet/animalhide/xeno
+ safe_toxins_max = 32 //Too much of anything is bad.
+ roundstart = 1
+// whitelisted = 1
+// whitelist = list("talkingcactus") //testing whitelisting
+
+/datum/species/xeno/on_species_gain(mob/living/carbon/C, datum/species/old_species)
+ ..()
+ var/obj/effect/decal/cleanable/xenoblood/xgibs/XG
+ if(istype(C.gib_type, XG))
+ return
+ else
+ C.gib_type = XG
+
+/datum/species/xeno/on_species_loss(mob/living/carbon/C)
+ ..()
+ var/obj/effect/decal/cleanable/xenoblood/xgibs/XG
+ var/obj/effect/decal/cleanable/blood/gibs/HG
+ if(istype(C.gib_type, XG))
+ C.gib_type = HG
+ else
+ return
+
+/datum/reagent/toxin/acid/xenoblood
+ name = "acid blood"
+ id = "xblood"
+ description = "A highly corrosive substance, it is capable of burning through most natural or man-made materials in short order."
+ color = "#66CC00"
+ toxpwr = 0
+ acidpwr = 12
+
+/datum/species/yautja
+ name = "Yautja"
+ id = "pred"
+ say_mod = "clicks"
+ eyes = "predeyes"
+ mutant_organs = list(/obj/item/organ/tongue/yautja)
+ specflags = list(EYECOLOR)
+ lang_spoken = YAUTJA
+ lang_understood = HUMAN|YAUTJA|ALIEN
+ no_equip = list(slot_head)
+ punchdamagelow = 4
+ punchdamagehigh = 14
+ punchstunthreshold = 13
+ blacklisted = 1
+ roundstart = 0
+ whitelist = 1
+ whitelist = list("talkingcactus")
+
+/datum/outfit/yautja_basic
+ name = "Yautja, Basic"
+ uniform = /obj/item/clothing/under/mesh
+ suit = /obj/item/clothing/suit/armor/yautja_fake
+ shoes = /obj/item/clothing/shoes/yautja_fake
+ mask = /obj/item/clothing/mask/gas/yautja_fake
+
+/datum/species/yautja/before_equip_job(datum/job/J, mob/living/carbon/human/H, visualsOnly = FALSE)
+ var/datum/outfit/yautja_basic/O = new /datum/outfit/yautja_basic//Just basic gear. Doesn't include anything that gives any meaningful advantage.
+ H.equipOutfit(O, visualsOnly)
+ return 0
+
+/datum/species/octopus
+ blacklisted = 1
+/datum/species/carp
+ blacklisted = 1
+/datum/species/horse
+ blacklisted = 1
+
+///////////////////
+//DONATOR SPECIES//
+///////////////////
+
+//ChronoFlux: Slimecoon
+/*
+/datum/species/jelly/slime/slimecoon
+ name = "Slime Raccoon"
+ id = "slimecoon"
+ limbs_id = "slime"
+ whitelisted = 1
+ whitelist = list("chronoflux")
+ blacklisted = 1
+ mutant_bodyparts = list("slimecoontail", "slimecoonears", "slimecoonsnout")
+ default_features = list("slimecoontail" = "Slimecoon Tail", "slimecoonears" = "Slimecoon Ears", "slimecoonsnout" = "Slimecoon Snout")*/
diff --git a/code/modules/mob/living/carbon/monkey/emote.dm b/code/modules/mob/living/carbon/monkey/emote.dm
new file mode 100644
index 0000000000..bb873cd8d7
--- /dev/null
+++ b/code/modules/mob/living/carbon/monkey/emote.dm
@@ -0,0 +1,82 @@
+/mob/living/carbon/monkey/emote(act,m_type=1,message = null)
+ if(stat == DEAD && (act != "deathgasp") || (status_flags & FAKEDEATH)) //if we're faking, don't emote at all
+ return
+
+ var/param = null
+ if (findtext(act, "-", 1, null))
+ var/t1 = findtext(act, "-", 1, null)
+ param = copytext(act, t1 + 1, length(act) + 1)
+ act = copytext(act, 1, t1)
+
+ var/muzzled = is_muzzled()
+
+ switch(act) //Ooh ooh ah ah keep this alphabetical ooh ooh ah ah!
+ if ("deathgasp","deathgasps")
+ message = "[src] lets out a faint chimper as it collapses and stops moving..."
+ m_type = 1
+
+ if ("gnarl","gnarls")
+ if (!muzzled)
+ message = "[src] gnarls and shows its teeth.."
+ m_type = 2
+
+ if ("me")
+ ..()
+ return
+
+ if ("moan","moans")
+ message = "[src] moans!"
+ m_type = 2
+
+ if ("paw")
+ if (!src.restrained())
+ message = "[src] flails its paw."
+ m_type = 1
+
+ if ("roar","roars")
+ if (!muzzled)
+ message = "[src] roars."
+ m_type = 2
+
+ if ("roll","rolls")
+ if (!src.restrained())
+ message = "[src] rolls."
+ m_type = 1
+
+ if ("scratch","scratches")
+ if (!src.restrained())
+ message = "[src] scratches."
+ m_type = 1
+
+ if ("screech","screeches")
+ if (!muzzled)
+ message = "[src] screeches."
+ m_type = 2
+
+ if ("shiver","shivers")
+ message = "[src] shivers."
+ m_type = 2
+
+ if ("sign","signs")
+ if (!src.restrained())
+ message = text("[src] signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))
+ m_type = 1
+
+ if ("tail")
+ message = "[src] waves its tail."
+ 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, 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
+ ..()
+
+ if ((message && src.stat == 0))
+ if(src.client)
+ log_emote("[name]/[key] : [message]")
+ if (m_type & 1)
+ visible_message(message)
+ else
+ audible_message(message)
+ return
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index ee8ca1d624..3dba061fd9 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1,5 +1,6 @@
/mob/Destroy()//This makes sure that mobs with clients/keys are not just deleted from the game.
mob_list -= src
+ SSmob.currentrun -= src
dead_mob_list -= src
living_mob_list -= src
all_clockwork_mobs -= src
@@ -966,4 +967,5 @@ proc/get_top_level_mob(var/mob/S)
switch(var_name)
if ("attack_log")
return debug_variable(var_name, attack_log, 0, src, FALSE)
+
. = ..()
\ No newline at end of file
diff --git a/code/modules/power/engine.dm b/code/modules/power/engine.dm
new file mode 100644
index 0000000000..dc01f9f5a3
--- /dev/null
+++ b/code/modules/power/engine.dm
@@ -0,0 +1,16 @@
+/turf/open/floor/engine/attack_paw(mob/user)
+ return src.attack_hand(user)
+
+/turf/open/floor/engine/attack_hand(mob/user)
+ user.Move_Pulled(src)
+
+/turf/open/floor/engine/ex_act(severity, target)
+ contents_explosion(severity, target)
+ switch(severity)
+ if(1)
+ ChangeTurf(src.baseturf)
+ if(2)
+ if(prob(50))
+ ChangeTurf(src.baseturf)
+ else
+ return
\ No newline at end of file
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
new file mode 100644
index 0000000000..50769b926e
--- /dev/null
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -0,0 +1,69 @@
+/obj/item/ammo_box/a357
+ name = "speed loader (.357)"
+ desc = "Designed to quickly reload revolvers."
+ icon_state = "357"
+ ammo_type = /obj/item/ammo_casing/a357
+ max_ammo = 7
+ multiple_sprites = 1
+
+/obj/item/ammo_box/c38
+ name = "speed loader (.38)"
+ desc = "Designed to quickly reload revolvers."
+ icon_state = "38"
+ ammo_type = /obj/item/ammo_casing/c38
+ max_ammo = 6
+ multiple_sprites = 1
+
+/obj/item/ammo_box/c9mm
+ name = "ammo box (9mm)"
+ icon_state = "9mmbox"
+ origin_tech = "combat=2"
+ ammo_type = /obj/item/ammo_casing/c9mm
+ max_ammo = 30
+
+/obj/item/ammo_box/c10mm
+ name = "ammo box (10mm)"
+ icon_state = "10mmbox"
+ origin_tech = "combat=2"
+ ammo_type = /obj/item/ammo_casing/c10mm
+ max_ammo = 20
+
+/obj/item/ammo_box/c45
+ name = "ammo box (.45)"
+ icon_state = "45box"
+ origin_tech = "combat=2"
+ ammo_type = /obj/item/ammo_casing/c45
+ max_ammo = 20
+
+/obj/item/ammo_box/a40mm
+ name = "ammo box (40mm grenades)"
+ icon_state = "40mm"
+ ammo_type = /obj/item/ammo_casing/a40mm
+ max_ammo = 4
+ multiple_sprites = 1
+
+/obj/item/ammo_box/a762
+ name = "stripper clip (7.62mm)"
+ desc = "A stripper clip."
+ icon_state = "762"
+ ammo_type = /obj/item/ammo_casing/a762
+ max_ammo = 5
+ multiple_sprites = 1
+
+/obj/item/ammo_box/n762
+ name = "ammo box (7.62x38mmR)"
+ icon_state = "10mmbox"
+ origin_tech = "combat=2"
+ ammo_type = /obj/item/ammo_casing/n762
+ max_ammo = 14
+
+/obj/item/ammo_box/foambox
+ name = "ammo box (Foam Darts)"
+ icon = 'icons/obj/guns/toy.dmi'
+ icon_state = "foambox"
+ ammo_type = /obj/item/ammo_casing/caseless/foam_dart
+ max_ammo = 40
+
+/obj/item/ammo_box/foambox/riot
+ icon_state = "foambox_riot"
+ ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
\ No newline at end of file
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
new file mode 100644
index 0000000000..de2420149a
--- /dev/null
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -0,0 +1,499 @@
+////////////////INTERNAL MAGAZINES//////////////////////
+
+/obj/item/ammo_box/magazine/internal
+ desc = "Oh god, this shouldn't be here"
+
+//internals magazines are accessible, so replace spent ammo if full when trying to put a live one in
+/obj/item/ammo_box/magazine/internal/give_round(obj/item/ammo_casing/R)
+ return ..(R,1)
+
+
+
+// Revolver internal mags
+/obj/item/ammo_box/magazine/internal/cylinder
+ name = "revolver cylinder"
+ ammo_type = /obj/item/ammo_casing/a357
+ caliber = "357"
+ max_ammo = 7
+
+/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(countempties = 1)
+ var/boolets = 0
+ for(var/obj/item/ammo_casing/bullet in stored_ammo)
+ if(bullet && (bullet.BB || countempties))
+ boolets++
+
+ return boolets
+
+/obj/item/ammo_box/magazine/internal/cylinder/get_round(keep = 0)
+ rotate()
+
+ var/b = stored_ammo[1]
+ if(!keep)
+ stored_ammo[1] = null
+
+ return b
+
+/obj/item/ammo_box/magazine/internal/cylinder/proc/rotate()
+ var/b = stored_ammo[1]
+ stored_ammo.Cut(1,2)
+ stored_ammo.Insert(0, b)
+
+/obj/item/ammo_box/magazine/internal/cylinder/proc/spin()
+ for(var/i in 1 to rand(0, max_ammo*2))
+ rotate()
+
+
+/obj/item/ammo_box/magazine/internal/cylinder/give_round(obj/item/ammo_casing/R, replace_spent = 0)
+ if(!R || (caliber && R.caliber != caliber) || (!caliber && R.type != ammo_type))
+ return 0
+
+ for(var/i in 1 to stored_ammo.len)
+ var/obj/item/ammo_casing/bullet = stored_ammo[i]
+ if(!bullet || !bullet.BB) // found a spent ammo
+ stored_ammo[i] = R
+ R.loc = src
+
+ if(bullet)
+ bullet.loc = get_turf(src.loc)
+ return 1
+
+ return 0
+
+/obj/item/ammo_box/magazine/internal/cylinder/rev38
+ name = "detective revolver cylinder"
+ ammo_type = /obj/item/ammo_casing/c38
+ caliber = "38"
+ max_ammo = 6
+
+/obj/item/ammo_box/magazine/internal/cylinder/grenademulti
+ name = "grenade launcher internal magazine"
+ ammo_type = /obj/item/ammo_casing/a40mm
+ caliber = "40mm"
+ max_ammo = 6
+
+/obj/item/ammo_box/magazine/internal/cylinder/rev762
+ name = "nagant revolver cylinder"
+ ammo_type = /obj/item/ammo_casing/n762
+ caliber = "n762"
+ max_ammo = 7
+
+// Shotgun internal mags
+/obj/item/ammo_box/magazine/internal/shot
+ name = "shotgun internal magazine"
+ ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+ caliber = "shotgun"
+ max_ammo = 4
+ multiload = 0
+
+/obj/item/ammo_box/magazine/internal/shot/ammo_count(countempties = 1)
+ if (!countempties)
+ var/boolets = 0
+ for(var/obj/item/ammo_casing/bullet in stored_ammo)
+ if(bullet.BB)
+ boolets++
+ return boolets
+ else
+ return ..()
+
+
+/obj/item/ammo_box/magazine/internal/shot/tube
+ name = "dual feed shotgun internal tube"
+ ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
+ max_ammo = 4
+
+/obj/item/ammo_box/magazine/internal/shot/lethal
+ ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+
+/obj/item/ammo_box/magazine/internal/shot/com
+ name = "combat shotgun internal magazine"
+ ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+ max_ammo = 6
+
+/obj/item/ammo_box/magazine/internal/shot/dual
+ name = "double-barrel shotgun internal magazine"
+ max_ammo = 2
+
+/obj/item/ammo_box/magazine/internal/shot/improvised
+ name = "improvised shotgun internal magazine"
+ ammo_type = /obj/item/ammo_casing/shotgun/improvised
+ max_ammo = 1
+
+/obj/item/ammo_box/magazine/internal/shot/riot
+ name = "riot shotgun internal magazine"
+ ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
+ max_ammo = 6
+
+
+
+
+/obj/item/ammo_box/magazine/internal/grenadelauncher
+ name = "grenade launcher internal magazine"
+ ammo_type = /obj/item/ammo_casing/a40mm
+ caliber = "40mm"
+ max_ammo = 1
+
+/obj/item/ammo_box/magazine/internal/speargun
+ name = "speargun internal magazine"
+ ammo_type = /obj/item/ammo_casing/caseless/magspear
+ caliber = "speargun"
+ max_ammo = 1
+
+/obj/item/ammo_box/magazine/internal/rus357
+ name = "russian revolver cylinder"
+ ammo_type = /obj/item/ammo_casing/a357
+ caliber = "357"
+ max_ammo = 6
+ multiload = 0
+
+/obj/item/ammo_box/magazine/internal/rus357/New()
+ stored_ammo += new ammo_type(src)
+
+/obj/item/ammo_box/magazine/internal/boltaction
+ name = "bolt action rifle internal magazine"
+ desc = "Oh god, this shouldn't be here"
+ ammo_type = /obj/item/ammo_casing/a762
+ caliber = "a762"
+ max_ammo = 5
+ multiload = 1
+
+/obj/item/ammo_box/magazine/internal/boltaction/enchanted
+ max_ammo =1
+ ammo_type = /obj/item/ammo_casing/a762/enchanted
+
+
+/obj/item/ammo_box/magazine/internal/shot/toy
+ ammo_type = /obj/item/ammo_casing/caseless/foam_dart
+ caliber = "foam_force"
+ max_ammo = 4
+
+/obj/item/ammo_box/magazine/internal/shot/toy/crossbow
+ max_ammo = 5
+
+/obj/item/ammo_box/magazine/internal/minigun
+ name = "gatling gun fusion core"
+ ammo_type = /obj/item/ammo_casing/caseless/laser/gatling
+ caliber = "gatling"
+ max_ammo = 5000
+
+
+
+///////////EXTERNAL MAGAZINES////////////////
+
+/obj/item/ammo_box/magazine/m10mm
+ name = "pistol magazine (10mm)"
+ desc = "A gun magazine."
+ icon_state = "9x19p"
+ origin_tech = "combat=2"
+ ammo_type = /obj/item/ammo_casing/c10mm
+ caliber = "10mm"
+ max_ammo = 8
+ multiple_sprites = 2
+
+/obj/item/ammo_box/magazine/m45
+ name = "handgun magazine (.45)"
+ icon_state = "45-8"
+ ammo_type = /obj/item/ammo_casing/c45
+ caliber = ".45"
+ max_ammo = 8
+
+/obj/item/ammo_box/magazine/m45/update_icon()
+ ..()
+ icon_state = "45-[ammo_count() ? "8" : "0"]"
+
+/obj/item/ammo_box/magazine/wt550m9
+ name = "wt550 magazine (4.6x30mm)"
+ icon_state = "46x30mmt-20"
+ ammo_type = /obj/item/ammo_casing/c46x30mm
+ caliber = "4.6x30mm"
+ max_ammo = 20
+
+/obj/item/ammo_box/magazine/wt550m9/update_icon()
+ ..()
+ icon_state = "46x30mmt-[round(ammo_count(),4)]"
+
+/obj/item/ammo_box/magazine/wt550m9/wtap
+ name = "wt550 magazine (Armour Piercing 4.6x30mm)"
+ ammo_type = /obj/item/ammo_casing/c46x30mmap
+
+/obj/item/ammo_box/magazine/wt550m9/wttx
+ name = "wt550 magazine (Toxin Tipped 4.6x30mm)"
+ ammo_type = /obj/item/ammo_casing/c46x30mmtox
+
+/obj/item/ammo_box/magazine/wt550m9/wtic
+ name = "wt550 magazine (Incindiary 4.6x30mm)"
+ ammo_type = /obj/item/ammo_casing/c46x30mminc
+
+/obj/item/ammo_box/magazine/uzim9mm
+ name = "uzi magazine (9mm)"
+ icon_state = "uzi9mm-32"
+ ammo_type = /obj/item/ammo_casing/c9mm
+ caliber = "9mm"
+ max_ammo = 32
+
+/obj/item/ammo_box/magazine/uzim9mm/update_icon()
+ ..()
+ icon_state = "uzi9mm-[round(ammo_count(),4)]"
+
+/obj/item/ammo_box/magazine/smgm9mm
+ name = "SMG magazine (9mm)"
+ icon_state = "smg9mm-42"
+ ammo_type = /obj/item/ammo_casing/c9mm
+ caliber = "9mm"
+ max_ammo = 21
+
+/obj/item/ammo_box/magazine/smgm9mm/update_icon()
+ ..()
+ icon_state = "smg9mm-[ammo_count() ? "42" : "0"]"
+
+/obj/item/ammo_box/magazine/smgm9mm/ap
+ name = "SMG magazine (Armour Piercing 9mm)"
+ ammo_type = /obj/item/ammo_casing/c9mmap
+
+/obj/item/ammo_box/magazine/smgm9mm/toxin
+ name = "SMG magazine (Toxin Tipped 9mm)"
+ ammo_type = /obj/item/ammo_casing/c9mmtox
+
+/obj/item/ammo_box/magazine/smgm9mm/fire
+ name = "SMG Magazine (Incindiary 9mm)"
+ ammo_type = /obj/item/ammo_casing/c9mminc
+
+/obj/item/ammo_box/magazine/pistolm9mm
+ name = "pistol magazine (9mm)"
+ icon_state = "9x19p-8"
+ ammo_type = /obj/item/ammo_casing/c9mm
+ caliber = "9mm"
+ max_ammo = 15
+
+/obj/item/ammo_box/magazine/pistolm9mm/update_icon()
+ ..()
+ icon_state = "9x19p-[ammo_count() ? "8" : "0"]"
+
+/obj/item/ammo_box/magazine/smgm45
+ name = "SMG magazine (.45)"
+ icon_state = "c20r45-24"
+ origin_tech = "combat=2"
+ ammo_type = /obj/item/ammo_casing/c45nostamina
+ caliber = ".45"
+ max_ammo = 24
+
+/obj/item/ammo_box/magazine/smgm45/update_icon()
+ ..()
+ icon_state = "c20r45-[round(ammo_count(),2)]"
+
+obj/item/ammo_box/magazine/tommygunm45
+ name = "drum magazine (.45)"
+ icon_state = "drum45"
+ ammo_type = /obj/item/ammo_casing/c45
+ caliber = ".45"
+ max_ammo = 50
+
+/obj/item/ammo_box/magazine/m50
+ name = "handgun magazine (.50ae)"
+ icon_state = "50ae"
+ origin_tech = "combat=2"
+ ammo_type = /obj/item/ammo_casing/a50
+ caliber = ".50"
+ max_ammo = 7
+ multiple_sprites = 1
+
+/obj/item/ammo_box/magazine/m75
+ name = "specialized magazine (.75)"
+ icon_state = "75"
+ ammo_type = /obj/item/ammo_casing/caseless/a75
+ caliber = "75"
+ multiple_sprites = 2
+ max_ammo = 8
+
+/obj/item/ammo_box/magazine/m556
+ name = "toploader magazine (5.56mm)"
+ icon_state = "5.56m"
+ origin_tech = "combat=5;syndicate=1"
+ ammo_type = /obj/item/ammo_casing/a556
+ caliber = "a556"
+ max_ammo = 30
+ multiple_sprites = 2
+
+/obj/item/ammo_box/magazine/m12g
+ name = "shotgun magazine (12g taser slugs)"
+ desc = "A drum magazine."
+ icon_state = "m12gs"
+ ammo_type = /obj/item/ammo_casing/shotgun/stunslug
+ origin_tech = "combat=3;syndicate=1"
+ caliber = "shotgun"
+ max_ammo = 8
+
+/obj/item/ammo_box/magazine/m12g/update_icon()
+ ..()
+ icon_state = "[initial(icon_state)]-[Ceiling(ammo_count(0)/8)*8]"
+
+/obj/item/ammo_box/magazine/m12g/buckshot
+ name = "shotgun magazine (12g buckshot slugs)"
+ icon_state = "m12gb"
+ ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+
+/obj/item/ammo_box/magazine/m12g/slug
+ name = "shotgun magazine (12g slugs)"
+ icon_state = "m12gb"
+ ammo_type = /obj/item/ammo_casing/shotgun
+
+/obj/item/ammo_box/magazine/m12g/dragon
+ name = "shotgun magazine (12g dragon's breath)"
+ icon_state = "m12gf"
+ ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
+
+/obj/item/ammo_box/magazine/m12g/bioterror
+ name = "shotgun magazine (12g bioterror)"
+ icon_state = "m12gt"
+ ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror
+
+/obj/item/ammo_box/magazine/m12g/breach
+ name = "shotgun magazine (12g breacher slugs)"
+ icon_state = "m12gbc"
+ ammo_type = /obj/item/ammo_casing/shotgun/breaching
+
+
+//// SNIPER MAGAZINES
+
+/obj/item/ammo_box/magazine/sniper_rounds
+ name = "sniper rounds (.50)"
+ icon_state = ".50mag"
+ origin_tech = "combat=6;syndicate=2"
+ ammo_type = /obj/item/ammo_casing/point50
+ max_ammo = 6
+ caliber = ".50"
+
+/obj/item/ammo_box/magazine/sniper_rounds/update_icon()
+ if(ammo_count())
+ icon_state = "[initial(icon_state)]-ammo"
+ else
+ icon_state = "[initial(icon_state)]"
+
+/obj/item/ammo_box/magazine/sniper_rounds/soporific
+ name = "sniper rounds (Zzzzz)"
+ desc = "Soporific sniper rounds, designed for happy days and dead quiet nights..."
+ icon_state = "soporific"
+ origin_tech = "combat=6;syndicate=3"
+ ammo_type = /obj/item/ammo_casing/soporific
+ max_ammo = 3
+ caliber = ".50"
+
+/obj/item/ammo_box/magazine/sniper_rounds/haemorrhage
+ name = "sniper rounds (Bleed)"
+ desc = "Haemorrhage sniper rounds, leaves your target in a pool of crimson pain"
+ icon_state = "haemorrhage"
+ ammo_type = /obj/item/ammo_casing/haemorrhage
+ max_ammo = 5
+ caliber = ".50"
+
+/obj/item/ammo_box/magazine/sniper_rounds/penetrator
+ name = "sniper rounds (penetrator)"
+ desc = "An extremely powerful round capable of passing straight through cover and anyone unfortunate enough to be behind it."
+ ammo_type = /obj/item/ammo_casing/penetrator
+ origin_tech = "combat=6;syndicate=3"
+ max_ammo = 5
+
+
+//// SAW MAGAZINES
+
+/obj/item/ammo_box/magazine/mm556x45
+ name = "box magazine (5.56x45mm)"
+ icon_state = "a762-50"
+ origin_tech = "combat=2"
+ ammo_type = /obj/item/ammo_casing/mm556x45
+ caliber = "mm55645"
+ max_ammo = 50
+
+/obj/item/ammo_box/magazine/mm556x45/bleeding
+ name = "box magazine (Bleeding 5.56x45mm)"
+ origin_tech = "combat=3"
+ ammo_type = /obj/item/ammo_casing/mm556x45/bleeding
+
+/obj/item/ammo_box/magazine/mm556x45/hollow
+ name = "box magazine (Hollow-Point 5.56x45mm)"
+ origin_tech = "combat=3"
+ ammo_type = /obj/item/ammo_casing/mm556x45/hollow
+
+/obj/item/ammo_box/magazine/mm556x45/ap
+ name = "box magazine (Armor Penetrating 5.56x45mm)"
+ origin_tech = "combat=4"
+ ammo_type = /obj/item/ammo_casing/mm556x45/ap
+
+/obj/item/ammo_box/magazine/mm556x45/incen
+ name = "box magazine (Incendiary 5.56x45mm)"
+ origin_tech = "combat=4"
+ ammo_type = /obj/item/ammo_casing/mm556x45/incen
+
+/obj/item/ammo_box/magazine/mm556x45/update_icon()
+ ..()
+ icon_state = "a762-[round(ammo_count(),10)]"
+
+
+
+
+////TOY GUN MAGAZINES
+
+/obj/item/ammo_box/magazine/toy
+ name = "foam force META magazine"
+ ammo_type = /obj/item/ammo_casing/caseless/foam_dart
+ caliber = "foam_force"
+
+/obj/item/ammo_box/magazine/toy/smg
+ name = "foam force SMG magazine"
+ icon_state = "smg9mm-20"
+ max_ammo = 20
+
+/obj/item/ammo_box/magazine/toy/smg/update_icon()
+ ..()
+ icon_state = "smg9mm-[round(ammo_count(),5)]"
+
+/obj/item/ammo_box/magazine/toy/smg/riot
+ ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+
+/obj/item/ammo_box/magazine/toy/pistol
+ name = "foam force pistol magazine"
+ icon_state = "9x19p"
+ max_ammo = 8
+ multiple_sprites = 2
+
+/obj/item/ammo_box/magazine/toy/pistol/riot
+ ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+
+/obj/item/ammo_box/magazine/toy/smgm45
+ name = "donksoft SMG magazine"
+ caliber = "foam_force"
+ ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+ max_ammo = 20
+
+/obj/item/ammo_box/magazine/toy/smgm45/update_icon()
+ ..()
+ icon_state = "c20r45-[round(ammo_count(),2)]"
+
+/obj/item/ammo_box/magazine/toy/m762
+ name = "donksoft box magazine"
+ caliber = "foam_force"
+ ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+ max_ammo = 50
+
+/obj/item/ammo_box/magazine/toy/m762/update_icon()
+ ..()
+ icon_state = "a762-[round(ammo_count(),10)]"
+
+
+
+
+//// RECHARGEABLE MAGAZINES
+
+/obj/item/ammo_box/magazine/recharge
+ name = "power pack"
+ desc = "A rechargeable, detachable battery that serves as a magazine for laser rifles."
+ icon_state = "oldrifle-20"
+ ammo_type = /obj/item/ammo_casing/caseless/laser
+ caliber = "laser"
+ max_ammo = 20
+
+/obj/item/ammo_box/magazine/recharge/update_icon()
+ desc = "[initial(desc)] It has [stored_ammo.len] shot\s left."
+ icon_state = "oldrifle-[round(ammo_count(),4)]"
+
+/obj/item/ammo_box/magazine/recharge/attack_self() //No popping out the "bullets"
+ return
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
new file mode 100644
index 0000000000..0c0bfb227d
--- /dev/null
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -0,0 +1,81 @@
+/obj/item/weapon/gun/energy/gun
+ name = "energy gun"
+ desc = "A basic hybrid energy gun with two settings: disable and kill."
+ icon_state = "energy"
+ item_state = null //so the human update icon uses the icon_state instead.
+ ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
+ origin_tech = "combat=4;magnets=3"
+ modifystate = 2
+ can_flashlight = 1
+ ammo_x_offset = 3
+ flight_x_offset = 15
+ flight_y_offset = 10
+
+/obj/item/weapon/gun/energy/gun/mini
+ name = "miniature energy gun"
+ desc = "A small, pistol-sized energy gun with a built-in flashlight. It has two settings: stun and kill."
+ icon_state = "mini"
+ item_state = "gun"
+ w_class = 2
+ cell_type = /obj/item/weapon/stock_parts/cell{charge = 600; maxcharge = 600}
+ ammo_x_offset = 2
+ charge_sections = 3
+ can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
+
+/obj/item/weapon/gun/energy/gun/mini/New()
+ F = new /obj/item/device/flashlight/seclite(src)
+ ..()
+
+/obj/item/weapon/gun/energy/gun/mini/update_icon()
+ ..()
+ if(F && F.on)
+ add_overlay("mini-light")
+
+/obj/item/weapon/gun/energy/gun/hos
+ name = "\improper X-01 MultiPhase Energy Gun"
+ desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
+ icon_state = "hoslaser"
+ origin_tech = null
+ 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 = "\improper DRAGnet"
+ desc = "The \"Dynamic Rapid-Apprehension of the Guilty\" net is a revolution in law enforcement technology."
+ icon_state = "dragnet"
+ origin_tech = "combat=4;magnets=3;bluespace=4"
+ ammo_type = list(/obj/item/ammo_casing/energy/net, /obj/item/ammo_casing/energy/trap)
+ can_flashlight = 0
+ ammo_x_offset = 1
+
+/obj/item/weapon/gun/energy/gun/dragnet/snare
+ name = "Energy Snare Launcher"
+ desc = "Fires an energy snare that slows the target down"
+ ammo_type = list(/obj/item/ammo_casing/energy/trap)
+
+/obj/item/weapon/gun/energy/gun/turret
+ name = "hybrid turret gun"
+ desc = "A heavy hybrid energy cannon with two settings: Stun and kill."
+ icon_state = "turretlaser"
+ item_state = "turretlaser"
+ slot_flags = null
+ w_class = 5
+ ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
+ weapon_weight = WEAPON_MEDIUM
+ can_flashlight = 0
+ trigger_guard = TRIGGER_GUARD_NONE
+ ammo_x_offset = 2
+
+/obj/item/weapon/gun/energy/gun/nuclear
+ name = "advanced energy gun"
+ desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell."
+ icon_state = "nucgun"
+ item_state = "nucgun"
+ origin_tech = "combat=4;magnets=4;powerstorage=4"
+ charge_delay = 5
+ pin = null
+ can_charge = 0
+ ammo_x_offset = 1
+ ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler)
+ selfcharge = 1
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
new file mode 100644
index 0000000000..adea212aa6
--- /dev/null
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -0,0 +1,208 @@
+/obj/item/weapon/gun/projectile
+ desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason"
+ name = "projectile gun"
+ icon_state = "pistol"
+ origin_tech = "combat=2;materials=2"
+ w_class = 3
+
+ var/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info
+ var/obj/item/ammo_box/magazine/magazine
+
+/obj/item/weapon/gun/projectile/New()
+ ..()
+ if (!magazine)
+ magazine = new mag_type(src)
+ chamber_round()
+ update_icon()
+
+/obj/item/weapon/gun/projectile/update_icon()
+ ..()
+ if(current_skin)
+ icon_state = "[current_skin][suppressed ? "-suppressed" : ""][sawn_state ? "-sawn" : ""]"
+ else
+ icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""][sawn_state ? "-sawn" : ""]"
+
+
+/obj/item/weapon/gun/projectile/process_chamber(eject_casing = 1, empty_chamber = 1)
+// if(in_chamber)
+// return 1
+ var/obj/item/ammo_casing/AC = chambered //Find chambered round
+ if(isnull(AC) || !istype(AC))
+ chamber_round()
+ return
+ if(eject_casing)
+ AC.loc = get_turf(src) //Eject casing onto ground.
+ AC.SpinAnimation(10, 1) //next gen special effects
+
+ if(empty_chamber)
+ chambered = null
+ chamber_round()
+ return
+
+/obj/item/weapon/gun/projectile/proc/chamber_round()
+ if (chambered || !magazine)
+ return
+ else if (magazine.ammo_count())
+ chambered = magazine.get_round()
+ chambered.loc = src
+ return
+
+/obj/item/weapon/gun/projectile/can_shoot()
+ if(!magazine || !magazine.ammo_count(0))
+ return 0
+ return 1
+
+/obj/item/weapon/gun/projectile/attackby(obj/item/A, mob/user, params)
+ ..()
+ if (istype(A, /obj/item/ammo_box/magazine))
+ var/obj/item/ammo_box/magazine/AM = A
+ if (!magazine && istype(AM, mag_type))
+ user.remove_from_mob(AM)
+ magazine = AM
+ magazine.loc = src
+ user << "You load a new magazine into \the [src]."
+ chamber_round()
+ A.update_icon()
+ update_icon()
+ return 1
+ else if (magazine)
+ user << "There's already a magazine in \the [src]."
+ if(istype(A, /obj/item/weapon/suppressor))
+ var/obj/item/weapon/suppressor/S = A
+ if(can_suppress)
+ if(!suppressed)
+ if(!user.unEquip(A))
+ return
+ user << "You screw [S] onto [src]."
+ suppressed = A
+ S.oldsound = fire_sound
+ S.initial_w_class = w_class
+ fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
+ w_class = 3 //so pistols do not fit in pockets when suppressed
+ A.loc = src
+ update_icon()
+ return
+ else
+ user << "[src] already has a suppressor!"
+ return
+ else
+ user << "You can't seem to figure out how to fit [S] on [src]!"
+ return
+ return 0
+
+/obj/item/weapon/gun/projectile/attack_hand(mob/user)
+ if(loc == user)
+ if(suppressed && can_unsuppress)
+ var/obj/item/weapon/suppressor/S = suppressed
+ if(user.l_hand != src && user.r_hand != src)
+ ..()
+ return
+ user << "You unscrew [suppressed] from [src]."
+ user.put_in_hands(suppressed)
+ fire_sound = S.oldsound
+ w_class = S.initial_w_class
+ suppressed = 0
+ update_icon()
+ return
+ ..()
+
+/obj/item/weapon/gun/projectile/attack_self(mob/living/user)
+ var/obj/item/ammo_casing/AC = chambered //Find chambered round
+ if(magazine)
+ magazine.loc = get_turf(src.loc)
+ user.put_in_hands(magazine)
+ magazine.update_icon()
+ magazine = null
+ user << "You pull the magazine out of \the [src]."
+ else if(chambered)
+ AC.loc = get_turf(src)
+ AC.SpinAnimation(10, 1)
+ chambered = null
+ user << "You unload the round from \the [src]'s chamber."
+ else
+ user << "There's no magazine in \the [src]."
+ update_icon()
+ return
+
+
+/obj/item/weapon/gun/projectile/examine(mob/user)
+ ..()
+ user << "Has [get_ammo()] round\s remaining."
+
+/obj/item/weapon/gun/projectile/proc/get_ammo(countchambered = 1)
+ var/boolets = 0 //mature var names for mature people
+ if (chambered && countchambered)
+ boolets++
+ if (magazine)
+ boolets += magazine.ammo_count()
+ return boolets
+
+/obj/item/weapon/gun/projectile/suicide_act(mob/user)
+ if (src.chambered && src.chambered.BB && !src.chambered.BB.nodamage)
+ user.visible_message("[user] is putting the barrel of the [src.name] in \his mouth. It looks like \he's trying to commit suicide.")
+ sleep(25)
+ if(user.l_hand == src || user.r_hand == src)
+ process_fire(user, user, 0, zone_override = "head")
+ user.visible_message("[user] blows \his brains out with the [src.name]!")
+ return(BRUTELOSS)
+ else
+ user.visible_message("[user] panics and starts choking to death!")
+ return(OXYLOSS)
+ else
+ user.visible_message("[user] is pretending to blow \his brains out with the [src.name]! It looks like \he's trying to commit suicide!")
+ playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
+ return (OXYLOSS)
+
+
+
+/obj/item/weapon/gun/projectile/proc/sawoff(mob/user)
+ if(sawn_state == SAWN_OFF)
+ user << "\The [src] is already shortened!"
+ return
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.visible_message("[user] begins to shorten \the [src].", "You begin to shorten \the [src]...")
+
+ //if there's any live ammo inside the gun, makes it go off
+ if(blow_up(user))
+ user.visible_message("\The [src] goes off!", "\The [src] goes off in your face!")
+ return
+
+ if(do_after(user, 30, target = src))
+ if(sawn_state == SAWN_OFF)
+ return
+ user.visible_message("[user] shortens \the [src]!", "You shorten \the [src].")
+ name = "sawn-off [src.name]"
+ desc = sawn_desc
+ w_class = 3
+ item_state = "gun"//phil235 is it different with different skin?
+ slot_flags &= ~SLOT_BACK //you can't sling it on your back
+ slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
+ sawn_state = SAWN_OFF
+ update_icon()
+ return 1
+
+// Sawing guns related proc
+/obj/item/weapon/gun/projectile/proc/blow_up(mob/user)
+ . = 0
+ for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
+ if(AC.BB)
+ process_fire(user, user,0)
+ . = 1
+
+
+/obj/item/weapon/suppressor
+ name = "suppressor"
+ desc = "A universal syndicate small-arms suppressor for maximum espionage."
+ icon = 'icons/obj/guns/projectile.dmi'
+ icon_state = "suppressor"
+ w_class = 2
+ var/oldsound = null
+ var/initial_w_class = null
+
+
+/obj/item/weapon/suppressor/specialoffer
+ name = "cheap suppressor"
+ desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits all weapons."
+ icon = 'icons/obj/guns/projectile.dmi'
+ icon_state = "suppressor"
+
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
new file mode 100644
index 0000000000..feea7aa4ea
--- /dev/null
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -0,0 +1,409 @@
+/obj/item/weapon/gun/projectile/automatic
+ origin_tech = "combat=4;materials=2"
+ w_class = 3
+ var/alarmed = 0
+ var/select = 1
+ can_suppress = 1
+ burst_size = 3
+ fire_delay = 2
+ actions_types = list(/datum/action/item_action/toggle_firemode)
+
+/obj/item/weapon/gun/projectile/automatic/proto
+ name = "\improper NanoTrasen Saber SMG"
+ desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
+ icon_state = "saber"
+ mag_type = /obj/item/ammo_box/magazine/smgm9mm
+ pin = null
+
+/obj/item/weapon/gun/projectile/automatic/proto/unrestricted
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/update_icon()
+ ..()
+ cut_overlays()
+ if(!select)
+ add_overlay("[initial(icon_state)]semi")
+ if(select == 1)
+ add_overlay("[initial(icon_state)]burst")
+ icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
+
+/obj/item/weapon/gun/projectile/automatic/attackby(obj/item/A, mob/user, params)
+ . = ..()
+ if(.)
+ return
+ if(istype(A, /obj/item/ammo_box/magazine))
+ var/obj/item/ammo_box/magazine/AM = A
+ if(istype(AM, mag_type))
+ if(magazine)
+ user << "You perform a tactical reload on \the [src], replacing the magazine."
+ magazine.loc = get_turf(src.loc)
+ magazine.update_icon()
+ magazine = null
+ else
+ user << "You insert the magazine into \the [src]."
+ user.remove_from_mob(AM)
+ magazine = AM
+ magazine.loc = src
+ chamber_round()
+ A.update_icon()
+ update_icon()
+ return 1
+
+/obj/item/weapon/gun/projectile/automatic/ui_action_click()
+ burst_select()
+
+/obj/item/weapon/gun/projectile/automatic/proc/burst_select()
+ var/mob/living/carbon/human/user = usr
+ select = !select
+ if(!select)
+ burst_size = 1
+ fire_delay = 0
+ user << "You switch to semi-automatic."
+ else
+ burst_size = initial(burst_size)
+ fire_delay = initial(fire_delay)
+ user << "You switch to [burst_size]-rnd burst."
+
+ playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+ update_icon()
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
+
+/obj/item/weapon/gun/projectile/automatic/can_shoot()
+ return get_ammo()
+
+/obj/item/weapon/gun/projectile/automatic/proc/empty_alarm()
+ if(!chambered && !get_ammo() && !alarmed)
+ playsound(src.loc, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
+ update_icon()
+ alarmed = 1
+ return
+
+/obj/item/weapon/gun/projectile/automatic/c20r
+ name = "\improper C-20r SMG"
+ desc = "A bullpup two-round burst .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
+ icon_state = "c20r"
+ item_state = "c20r"
+ origin_tech = "combat=5;materials=2;syndicate=6"
+ mag_type = /obj/item/ammo_box/magazine/smgm45
+ fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+ fire_delay = 2
+ burst_size = 2
+ pin = /obj/item/device/firing_pin/implant/pindicate
+
+/obj/item/weapon/gun/projectile/automatic/c20r/unrestricted
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/c20r/New()
+ ..()
+ update_icon()
+ return
+
+/obj/item/weapon/gun/projectile/automatic/c20r/afterattack()
+ ..()
+ empty_alarm()
+ return
+
+/obj/item/weapon/gun/projectile/automatic/c20r/update_icon()
+ ..()
+ icon_state = "c20r[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
+
+/obj/item/weapon/gun/projectile/automatic/wt550
+ name = "security auto rifle"
+ desc = "An outdated personal defence weapon. Uses 4.6x30mm rounds and is designated the WT-550 Automatic Rifle."
+ icon_state = "wt550"
+ item_state = "arg"
+ mag_type = /obj/item/ammo_box/magazine/wt550m9
+ fire_delay = 2
+ can_suppress = 0
+ burst_size = 0
+ actions_types = list()
+
+/obj/item/weapon/gun/projectile/automatic/wt550/update_icon()
+ ..()
+ icon_state = "wt550[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""]"
+
+/obj/item/weapon/gun/projectile/automatic/mini_uzi
+ name = "\improper 'Type U3' Uzi"
+ desc = "A lightweight, burst-fire submachine gun, for when you really want someone dead. Uses 9mm rounds."
+ icon_state = "mini-uzi"
+ origin_tech = "combat=4;materials=2;syndicate=4"
+ mag_type = /obj/item/ammo_box/magazine/uzim9mm
+ burst_size = 2
+
+/obj/item/weapon/gun/projectile/automatic/m90
+ name = "\improper M-90gl Carbine"
+ desc = "A three-round burst 5.56 toploading carbine, designated 'M-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
+ icon_state = "m90"
+ item_state = "m90"
+ origin_tech = "combat=5;materials=2;syndicate=6"
+ mag_type = /obj/item/ammo_box/magazine/m556
+ fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+ can_suppress = 0
+ var/obj/item/weapon/gun/projectile/revolver/grenadelauncher/underbarrel
+ burst_size = 3
+ fire_delay = 2
+ pin = /obj/item/device/firing_pin/implant/pindicate
+
+/obj/item/weapon/gun/projectile/automatic/m90/New()
+ ..()
+ underbarrel = new /obj/item/weapon/gun/projectile/revolver/grenadelauncher(src)
+ update_icon()
+ return
+
+/obj/item/weapon/gun/projectile/automatic/m90/unrestricted
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/m90/unrestricted/New()
+ ..()
+ underbarrel = new /obj/item/weapon/gun/projectile/revolver/grenadelauncher/unrestricted(src)
+ update_icon()
+ return
+
+/obj/item/weapon/gun/projectile/automatic/m90/afterattack(atom/target, mob/living/user, flag, params)
+ if(select == 2)
+ underbarrel.afterattack(target, user, flag, params)
+ else
+ ..()
+ return
+/obj/item/weapon/gun/projectile/automatic/m90/attackby(obj/item/A, mob/user, params)
+ if(istype(A, /obj/item/ammo_casing))
+ if(istype(A, underbarrel.magazine.ammo_type))
+ underbarrel.attack_self()
+ underbarrel.attackby(A, user, params)
+ else
+ ..()
+/obj/item/weapon/gun/projectile/automatic/m90/update_icon()
+ ..()
+ cut_overlays()
+ switch(select)
+ if(0)
+ add_overlay("[initial(icon_state)]semi")
+ if(1)
+ add_overlay("[initial(icon_state)]burst")
+ if(2)
+ add_overlay("[initial(icon_state)]gren")
+ icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"
+ return
+/obj/item/weapon/gun/projectile/automatic/m90/burst_select()
+ var/mob/living/carbon/human/user = usr
+ switch(select)
+ if(0)
+ select = 1
+ burst_size = initial(burst_size)
+ fire_delay = initial(fire_delay)
+ user << "You switch to [burst_size]-rnd burst."
+ if(1)
+ select = 2
+ user << "You switch to grenades."
+ if(2)
+ select = 0
+ burst_size = 1
+ fire_delay = 0
+ user << "You switch to semi-auto."
+ playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+ update_icon()
+ return
+
+/obj/item/weapon/gun/projectile/automatic/tommygun
+ name = "\improper Thompson SMG"
+ desc = "Based on the classic 'Chicago Typewriter'."
+ icon_state = "tommygun"
+ item_state = "shotgun"
+ w_class = 5
+ slot_flags = 0
+ origin_tech = "combat=5;materials=1;syndicate=3"
+ mag_type = /obj/item/ammo_box/magazine/tommygunm45
+ fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+ can_suppress = 0
+ burst_size = 4
+ fire_delay = 1
+
+/obj/item/weapon/gun/projectile/automatic/ar
+ name = "\improper NT-ARG 'Boarder'"
+ desc = "A robust assault rile used by Nanotrasen fighting forces."
+ icon_state = "arg"
+ item_state = "arg"
+ slot_flags = 0
+ origin_tech = "combat=6;engineering=4"
+ mag_type = /obj/item/ammo_box/magazine/m556
+ fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+ can_suppress = 0
+ burst_size = 3
+ fire_delay = 1
+
+
+
+// Bulldog shotgun //
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog
+ name = "\improper 'Bulldog' Shotgun"
+ desc = "A semi-auto, mag-fed shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
+ icon_state = "bulldog"
+ item_state = "bulldog"
+ w_class = 3
+ origin_tech = "combat=6;materials=4;syndicate=6"
+ mag_type = /obj/item/ammo_box/magazine/m12g
+ fire_sound = 'sound/weapons/Gunshot.ogg'
+ can_suppress = 0
+ burst_size = 1
+ fire_delay = 0
+ pin = /obj/item/device/firing_pin/implant/pindicate
+ actions_types = list()
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/unrestricted
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/New()
+ ..()
+ update_icon()
+ return
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/proc/update_magazine()
+ if(magazine)
+ src.overlays = 0
+ add_overlay("[magazine.icon_state]")
+ return
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/update_icon()
+ src.overlays = 0
+ update_magazine()
+ icon_state = "bulldog[chambered ? "" : "-e"]"
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/afterattack()
+ ..()
+ empty_alarm()
+ return
+
+
+
+// L6 SAW //
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw
+ name = "\improper L6 SAW"
+ desc = "A heavily modified 5.56x45mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
+ icon_state = "l6closed100"
+ item_state = "l6closedmag"
+ w_class = 5
+ slot_flags = 0
+ origin_tech = "combat=6;engineering=3;syndicate=6"
+ mag_type = /obj/item/ammo_box/magazine/mm556x45
+ weapon_weight = WEAPON_MEDIUM
+ fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+ var/cover_open = 0
+ can_suppress = 0
+ burst_size = 3
+ fire_delay = 1
+ pin = /obj/item/device/firing_pin/implant/pindicate
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/unrestricted
+ pin = /obj/item/device/firing_pin
+
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user)
+ cover_open = !cover_open
+ user << "You [cover_open ? "open" : "close"] [src]'s cover."
+ update_icon()
+
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon()
+ icon_state = "l6[cover_open ? "open" : "closed"][magazine ? Ceiling(get_ammo(0)/12.5)*25 : "-empty"][suppressed ? "-suppressed" : ""]"
+ item_state = "l6[cover_open ? "openmag" : "closedmag"]"
+
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays
+ if(cover_open)
+ user << "[src]'s cover is open! Close it before firing!"
+ else
+ ..()
+ update_icon()
+
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_hand(mob/user)
+ if(loc != user)
+ ..()
+ return //let them pick it up
+ if(!cover_open || (cover_open && !magazine))
+ ..()
+ else if(cover_open && magazine)
+ //drop the mag
+ magazine.update_icon()
+ magazine.loc = get_turf(src.loc)
+ user.put_in_hands(magazine)
+ magazine = null
+ update_icon()
+ user << "You remove the magazine from [src]."
+
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(obj/item/A, mob/user, params)
+ . = ..()
+ if(.)
+ return
+ if(!cover_open)
+ user << "[src]'s cover is closed! You can't insert a new mag."
+ return
+ ..()
+
+
+
+// SNIPER //
+
+/obj/item/weapon/gun/projectile/automatic/sniper_rifle
+ name = "sniper rifle"
+ desc = "The kind of gun that will leave you crying for mummy before you even realise your leg's missing"
+ icon_state = "sniper"
+ item_state = "sniper"
+ recoil = 2
+ weapon_weight = WEAPON_MEDIUM
+ mag_type = /obj/item/ammo_box/magazine/sniper_rounds
+ fire_delay = 40
+ burst_size = 1
+ origin_tech = "combat=7"
+ can_unsuppress = 1
+ can_suppress = 1
+ w_class = 3
+ zoomable = TRUE
+ zoom_amt = 7 //Long range, enough to see in front of you, but no tiles behind you.
+ slot_flags = SLOT_BACK
+ actions_types = list()
+
+
+/obj/item/weapon/gun/projectile/automatic/sniper_rifle/update_icon()
+ if(magazine)
+ icon_state = "sniper-mag"
+ else
+ icon_state = "sniper"
+
+
+/obj/item/weapon/gun/projectile/automatic/sniper_rifle/syndicate
+ name = "syndicate sniper rifle"
+ desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face"
+ pin = /obj/item/device/firing_pin/implant/pindicate
+ origin_tech = "combat=7;syndicate=6"
+
+
+
+
+// Laser rifle (rechargeable magazine) //
+
+/obj/item/weapon/gun/projectile/automatic/laser
+ name = "laser rifle"
+ desc = "Though sometimes mocked for the relatively weak firepower of their energy weapons, the logistic miracle of rechargable ammunition has given Nanotrasen a decisive edge over many a foe."
+ icon_state = "oldrifle"
+ item_state = "arg"
+ mag_type = /obj/item/ammo_box/magazine/recharge
+ fire_delay = 2
+ can_suppress = 0
+ burst_size = 0
+ actions_types = list()
+ fire_sound = 'sound/weapons/Laser.ogg'
+
+/obj/item/weapon/gun/projectile/automatic/laser/process_chamber(eject_casing = 0, empty_chamber = 1)
+ ..() //we changed the default value of the first argument
+
+
+/obj/item/weapon/gun/projectile/automatic/laser/update_icon()
+ ..()
+ icon_state = "oldrifle[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""]"
+ return
diff --git a/code/modules/projectiles/guns/projectile/laser_gatling.dm b/code/modules/projectiles/guns/projectile/laser_gatling.dm
new file mode 100644
index 0000000000..ea19220600
--- /dev/null
+++ b/code/modules/projectiles/guns/projectile/laser_gatling.dm
@@ -0,0 +1,153 @@
+
+
+//The ammo/gun is stored in a back slot item
+/obj/item/weapon/minigunpack
+ name = "backpack power source"
+ desc = "The massive external power source for the laser gatling gun"
+ icon = 'icons/obj/guns/minigun.dmi'
+ icon_state = "holstered"
+ item_state = "backpack"
+ slot_flags = SLOT_BACK
+ w_class = 5
+ var/obj/item/weapon/gun/projectile/minigun/gun = null
+ var/armed = 0 //whether the gun is attached, 0 is attached, 1 is the gun is wielded.
+ var/overheat = 0
+ var/overheat_max = 40
+ var/heat_diffusion = 1
+
+/obj/item/weapon/minigunpack/New()
+ gun = new(src)
+ START_PROCESSING(SSobj, src)
+ ..()
+
+/obj/item/weapon/minigunpack/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ ..()
+
+/obj/item/weapon/minigunpack/process()
+ overheat = max(0, overheat - heat_diffusion)
+
+/obj/item/weapon/minigunpack/attack_hand(var/mob/living/carbon/user)
+ if(src.loc == user)
+ if(!armed)
+ if(user.get_item_by_slot(slot_back) == src)
+ armed = 1
+ if(!user.put_in_hands(gun))
+ armed = 0
+ user << "You need a free hand to hold the gun!"
+ return
+ update_icon()
+ gun.forceMove(user)
+ user.update_inv_back()
+ else
+ user << "You are already holding the gun!"
+ else
+ ..()
+
+/obj/item/weapon/minigunpack/attackby(obj/item/weapon/W, mob/user, params)
+ if(W == gun) //Don't need armed check, because if you have the gun assume its armed.
+ user.unEquip(gun,1)
+ else
+ ..()
+
+/obj/item/weapon/minigunpack/dropped(mob/user)
+ if(armed)
+ user.unEquip(gun,1)
+
+/obj/item/weapon/minigunpack/MouseDrop(atom/over_object)
+ if(armed)
+ return
+ if(iscarbon(usr))
+ var/mob/M = usr
+
+ if(!over_object)
+ return
+
+ if(!M.restrained() && !M.stat)
+
+ if(istype(over_object, /obj/screen/inventory/hand))
+ var/obj/screen/inventory/hand/H = over_object
+ if(!M.unEquip(src))
+ return
+ switch(H.slot_id)
+ if(slot_r_hand)
+ M.put_in_r_hand(src)
+ if(slot_l_hand)
+ M.put_in_l_hand(src)
+
+
+/obj/item/weapon/minigunpack/update_icon()
+ if(armed)
+ icon_state = "notholstered"
+ else
+ icon_state = "holstered"
+
+/obj/item/weapon/minigunpack/proc/attach_gun(var/mob/user)
+ if(!gun)
+ gun = new(src)
+ gun.forceMove(src)
+ armed = 0
+ if(user)
+ user << "You attach the [gun.name] to the [name]."
+ else
+ src.visible_message("The [gun.name] snaps back onto the [name]!")
+ update_icon()
+ user.update_inv_back()
+
+
+/obj/item/weapon/gun/projectile/minigun
+ name = "laser gatling gun"
+ desc = "An advanced laser cannon with an incredible rate of fire. Requires a bulky backpack power source to use."
+ icon = 'icons/obj/guns/minigun.dmi'
+ icon_state = "minigun_spin"
+ item_state = "minigun"
+ origin_tech = "combat=6;powerstorage=5;magnets=4"
+ flags = CONDUCT | HANDSLOW
+ slowdown = 1
+ slot_flags = null
+ w_class = 5
+ materials = list()
+ burst_size = 3
+ automatic = 0
+ fire_delay = 1
+ weapon_weight = WEAPON_HEAVY
+ fire_sound = 'sound/weapons/Laser.ogg'
+ mag_type = /obj/item/ammo_box/magazine/internal/minigun
+ var/obj/item/weapon/minigunpack/ammo_pack
+
+/obj/item/weapon/gun/projectile/minigun/attack_self(mob/living/user)
+ return
+
+/obj/item/weapon/gun/projectile/minigun/dropped(mob/user)
+ if(ammo_pack)
+ ammo_pack.attach_gun(user)
+ else
+ qdel(src)
+
+/obj/item/weapon/gun/projectile/minigun/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1)
+ if(ammo_pack)
+ if(ammo_pack.overheat < ammo_pack.overheat_max)
+ . = ..()
+ ammo_pack.overheat++
+ else
+ user << "The gun's heat sensor locked the trigger to prevent lens damage."
+
+/obj/item/weapon/gun/projectile/minigun/afterattack(atom/target, mob/living/user, flag, params)
+ if(!ammo_pack || ammo_pack.loc != user)
+ user << "You need the backpack power source to fire the gun!"
+ ..()
+
+/obj/item/weapon/gun/projectile/minigun/New()
+ if(!ammo_pack)
+ if(istype(loc,/obj/item/weapon/minigunpack)) //We should spawn inside a ammo pack so let's use that one.
+ ammo_pack = loc
+ else
+ qdel(src)//No pack, no gun
+ ..()
+
+/obj/item/weapon/gun/projectile/minigun/dropped(mob/living/user)
+ ammo_pack.attach_gun(user)
+
+/obj/item/weapon/gun/projectile/minigun/process_chamber(eject_casing = 0, empty_chamber = 1)
+ ..()
+
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
new file mode 100644
index 0000000000..42ed81805e
--- /dev/null
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -0,0 +1,81 @@
+//KEEP IN MIND: These are different from gun/grenadelauncher. These are designed to shoot premade rocket and grenade projectiles, not flashbangs or chemistry casings etc.
+//Put handheld rocket launchers here if someone ever decides to make something so hilarious ~Paprika
+
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher//this is only used for underbarrel grenade launchers at the moment, but admins can still spawn it if they feel like being assholes
+ desc = "A break-operated grenade launcher."
+ name = "grenade launcher"
+ icon_state = "dshotgun-sawn"
+ item_state = "gun"
+ mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher
+ fire_sound = 'sound/weapons/grenadelaunch.ogg'
+ w_class = 3
+ pin = /obj/item/device/firing_pin/implant/pindicate
+
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher/unrestricted
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher/attackby(obj/item/A, mob/user, params)
+ ..()
+ if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
+ chamber_round()
+
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher/cyborg
+ desc = "A 6-shot grenade launcher."
+ name = "multi grenade launcher"
+ icon = 'icons/mecha/mecha_equipment.dmi'
+ icon_state = "mecha_grenadelnchr"
+ mag_type = /obj/item/ammo_box/magazine/internal/cylinder/grenademulti
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher/cyborg/attack_self()
+ return
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol
+ name = "gyrojet pistol"
+ desc = "A prototype pistol designed to fire self propelled rockets."
+ icon_state = "gyropistol"
+ fire_sound = 'sound/weapons/grenadelaunch.ogg'
+ origin_tech = "combat=5"
+ mag_type = /obj/item/ammo_box/magazine/m75
+ burst_size = 1
+ fire_delay = 0
+ actions_types = list()
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol/process_chamber(eject_casing = 0, empty_chamber = 1)
+ ..()
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol/update_icon()
+ ..()
+ icon_state = "[initial(icon_state)][magazine ? "loaded" : ""]"
+
+/obj/item/weapon/gun/projectile/automatic/speargun
+ name = "kinetic speargun"
+ desc = "A weapon favored by carp hunters. Fires specialized spears using kinetic energy."
+ icon_state = "speargun"
+ item_state = "speargun"
+ w_class = 4
+ origin_tech = "combat=4;engineering=4"
+ force = 10
+ can_suppress = 0
+ mag_type = /obj/item/ammo_box/magazine/internal/speargun
+ fire_sound = 'sound/weapons/grenadelaunch.ogg'
+ burst_size = 1
+ fire_delay = 0
+ select = 0
+ actions_types = list()
+
+/obj/item/weapon/gun/projectile/automatic/speargun/update_icon()
+ return
+
+/obj/item/weapon/gun/projectile/automatic/speargun/attack_self()
+ return
+
+/obj/item/weapon/gun/projectile/automatic/speargun/process_chamber(eject_casing = 0, empty_chamber = 1)
+ ..()
+
+/obj/item/weapon/gun/projectile/automatic/speargun/attackby(obj/item/A, mob/user, params)
+ var/num_loaded = magazine.attackby(A, user, params, 1)
+ if(num_loaded)
+ user << "You load [num_loaded] spear\s into \the [src]."
+ update_icon()
+ chamber_round()
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
new file mode 100644
index 0000000000..350b248d05
--- /dev/null
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -0,0 +1,58 @@
+/obj/item/weapon/gun/projectile/automatic/pistol
+ name = "stechkin pistol"
+ desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
+ icon_state = "pistol"
+ w_class = 2
+ origin_tech = "combat=3;materials=2;syndicate=4"
+ mag_type = /obj/item/ammo_box/magazine/m10mm
+ can_suppress = 1
+ burst_size = 1
+ fire_delay = 0
+ actions_types = list()
+
+/obj/item/weapon/gun/projectile/automatic/pistol/update_icon()
+ ..()
+ icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
+ return
+
+/obj/item/weapon/gun/projectile/automatic/pistol/m1911
+ name = "\improper M1911"
+ desc = "A classic .45 handgun with a small magazine capacity."
+ icon_state = "m1911"
+ w_class = 3
+ mag_type = /obj/item/ammo_box/magazine/m45
+ can_suppress = 0
+
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle
+ name = "desert eagle"
+ desc = "A robust .50 AE handgun."
+ icon_state = "deagle"
+ force = 14
+ mag_type = /obj/item/ammo_box/magazine/m50
+ can_suppress = 0
+
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle/update_icon()
+ ..()
+ icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"
+
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle/gold
+ desc = "A gold plated desert eagle folded over a million times by superior martian gunsmiths. Uses .50 AE ammo."
+ icon_state = "deagleg"
+ item_state = "deagleg"
+
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle/camo
+ desc = "A Deagle brand Deagle for operators operating operationally. Uses .50 AE ammo."
+ icon_state = "deaglecamo"
+ item_state = "deagleg"
+
+/obj/item/weapon/gun/projectile/automatic/pistol/APS
+ name = "stechkin APS pistol"
+ desc = "The original russian version of a widely used Syndicate sidearm. Uses 9mm ammo."
+ icon_state = "aps"
+ w_class = 3
+ origin_tech = "combat=3;materials=2;syndicate=3"
+ mag_type = /obj/item/ammo_box/magazine/pistolm9mm
+ can_suppress = 0
+ burst_size = 3
+ fire_delay = 2
+ actions_types = list(/datum/action/item_action/toggle_firemode)
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
new file mode 100644
index 0000000000..97bf2eefc5
--- /dev/null
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -0,0 +1,373 @@
+/obj/item/weapon/gun/projectile/revolver
+ name = "\improper .357 revolver"
+ desc = "A suspicious revolver. Uses .357 ammo." //usually used by syndicates
+ icon_state = "revolver"
+ mag_type = /obj/item/ammo_box/magazine/internal/cylinder
+ origin_tech = "combat=3;materials=2"
+
+/obj/item/weapon/gun/projectile/revolver/New()
+ ..()
+ if(!istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
+ verbs -= /obj/item/weapon/gun/projectile/revolver/verb/spin
+
+/obj/item/weapon/gun/projectile/revolver/chamber_round(var/spin = 1)
+ if(spin)
+ chambered = magazine.get_round(1)
+ else
+ chambered = magazine.stored_ammo[1]
+ return
+
+/obj/item/weapon/gun/projectile/revolver/shoot_with_empty_chamber(mob/living/user as mob|obj)
+ ..()
+ chamber_round(1)
+
+/obj/item/weapon/gun/projectile/revolver/process_chamber()
+ return ..(0, 1)
+
+/obj/item/weapon/gun/projectile/revolver/attackby(obj/item/A, mob/user, params)
+ . = ..()
+ if(.)
+ return
+ var/num_loaded = magazine.attackby(A, user, params, 1)
+ if(num_loaded)
+ user << "You load [num_loaded] shell\s into \the [src]."
+ A.update_icon()
+ update_icon()
+ chamber_round(0)
+
+ if(unique_rename)
+ if(istype(A, /obj/item/weapon/pen))
+ rename_gun(user)
+
+/obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user)
+ var/num_unloaded = 0
+ chambered = null
+ while (get_ammo() > 0)
+ var/obj/item/ammo_casing/CB
+ CB = magazine.get_round(0)
+ if(CB)
+ CB.loc = get_turf(src.loc)
+ CB.SpinAnimation(10, 1)
+ CB.update_icon()
+ num_unloaded++
+ if (num_unloaded)
+ user << "You unload [num_unloaded] shell\s from [src]."
+ else
+ user << "[src] is empty!"
+
+/obj/item/weapon/gun/projectile/revolver/verb/spin()
+ set name = "Spin Chamber"
+ set category = "Object"
+ set desc = "Click to spin your revolver's chamber."
+
+ var/mob/M = usr
+
+ if(M.stat || !in_range(M,src))
+ return
+
+ if(istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
+ var/obj/item/ammo_box/magazine/internal/cylinder/C = magazine
+ C.spin()
+ chamber_round(0)
+ usr.visible_message("[usr] spins [src]'s chamber.", "You spin [src]'s chamber.")
+ else
+ verbs -= /obj/item/weapon/gun/projectile/revolver/verb/spin
+
+
+/obj/item/weapon/gun/projectile/revolver/can_shoot()
+ return get_ammo(0,0)
+
+/obj/item/weapon/gun/projectile/revolver/get_ammo(countchambered = 0, countempties = 1)
+ var/boolets = 0 //mature var names for mature people
+ if (chambered && countchambered)
+ boolets++
+ if (magazine)
+ boolets += magazine.ammo_count(countempties)
+ return boolets
+
+/obj/item/weapon/gun/projectile/revolver/examine(mob/user)
+ ..()
+ user << "[get_ammo(0,0)] of those are live rounds."
+
+/obj/item/weapon/gun/projectile/revolver/detective
+ name = "\improper .38 Mars Special"
+ desc = "A cheap Martian knock-off of a classic law enforcement firearm. Uses .38-special rounds."
+ icon_state = "detective"
+ mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
+ unique_rename = 1
+ unique_reskin = 1
+
+/obj/item/weapon/gun/projectile/revolver/detective/New()
+ ..()
+ options["Default"] = "detective"
+ options["Leopard Spots"] = "detective_leopard"
+ options["Black Panther"] = "detective_panther"
+ options["Gold Trim"] = "detective_gold"
+ options["The Peacemaker"] = "detective_peacemaker"
+ options["Cancel"] = null
+
+/obj/item/weapon/gun/projectile/revolver/detective/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override = "")
+ if(magazine.caliber != initial(magazine.caliber))
+ if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60
+ playsound(user, fire_sound, 50, 1)
+ user << "[src] blows up in your face!"
+ user.take_organ_damage(0,20)
+ user.unEquip(src)
+ return 0
+ ..()
+
+/obj/item/weapon/gun/projectile/revolver/detective/attackby(obj/item/A, mob/user, params)
+ ..()
+ if(istype(A, /obj/item/weapon/screwdriver))
+ if(magazine.caliber == "38")
+ user << "You begin to reinforce the barrel of [src]..."
+ if(magazine.ammo_count())
+ afterattack(user, user) //you know the drill
+ user.visible_message("[src] goes off!", "[src] goes off in your face!")
+ return
+ if(do_after(user, 30/A.toolspeed, target = src))
+ if(magazine.ammo_count())
+ user << "You can't modify it!"
+ return
+ magazine.caliber = "357"
+ desc = "The barrel and chamber assembly seems to have been modified."
+ user << "You reinforce the barrel of [src]. Now it will fire .357 rounds."
+ else
+ user << "You begin to revert the modifications to [src]..."
+ if(magazine.ammo_count())
+ afterattack(user, user) //and again
+ user.visible_message("[src] goes off!", "[src] goes off in your face!")
+ return
+ if(do_after(user, 30/A.toolspeed, target = src))
+ if(magazine.ammo_count())
+ user << "You can't modify it!"
+ return
+ magazine.caliber = "38"
+ desc = initial(desc)
+ user << "You remove the modifications on [src]. Now it will fire .38 rounds."
+
+
+/obj/item/weapon/gun/projectile/revolver/mateba
+ name = "\improper Unica 6 auto-revolver"
+ desc = "A retro high-powered autorevolver typically used by officers of the New Russia military. Uses .357 ammo."
+ icon_state = "mateba"
+
+/obj/item/weapon/gun/projectile/revolver/golden
+ name = "\improper Golden revolver"
+ desc = "This ain't no game, ain't never been no show, And I'll gladly gun down the oldest lady you know. Uses .357 ammo."
+ icon_state = "goldrevolver"
+ fire_sound = 'sound/weapons/resonator_blast.ogg'
+ recoil = 8
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/revolver/nagant
+ name = "nagant revolver"
+ desc = "An old model of revolver that originated in Russia. Able to be suppressed. Uses 7.62x38mmR ammo."
+ icon_state = "nagant"
+ origin_tech = "combat=3"
+ can_suppress = 1
+ mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev762
+
+
+// A gun to play Russian Roulette!
+// You can spin the chamber to randomize the position of the bullet.
+
+/obj/item/weapon/gun/projectile/revolver/russian
+ name = "\improper russian revolver"
+ desc = "A Russian-made revolver for drinking games. Uses .357 ammo, and has a mechanism requiring you to spin the chamber before each trigger pull."
+ origin_tech = "combat=2;materials=2"
+ mag_type = /obj/item/ammo_box/magazine/internal/rus357
+ var/spun = 0
+
+/obj/item/weapon/gun/projectile/revolver/russian/New()
+ ..()
+ Spin()
+ update_icon()
+
+/obj/item/weapon/gun/projectile/revolver/russian/proc/Spin()
+ chambered = null
+ var/random = rand(1, magazine.max_ammo)
+ if(random <= get_ammo(0,0))
+ chamber_round()
+ spun = 1
+
+/obj/item/weapon/gun/projectile/revolver/russian/attackby(obj/item/A, mob/user, params)
+ var/num_loaded = ..()
+ if(num_loaded)
+ user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "You load a single bullet into the chamber and spin it.")
+ else
+ user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.")
+ if(get_ammo() > 0)
+ Spin()
+ update_icon()
+ A.update_icon()
+ return
+
+/obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user)
+ if(!spun && can_shoot())
+ user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.")
+ Spin()
+ else
+ var/num_unloaded = 0
+ while (get_ammo() > 0)
+ var/obj/item/ammo_casing/CB
+ CB = magazine.get_round()
+ chambered = null
+ CB.loc = get_turf(src.loc)
+ CB.update_icon()
+ num_unloaded++
+ if (num_unloaded)
+ user << "You unload [num_unloaded] shell\s from [src]."
+ else
+ user << "[src] is empty."
+
+/obj/item/weapon/gun/projectile/revolver/russian/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params)
+ if(flag)
+ if(!(target in user.contents) && ismob(target))
+ if(user.a_intent == "harm") // Flogging action
+ return
+
+ if(isliving(user))
+ if(!can_trigger_gun(user))
+ return
+ if(target != user)
+ if(ismob(target))
+ user << "A mechanism prevents you from shooting anyone but yourself!"
+ return
+
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(!spun)
+ user << "You need to spin the revolver's chamber first!"
+ return
+
+ spun = 0
+
+ if(chambered)
+ var/obj/item/ammo_casing/AC = chambered
+ if(AC.fire(user, user))
+ playsound(user, fire_sound, 50, 1)
+ var/zone = check_zone(user.zone_selected)
+ var/obj/item/bodypart/affecting = H.get_bodypart(zone)
+ if(zone == "head" || zone == "eyes" || zone == "mouth")
+ shoot_self(user, affecting)
+ else
+ user.visible_message("[user.name] cowardly fires [src] at \his [affecting.name]!", "You cowardly fire [src] at your [affecting.name]!", "You hear a gunshot!")
+ return
+
+ user.visible_message("*click*")
+ playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+
+/obj/item/weapon/gun/projectile/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = "head")
+ user.apply_damage(300, BRUTE, affecting)
+ user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a gunshot!")
+
+/obj/item/weapon/gun/projectile/revolver/russian/soul
+ name = "cursed russian revolver"
+ desc = "To play with this revolver requires wagering your very soul."
+
+/obj/item/weapon/gun/projectile/revolver/russian/soul/shoot_self(mob/living/user)
+ ..()
+ var/obj/item/device/soulstone/anybody/SS = new /obj/item/device/soulstone/anybody(get_turf(src))
+ if(!SS.transfer_soul("FORCE", user)) //Something went wrong
+ qdel(SS)
+ return
+ user.visible_message("[user.name]'s soul is captured by \the [src]!", "You've lost the gamble! Your soul is forfiet!")
+
+
+
+/////////////////////////////
+// DOUBLE BARRELED SHOTGUN //
+/////////////////////////////
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel
+ name = "double-barreled shotgun"
+ desc = "A true classic."
+ icon_state = "dshotgun"
+ item_state = "shotgun"
+ w_class = 4
+ force = 10
+ flags = CONDUCT
+ slot_flags = SLOT_BACK
+ mag_type = /obj/item/ammo_box/magazine/internal/shot/dual
+ sawn_desc = "Omar's coming!"
+ unique_rename = 1
+ unique_reskin = 1
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/New()
+ ..()
+ options["Default"] = "dshotgun"
+ options["Dark Red Finish"] = "dshotgun-d"
+ options["Ash"] = "dshotgun-f"
+ options["Faded Grey"] = "dshotgun-g"
+ options["Maple"] = "dshotgun-l"
+ options["Rosewood"] = "dshotgun-p"
+ options["Cancel"] = null
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(obj/item/A, mob/user, params)
+ ..()
+ if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
+ chamber_round()
+ if(istype(A, /obj/item/weapon/melee/energy))
+ var/obj/item/weapon/melee/energy/W = A
+ if(W.active)
+ sawoff(user)
+ if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter))
+ sawoff(user)
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user)
+ var/num_unloaded = 0
+ while (get_ammo() > 0)
+ var/obj/item/ammo_casing/CB
+ CB = magazine.get_round(0)
+ chambered = null
+ CB.loc = get_turf(src.loc)
+ CB.update_icon()
+ num_unloaded++
+ if (num_unloaded)
+ user << "You break open \the [src] and unload [num_unloaded] shell\s."
+ else
+ user << "[src] is empty!"
+
+
+
+
+// IMPROVISED SHOTGUN //
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised
+ name = "improvised shotgun"
+ desc = "Essentially a tube that aims shotgun shells."
+ icon_state = "ishotgun"
+ item_state = "shotgun"
+ w_class = 4
+ force = 10
+ slot_flags = null
+ mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
+ sawn_desc = "I'm just here for the gasoline."
+ unique_rename = 0
+ unique_reskin = 0
+ var/slung = 0
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
+ ..()
+ if(istype(A, /obj/item/stack/cable_coil) && !sawn_state)
+ var/obj/item/stack/cable_coil/C = A
+ if(C.use(10))
+ slot_flags = SLOT_BACK
+ user << "You tie the lengths of cable to the shotgun, making a sling."
+ slung = 1
+ update_icon()
+ else
+ user << "You need at least ten lengths of cable if you want to make a sling!"
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/update_icon()
+ ..()
+ if(slung)
+ icon_state += "sling"
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/sawoff(mob/user)
+ . = ..()
+ if(. && slung) //sawing off the gun removes the sling
+ new /obj/item/stack/cable_coil(get_turf(src), 10)
+ slung = 0
+ update_icon()
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
new file mode 100644
index 0000000000..0faa56f1ee
--- /dev/null
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -0,0 +1,212 @@
+/obj/item/weapon/gun/projectile/shotgun
+ name = "shotgun"
+ desc = "A traditional shotgun with wood furniture and a four-shell capacity underneath."
+ icon_state = "shotgun"
+ item_state = "shotgun"
+ w_class = 4
+ force = 10
+ flags = CONDUCT
+ slot_flags = SLOT_BACK
+ origin_tech = "combat=4;materials=2"
+ mag_type = /obj/item/ammo_box/magazine/internal/shot
+ var/recentpump = 0 // to prevent spammage
+
+/obj/item/weapon/gun/projectile/shotgun/attackby(obj/item/A, mob/user, params)
+ . = ..()
+ if(.)
+ return
+ var/num_loaded = magazine.attackby(A, user, params, 1)
+ if(num_loaded)
+ user << "You load [num_loaded] shell\s into \the [src]!"
+ A.update_icon()
+ update_icon()
+
+/obj/item/weapon/gun/projectile/shotgun/process_chamber()
+ return ..(0, 0)
+
+/obj/item/weapon/gun/projectile/shotgun/chamber_round()
+ return
+
+/obj/item/weapon/gun/projectile/shotgun/can_shoot()
+ if(!chambered)
+ return 0
+ return (chambered.BB ? 1 : 0)
+
+/obj/item/weapon/gun/projectile/shotgun/attack_self(mob/living/user)
+ if(recentpump)
+ return
+ pump(user)
+ recentpump = 1
+ spawn(10)
+ recentpump = 0
+ return
+
+/obj/item/weapon/gun/projectile/shotgun/blow_up(mob/user)
+ . = 0
+ if(chambered && chambered.BB)
+ process_fire(user, user,0)
+ . = 1
+
+/obj/item/weapon/gun/projectile/shotgun/proc/pump(mob/M)
+ playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
+ pump_unload(M)
+ pump_reload(M)
+ update_icon() //I.E. fix the desc
+ return 1
+
+/obj/item/weapon/gun/projectile/shotgun/proc/pump_unload(mob/M)
+ if(chambered)//We have a shell in the chamber
+ chambered.loc = get_turf(src)//Eject casing
+ chambered.SpinAnimation(5, 1)
+ chambered = null
+
+/obj/item/weapon/gun/projectile/shotgun/proc/pump_reload(mob/M)
+ if(!magazine.ammo_count())
+ return 0
+ var/obj/item/ammo_casing/AC = magazine.get_round() //load next casing.
+ chambered = AC
+
+
+/obj/item/weapon/gun/projectile/shotgun/examine(mob/user)
+ ..()
+ if (chambered)
+ user << "A [chambered.BB ? "live" : "spent"] one is in the chamber."
+
+/obj/item/weapon/gun/projectile/shotgun/lethal
+ mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal
+
+// RIOT SHOTGUN //
+
+/obj/item/weapon/gun/projectile/shotgun/riot //for spawn in the armory
+ name = "riot shotgun"
+ desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control."
+ icon_state = "riotshotgun"
+ mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
+ sawn_desc = "Come with me if you want to live."
+
+/obj/item/weapon/gun/projectile/shotgun/riot/attackby(obj/item/A, mob/user, params)
+ ..()
+ if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter))
+ sawoff(user)
+ if(istype(A, /obj/item/weapon/melee/energy))
+ var/obj/item/weapon/melee/energy/W = A
+ if(W.active)
+ sawoff(user)
+
+///////////////////////
+// BOLT ACTION RIFLE //
+///////////////////////
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction
+ name = "\improper Mosin Nagant"
+ desc = "This piece of junk looks like something that could have been used 700 years ago. It feels slightly moist."
+ icon_state = "moistnugget"
+ item_state = "moistnugget"
+ slot_flags = 0 //no SLOT_BACK sprite, alas
+ mag_type = /obj/item/ammo_box/magazine/internal/boltaction
+ var/bolt_open = 0
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/pump(mob/M)
+ playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
+ if(bolt_open)
+ pump_reload(M)
+ else
+ pump_unload(M)
+ bolt_open = !bolt_open
+ update_icon() //I.E. fix the desc
+ return 1
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/attackby(obj/item/A, mob/user, params)
+ if(!bolt_open)
+ user << "The bolt is closed!"
+ return
+ . = ..()
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/examine(mob/user)
+ ..()
+ user << "The bolt is [bolt_open ? "open" : "closed"]."
+
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted
+ name = "enchanted bolt action rifle"
+ desc = "Careful not to lose your head."
+ var/guns_left = 30
+ mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/New()
+ ..()
+ bolt_open = 1
+ pump()
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/dropped()
+ ..()
+ guns_left = 0
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1)
+ ..()
+ if(guns_left)
+ var/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/GUN = new
+ GUN.guns_left = src.guns_left - 1
+ user.drop_item()
+ user.swap_hand()
+ user.put_in_hands(GUN)
+ else
+ user.drop_item()
+ src.throw_at_fast(pick(oview(7,get_turf(user))),1,1)
+ user.visible_message("[user] tosses aside the spent rifle!")
+
+// Automatic Shotguns//
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/shoot_live_shot(mob/living/user as mob|obj)
+ ..()
+ src.pump(user)
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/combat
+ name = "combat shotgun"
+ desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath."
+ icon_state = "cshotgun"
+ origin_tech = "combat=6"
+ mag_type = /obj/item/ammo_box/magazine/internal/shot/com
+ w_class = 5
+
+//Dual Feed Shotgun
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube
+ name = "cycler shotgun"
+ desc = "An advanced shotgun with two separate magazine tubes, allowing you to quickly toggle between ammo types."
+ icon_state = "cycler"
+ origin_tech = "combat=4;materials=2"
+ mag_type = /obj/item/ammo_box/magazine/internal/shot/tube
+ w_class = 5
+ var/toggled = 0
+ var/obj/item/ammo_box/magazine/internal/shot/alternate_magazine
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/New()
+ ..()
+ if (!alternate_magazine)
+ alternate_magazine = new mag_type(src)
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/attack_self(mob/living/user)
+ if(!chambered && magazine.contents.len)
+ pump()
+ else
+ toggle_tube(user)
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/proc/toggle_tube(mob/living/user)
+ var/current_mag = magazine
+ var/alt_mag = alternate_magazine
+ magazine = alt_mag
+ alternate_magazine = current_mag
+ toggled = !toggled
+ if(toggled)
+ user << "You switch to tube B."
+ else
+ user << "You switch to tube A."
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/AltClick(mob/living/user)
+ if(user.incapacitated() || !Adjacent(user) || !istype(user))
+ return
+ pump()
+
+
+// DOUBLE BARRELED SHOTGUN and IMPROVISED SHOTGUN are in revolver.dm
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm
new file mode 100644
index 0000000000..417f13ea9b
--- /dev/null
+++ b/code/modules/projectiles/guns/projectile/toy.dm
@@ -0,0 +1,108 @@
+/obj/item/weapon/gun/projectile/automatic/toy
+ name = "foam force SMG"
+ desc = "A prototype three-round burst toy submachine gun. Ages 8 and up."
+ icon = 'icons/obj/guns/toy.dmi'
+ icon_state = "saber"
+ item_state = "gun"
+ mag_type = /obj/item/ammo_box/magazine/toy/smg
+ fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+ force = 0
+ throwforce = 0
+ burst_size = 3
+ can_suppress = 0
+ clumsy_check = 0
+ needs_permit = 0
+
+/obj/item/weapon/gun/projectile/automatic/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
+ ..()
+
+/obj/item/weapon/gun/projectile/automatic/toy/unrestricted
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol
+ name = "foam force pistol"
+ desc = "A small, easily concealable toy handgun. Ages 8 and up."
+ icon_state = "pistol"
+ w_class = 2
+ mag_type = /obj/item/ammo_box/magazine/toy/pistol
+ fire_sound = 'sound/weapons/Gunshot.ogg'
+ can_suppress = 0
+ burst_size = 1
+ fire_delay = 0
+ actions_types = list()
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol/update_icon()
+ ..()
+ icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol/riot
+ mag_type = /obj/item/ammo_box/magazine/toy/pistol/riot
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol/riot/New()
+ magazine = new /obj/item/ammo_box/magazine/toy/pistol/riot(src)
+ ..()
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol/unrestricted
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol/riot/unrestricted
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/shotgun/toy
+ name = "foam force shotgun"
+ desc = "A toy shotgun with wood furniture and a four-shell capacity underneath. Ages 8 and up."
+ icon = 'icons/obj/guns/toy.dmi'
+ force = 0
+ throwforce = 0
+ origin_tech = null
+ mag_type = /obj/item/ammo_box/magazine/internal/shot/toy
+ clumsy_check = 0
+ needs_permit = 0
+
+/obj/item/weapon/gun/projectile/shotgun/toy/process_chamber()
+ ..()
+ if(chambered && !chambered.BB)
+ qdel(chambered)
+
+/obj/item/weapon/gun/projectile/shotgun/toy/unrestricted
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/shotgun/toy/crossbow
+ name = "foam force crossbow"
+ desc = "A weapon favored by many overactive children. Ages 8 and up."
+ icon = 'icons/obj/toy.dmi'
+ icon_state = "foamcrossbow"
+ item_state = "crossbow"
+ mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow
+ fire_sound = 'sound/items/syringeproj.ogg'
+ slot_flags = SLOT_BELT
+ w_class = 2
+
+/obj/item/weapon/gun/projectile/automatic/c20r/toy
+ name = "donksoft SMG"
+ desc = "A bullpup two-round burst toy SMG, designated 'C-20r'. Ages 8 and up."
+ icon = 'icons/obj/guns/toy.dmi'
+ can_suppress = 0
+ needs_permit = 0
+ mag_type = /obj/item/ammo_box/magazine/toy/smgm45
+
+/obj/item/weapon/gun/projectile/automatic/c20r/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
+ ..()
+
+
+/obj/item/weapon/gun/projectile/automatic/c20r/toy/unrestricted
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/toy
+ name = "donksoft LMG"
+ desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up."
+ icon = 'icons/obj/guns/toy.dmi'
+ can_suppress = 0
+ needs_permit = 0
+ mag_type = /obj/item/ammo_box/magazine/toy/m762
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
+ ..()
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/toy/unrestricted
+ pin = /obj/item/device/firing_pin
\ No newline at end of file
diff --git a/code/modules/reagents/kegs.dm b/code/modules/reagents/kegs.dm
new file mode 100644
index 0000000000..6767c52218
--- /dev/null
+++ b/code/modules/reagents/kegs.dm
@@ -0,0 +1,42 @@
+/obj/structure/reagent_dispensers/keg
+ name = "keg"
+ desc = "A keg."
+ icon_state = "keg"
+ var/reagent_type = "water"
+
+/obj/structure/reagent_dispensers/keg/New()
+ ..()
+ reagents.add_reagent(reagent_type,1000)
+
+/obj/structure/reagent_dispensers/keg/blob_act()
+ qdel(src)
+
+/obj/structure/reagent_dispensers/keg/mead
+ name = "keg of mead"
+ desc = "A keg of mead."
+ icon_state = "orangekeg"
+ reagent_type = "mead"
+
+/obj/structure/reagent_dispensers/keg/aphro
+ name = "keg of aphrodisiac"
+ desc = "A keg of aphrodisiac."
+ icon_state = "pinkkeg"
+ reagent_type = "hornychem"
+
+/obj/structure/reagent_dispensers/keg/milk
+ name = "keg of milk"
+ desc = "It's not quite what you were hoping for."
+ icon_state = "whitekeg"
+ reagent_type = "milk"
+
+/obj/structure/reagent_dispensers/keg/semen
+ name = "keg of semen"
+ desc = "Dear lord, where did this even come from?"
+ icon_state = "whitekeg"
+ reagent_type = "semen"
+
+/obj/structure/reagent_dispensers/keg/gargle
+ name = "keg of pan galactic gargleblaster"
+ desc = "A keg of... wow that's a long name."
+ icon_state = "bluekeg"
+ reagent_type = "gargleblaster"
\ No newline at end of file
diff --git a/code/modules/ruins/ruin_areas.dm b/code/modules/ruins/ruin_areas.dm
new file mode 100644
index 0000000000..5b18c5d97a
--- /dev/null
+++ b/code/modules/ruins/ruin_areas.dm
@@ -0,0 +1,54 @@
+//Parent types
+
+/area/ruin/
+ name = "\improper Unexplored Location"
+ icon_state = "away"
+ has_gravity = 1
+
+
+/area/ruin/unpowered
+ always_unpowered = 0
+
+/area/ruin/unpowered/no_grav
+ has_gravity = 0
+
+/area/ruin/powered
+ requires_power = 0
+
+
+
+
+//Areas
+
+/area/ruin/unpowered/no_grav/way_home
+ name = "\improper Salvation"
+ icon_state = "away"
+
+/area/ruin/powered/snow_biodome
+
+/area/ruin/powered/golem_ship
+ name = "Free Golem Ship"
+
+// Ruins of "onehalf" ship
+/area/ruin/onehalf/hallway
+ name = "Hallway"
+ icon_state = "hallC"
+
+
+/area/ruin/onehalf/drone_bay
+ name = "Mining Drone Bay"
+ icon_state = "engine"
+
+/area/ruin/onehalf/dorms_med
+ name = "Crew Quarters"
+ icon_state = "Sleep"
+
+/area/ruin/onehalf/bridge
+ name = "Bridge"
+ icon_state = "bridge"
+
+/area/ruin/powered/dinner_for_two
+ name = "Dinner for Two"
+
+/area/ruin/powered/authorship
+ name = "Authorship"
\ No newline at end of file
diff --git a/code/modules/salvaging/equipment.dm b/code/modules/salvaging/equipment.dm
new file mode 100644
index 0000000000..61a08cc338
--- /dev/null
+++ b/code/modules/salvaging/equipment.dm
@@ -0,0 +1,21 @@
+//Salvaging hardsuit
+/obj/item/clothing/head/helmet/space/hardsuit/salvaging
+ name = "salvaging hardsuit helmet"
+ desc = "A hardsuit helmet worn by salvaging teams during EVA. Features three viewing ports, a mounted flashlight, adaptive padding, and UV shielding. Also, has radiation and explosion shielding."
+ icon_state = "hardsuit0-salvage"
+ item_state = "salvage_helm"
+ armor = list(melee = 5, bullet = 5, laser = 5, energy = 5, bomb = 80, bio = 100, rad = 40)
+ item_color = "salvage"
+
+/obj/item/clothing/suit/space/hardsuit/salvaging
+ name = "salvaging hardsuit"
+ desc = "A hardsuit worn by salvaging teams during EVA. Features a robust, orange chassis, stylish leather, and comfortable gloves. Also, has radiation and explosion shielding."
+ icon_state = "hardsuit_salvage"
+ item_state = "hardsuit_salvage"
+ armor = list(melee = 5, bullet = 5, laser = 5, energy = 5, bomb = 80, bio = 100, rad = 40)
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/salvaging
+
+/obj/machinery/suit_storage_unit/salvaging
+ suit_type = /obj/item/clothing/suit/space/hardsuit/salvaging
+ mask_type = /obj/item/clothing/mask/breath
+ storage_type = /obj/item/clothing/shoes/magboots
\ No newline at end of file
diff --git a/code/modules/salvaging/salvage_ship.dm b/code/modules/salvaging/salvage_ship.dm
new file mode 100644
index 0000000000..8ff9d833e3
--- /dev/null
+++ b/code/modules/salvaging/salvage_ship.dm
@@ -0,0 +1,117 @@
+//Salvaging ship. Large ship used to navigate debris fields. Capable of basic collection, sorting, and refining of scrap.
+
+/obj/mecha/ship
+ name = "ship"
+ desc = "A space ship, or something."
+
+//Ship itself
+/obj/mecha/ship/salvage
+ desc = "Powered Space Junk Recycler, revision 1A1, designated \"Scrapper\" by NT and approved for use on their stations. While it doesn't quite roll off the tongue, \
+ these tough ships are typically used in groups to clear debris fields of precious metals, artifacts, equipment, hardware, and other valuables. They're fitted \
+ with advanced absorbant armor plates to protect the contents, both living and not, from explosions; a common hazard considering the munitions and fuel used on \
+ most ships and stations."
+ name = "\improper PSJR-1A1 \"Scrapper\""
+ icon_state = "scrapper"
+ icon = 'icons/salvaging/scrapper.dmi'
+ step_in = 4
+ max_temperature = 1000
+ health = 200
+ lights_power = 8
+ deflect_chance = 20
+ damage_absorption = list("brute"=0.7,"fire"=0.9,"bullet"=0.9,"laser"=0.9,"energy"=1,"bomb"=0.4)
+ max_equip = 6
+ wreckage = /obj/structure/mecha_wreckage/scrapper
+// bound_height = 64
+// bound_width = 96
+ pixel_x = -48
+ pixel_y = -48
+ turnsound = null
+ stepsound = null
+
+/obj/mecha/ship/salvage/GrantActions(mob/living/user, human_occupant = 0)
+ ..()
+ thrusters_action.Grant(user, src)
+
+/obj/mecha/ship/salvage/RemoveActions(mob/living/user, human_occupant = 0)
+ ..()
+ thrusters_action.Remove(user)
+
+/obj/mecha/mechturn()
+ ..()
+ updatebounds()
+
+/obj/mecha/proc/updatebounds()
+/* switch(dir)
+ if(1)
+ bound_height = initial(bound_height)
+ bound_width = initial(bound_width)
+ if(2)
+ bound_height = initial(bound_height)
+ bound_width = initial(bound_width)
+ if(4)
+ bound_height = initial(bound_width)
+ bound_width = initial(bound_height)
+ if(8)
+ bound_height = initial(bound_width)
+ bound_width = initial(bound_height)
+*/
+//Wreckage
+/obj/structure/mecha_wreckage/scrapper
+ name = "scrapper wreckage"
+ icon_state = "scrapper-broken"
+ icon = 'icons/salvaging/scrapper.dmi'
+
+/obj/structure/mecha_wreckage/scrapper/New()
+ ..()
+ var/list/parts = list(/obj/item/mecha_parts/chassis/scrapper,
+ /obj/item/mecha_parts/part/cockpit,
+ /obj/item/mecha_parts/part/engine,
+ /obj/item/mecha_parts/part/lifesupport,
+ /obj/item/mecha_parts/part/storage,
+ /obj/item/mecha_parts/part/scrap_refinery)
+ for(var/i = 0; i < 2; i++)
+ if(parts.len && prob(40))
+ var/part = pick(parts)
+ welder_salvage += part
+ parts -= part
+
+//Parts
+/obj/item/mecha_parts/chassis/scrapper/New()
+ ..()
+ construct = new /datum/construction/mecha/ripley_chassis(src)
+
+/obj/item/mecha_parts/chassis/scrapper
+ name = "\improper Scrapper chassis"
+ icon_state = "scrapper_chassis"
+
+/obj/item/mecha_parts/part/cockpit
+ name = "shipcockpit"
+ desc = "The cockpit of a small space ship."
+ icon_state = "cockpit"
+ origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
+
+/obj/item/mecha_parts/part/engine
+ name = "engine"
+ desc = "The main source of thrust for small space ships."
+ icon_state = "shipthruster"
+ origin_tech = "programming=1;materials=3;engineering=3"
+
+/obj/item/mecha_parts/part/lifesupport
+ name = "life support systems"
+ gender = PLURAL
+ desc = "A series of systems to be installed in a small vessel. Ensures your ship will be nice and toasty, every time."
+ icon_state = "shiplifesupport"
+ origin_tech = "programming=1;materials=2;engineering=2;biotech=3"
+
+/obj/item/mecha_parts/part/storage
+ name = "storage compartments"
+ gender = PLURAL
+ desc = "A series of storage compartments that are typically installed on the sides of small ships."
+ icon_state = "shipstorage"
+ origin_tech = "materials=2;engineering=2"
+
+/obj/item/mecha_parts/part/scrap_refinery
+ name = "scrap refinery"
+ desc = "A ship-mounted refinery used to turn unsorted scrap metals into useful raw materials."
+ icon_state = "shiprefinery"
+ origin_tech = "materials=2;engineering=3"
diff --git a/code/modules/salvaging/salvaging.dm b/code/modules/salvaging/salvaging.dm
new file mode 100644
index 0000000000..372f3ea1ea
--- /dev/null
+++ b/code/modules/salvaging/salvaging.dm
@@ -0,0 +1,3 @@
+//Master file for the salvaging module. Documentation, helpers, procs, credits, and other unsorted stuff will be placed here.
+//Credits: Skorpio @ http://opengameart.org/users/skorpio for their sprite work.
+
diff --git a/code/modules/surgery/gender_reassignment.dm b/code/modules/surgery/gender_reassignment.dm
new file mode 100644
index 0000000000..830930839d
--- /dev/null
+++ b/code/modules/surgery/gender_reassignment.dm
@@ -0,0 +1,38 @@
+/datum/surgery/gender_reassignment
+ name = "gender reassignment"
+ steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/reshape_genitals, /datum/surgery_step/close)
+ species = list(/mob/living/carbon/human)
+ possible_locs = list("groin")
+
+
+//reshape_genitals
+/datum/surgery_step/reshape_genitals
+ name = "reshape genitals"
+ implements = list(/obj/item/weapon/scalpel = 100, /obj/item/weapon/hatchet = 50, /obj/item/weapon/wirecutters = 35)
+ time = 64
+
+/datum/surgery_step/reshape_genitals/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(target.gender == FEMALE)
+ user.visible_message("[user] begins to reshape [target]'s genitals to look more masculine.", "You begin to reshape [target]'s genitals to look more masculine...")
+ else
+ user.visible_message("[user] begins to reshape [target]'s genitals to look more feminine.", "You begin to reshape [target]'s genitals to look more feminine...")
+
+/datum/surgery_step/reshape_genitals/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ var/mob/living/carbon/human/H = target //no type check, as that should be handled by the surgery
+ H.gender_ambiguous = 0
+ if(target.gender == FEMALE)
+ user.visible_message("[user] has made a man of [target]!", "You made [target] a man.")
+ target.gender = MALE
+ else
+ user.visible_message("[user] has made a woman of [target]!", "You made [target] a woman.")
+ target.gender = FEMALE
+ target.regenerate_icons()
+ return 1
+
+/datum/surgery_step/reshape_genitals/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ var/mob/living/carbon/human/H = target
+ H.gender_ambiguous = 1
+ user.visible_message("[user] accidentally mutilates [target]'s genitals beyond the point of recognition!", "You accidentally mutilate [target]'s genitals beyond the point of recognition!")
+ target.gender = pick(MALE, FEMALE)
+ target.regenerate_icons()
+ return 1
diff --git a/icons/salvaging/scrapper.dmi b/icons/salvaging/scrapper.dmi
new file mode 100644
index 0000000000..8d38f01acd
Binary files /dev/null and b/icons/salvaging/scrapper.dmi differ
diff --git a/tgui/src/interfaces/dogborg_sleeper.ract b/tgui/src/interfaces/dogborg_sleeper.ract
new file mode 100644
index 0000000000..46da372198
--- /dev/null
+++ b/tgui/src/interfaces/dogborg_sleeper.ract
@@ -0,0 +1,56 @@
+
+
+
+
+ {{data.occupant.name ? data.occupant.name : "No Occupant"}}
+
+ {{#if data.occupied}}
+
+ {{data.occupant.stat == 0 ? "Conscious" : data.occupant.stat == 1 ? "Unconcious" : "Dead"}}
+
+
+ {{Math.round(adata.occupant.health)}}
+
+ {{#each [{label: "Brute", type: "bruteLoss"}, {label: "Respiratory", type: "oxyLoss"}, {label: "Toxin", type: "toxLoss"}, {label: "Burn", type: "fireLoss"}]}}
+
+ {{Math.round(adata.occupant[type])}}
+
+ {{/each}}
+
+ {{data.occupant.cloneLoss ? "Damaged" : "Healthy"}}
+
+
+ {{data.occupant.brainLoss ? "Abnormal" : "Healthy"}}
+
+
+ {{#each adata.occupant.reagents}}
+ {{Math.fixed(volume, 1)}} units of {{name}}
+ {{else}}
+ Pure
+ {{/each}}
+
+ {{/if}}
+
+
+
+ Eject
+
+
+ {{#each data.chems}}
+ {{name}}
+ {{/each}}
+
+
