Game Over
Forever." - if(settlers.len == 0) - dat += "
Your entire crew died, your ship joins the fleet of ghost-ships littering the galaxy." - else - if(food <= 0) - dat += "
You ran out of food and starved." - if(emagged) - user.nutrition = 0 //yeah you pretty hongry - user << "Your body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor." - if(fuel <= 0) - dat += "
You ran out of fuel, and drift, slowly, into a star." - if(emagged) - var/mob/living/M = user - M.adjust_fire_stacks(5) - M.IgniteMob() //flew into a star, so you're on fire - user << "You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames." - dat += "
" - - if(emagged) - user << "You're never going to make it to Orion..." - user.death() - emagged = 0 //removes the emagged status after you lose - gameStatus = ORION_STATUS_START - name = "The Orion Trail" - desc = "Learn how our ancestors got to Orion, and have fun in the process!" - - else if(event) - dat = eventdat - else if(gameStatus == ORION_STATUS_NORMAL) - var/title = stops[turns] - var/subtext = stopblurbs[turns] - dat = "
[title]
Crew:
" - dat += english_list(settlers) - dat += "Food: [food] | Fuel: [fuel]" - dat += "
Engine Parts: [engine] | Hull Panels: [hull] | Electronics: [electronics]" - if(turns == 7) - dat += "" - else - dat += "" - dat += "" - dat += "" - else - dat = "
The Orion Trail
Experience the journey of your ancestors!
" - dat += "
[event]
They have stolen [sfood] Food and [sfuel] Fuel." - else if(prob(10)) - var/deadname = remove_crewmember() - eventdat += "
[deadname] tried to fight back but was killed." - else - eventdat += "
Fortunately you fended them off without any trouble." - eventdat += "" - eventdat += "" - canContinueEvent = 1 - - if(ORION_TRAIL_FLUX) - eventdat += "This region of space is highly turbulent.
If we go slowly we may avoid more damage, but if we keep our speed we won't waste supplies." - eventdat += "
What will you do?" - eventdat += "" - eventdat += "" - - if(ORION_TRAIL_ILLNESS) - eventdat += "A deadly illness has been contracted!" - var/deadname = remove_crewmember() - eventdat += "
[deadname] was killed by the disease." - eventdat += "" - eventdat += "" - canContinueEvent = 1 - - if(ORION_TRAIL_BREAKDOWN) - eventdat += "Oh no! The engine has broken down!" - eventdat += "
You can repair it with an engine part, or you can make repairs for 3 days." - if(engine >= 1) - eventdat += "" - else - eventdat += "" - eventdat += "" - - if(ORION_TRAIL_MALFUNCTION) - eventdat += "The ship's systems are malfunctioning!" - eventdat += "
You can replace the broken electronics with spares, or you can spend 3 days troubleshooting the AI." - if(electronics >= 1) - eventdat += "" - else - eventdat += "" - eventdat += "" - - if(ORION_TRAIL_COLLISION) - eventdat += "Something hit us! Looks like there's some hull damage." - if(prob(25)) - var/sfood = rand(5,15) - var/sfuel = rand(5,15) - food -= sfood - fuel -= sfuel - eventdat += "
[sfood] Food and [sfuel] Fuel was vented out into space." - if(prob(10)) - var/deadname = remove_crewmember() - eventdat += "
[deadname] was killed by rapid depressurization." - eventdat += "
You can repair the damage with hull plates, or you can spend the next 3 days welding scrap together." - if(hull >= 1) - eventdat += "" - else - eventdat += "" - eventdat += "" - - if(ORION_TRAIL_BLACKHOLE) - eventdat += "You were swept away into the black hole." - eventdat += "" - eventdat += "" - settlers = list() - - if(ORION_TRAIL_LING) - eventdat += "Strange reports warn of changelings infiltrating crews on trips to Orion..." - if(settlers.len <= 2) - eventdat += "
Your crew's chance of reaching Orion is so slim the changelings likely avoided your ship..." - eventdat += "" - eventdat += "" - if(prob(10)) // "likely", I didn't say it was guaranteed! - lings_aboard = min(++lings_aboard,2) - else - if(lings_aboard) //less likely to stack lings - if(prob(20)) - lings_aboard = min(++lings_aboard,2) - else if(prob(70)) - lings_aboard = min(++lings_aboard,2) - - eventdat += "" - eventdat += "" - eventdat += "" - canContinueEvent = 1 - - if(ORION_TRAIL_LING_ATTACK) - if(lings_aboard <= 0) //shouldn't trigger, but hey. - eventdat += "Haha, fooled you, there are no changelings on board!" - eventdat += "
(You should report this to a coder :S)" - else - var/ling1 = remove_crewmember() - var/ling2 = "" - if(lings_aboard >= 2) - ling2 = remove_crewmember() - - eventdat += "Oh no, some of your crew are Changelings!" - if(ling2) - eventdat += "
[ling1] and [ling2]'s arms twist and contort into grotesque blades!" - else - eventdat += "
[ling1]'s arm twists and contorts into a grotesque blade!" - - var/chance2attack = alive*20 - if(prob(chance2attack)) - var/chancetokill = 30*lings_aboard-(5*alive) //eg: 30*2-(10) = 50%, 2 lings, 2 crew is 50% chance - if(prob(chancetokill)) - var/deadguy = remove_crewmember() - eventdat += "
The Changeling[ling2 ? "s":""] run[ling2 ? "":"s"] up to [deadguy] and capitulates them!" - else - eventdat += "
You valiantly fight off the Changeling[ling2 ? "s":""]!" - eventdat += "
You cut the Changeling[ling2 ? "s":""] up into meat... Eww" - if(ling2) - food += 30 - lings_aboard = max(0,lings_aboard-2) - else - food += 15 - lings_aboard = max(0,--lings_aboard) - else - eventdat += "
The Changeling[ling2 ? "s":""] run[ling2 ? "":"s"] away, What wimps!" - if(ling2) - lings_aboard = max(0,lings_aboard-2) - else - lings_aboard = max(0,--lings_aboard) - - eventdat += "" - eventdat += "" - canContinueEvent = 1 - - - if(ORION_TRAIL_SPACEPORT) - gameStatus = ORION_STATUS_MARKET - if(spaceport_raided) - eventdat += "The Spaceport is on high alert! they wont let you dock since you tried to attack them!" - if(last_spaceport_action) - eventdat += "
Last Spaceport Action: [last_spaceport_action]" - eventdat += "" - eventdat += "" - else - eventdat += "You pull the ship up to dock at a nearby Spaceport, lucky find!" - eventdat += "
This Spaceport is home to travellers who failed to reach Orion, but managed to find a different home..." - eventdat += "
Trading terms: FU = Fuel, FO = Food" - if(last_spaceport_action) - eventdat += "
Last Spaceport Action: [last_spaceport_action]" - eventdat += "
Crew:
" - eventdat += english_list(settlers) - eventdat += "Food: [food] | Fuel: [fuel]" - eventdat += "
Engine Parts: [engine] | Hull Panels: [hull] | Electronics: [electronics]" - - - //If your crew is pathetic you can get freebies (provided you haven't already gotten one from this port) - if(!spaceport_freebie && (fuel < 20 || food < 20)) - spaceport_freebie++ - var/FU = 10 - var/FO = 10 - var/freecrew = 0 - if(prob(30)) - FU = 25 - FO = 25 - - if(prob(10)) - add_crewmember() - freecrew++ - - eventdat += "
The traders of the spaceport take pitty on you, and give you some food and fuel (+[FU]FU,+[FO]FO)" - if(freecrew) - eventdat += "
You also gain a new crewmember!" - - fuel += FU - food += FO - - //CREW INTERACTIONS - eventdat += "
Crew Management:
" - - //Buy crew - if(food >= 10 && fuel >= 10) - eventdat += "Hire a new Crewmember (-10FU,-10FO)
" - else - eventdat += "Cant afford a new Crewmember
" - - //Sell crew - if(settlers.len > 1) - eventdat += "Sell crew for Fuel and Food (+7FU,+7FO)
" - else - eventdat += "Cant afford to sell a Crewmember
" - - //BUY/SELL STUFF - eventdat += "Spare Parts:
" - - //Engine parts - if(fuel > 5) - eventdat += "" - else - eventdat += "Cant afford to buy Engine Parts" - - //Hull plates - if(fuel > 5) - eventdat += "
" - else - eventdat += "Cant afford to buy Hull Plates" - - //Electronics - if(fuel > 5) - eventdat += "
" - else - eventdat += "Cant afford to buy Spare Electronics" - - //Trade - if(fuel > 5) - eventdat += "
Trade Fuel for Food (-5FU,+5FO)
" - else - eventdat += "Cant afford to Trade Fuel for Food 5) - eventdat += "
Trade Food for Fuel (+5FU,-5FO)
" - else - eventdat += "Cant afford to Trade Food for FuelYou override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode." - name = "The Orion Trail: Realism Edition" - desc = "Learn how our ancestors got to Orion, and try not to die in the process!" - newgame() - emagged = 1 - -/mob/living/simple_animal/hostile/syndicate/ranged/orion - name = "Spaceport Security" - desc = "The Premier security forces for all spaceports found along the Orion Trail." - faction = list("orion") - loot = list(/obj/effect/mob_spawn/human/corpse/orionsecurity, - /obj/item/weapon/gun/projectile/automatic/c20r/unrestricted, - /obj/item/weapon/shield/energy) - -/obj/effect/mob_spawn/human/corpse/orionsecurity - name = "Spaceport Security" - uniform = /obj/item/clothing/under/syndicate - suit = /obj/item/clothing/suit/armor/vest - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat - radio = /obj/item/device/radio/headset - mask = /obj/item/clothing/mask/gas - helmet = /obj/item/clothing/head/helmet/swat - back = /obj/item/weapon/storage/backpack - has_id = 1 - id_job = "Officer" - id_access = "Syndicate" - -/obj/item/weapon/orion_ship - name = "model settler ship" - desc = "A model spaceship, it looks like those used back in the day when travelling to Orion! It even has a miniature FX-293 reactor, which was renowned for its instability and tendency to explode..." - icon = 'icons/obj/toy.dmi' - icon_state = "ship" - w_class = 2 - var/active = 0 //if the ship is on - -/obj/item/weapon/orion_ship/examine(mob/user) - ..() - if(!(in_range(user, src))) - return - if(!active) - user << "There's a little switch on the bottom. It's flipped down." - else - user << "There's a little switch on the bottom. It's flipped up." - -/obj/item/weapon/orion_ship/attack_self(mob/user) //Minibomb-level explosion. Should probably be more because of how hard it is to survive the machine! Also, just over a 5-second fuse - if(active) - return - - message_admins("[key_name_admin(usr)] primed an explosive Orion ship for detonation.") - log_game("[key_name(usr)] primed an explosive Orion ship for detonation.") - - user << "You flip the switch on the underside of [src]." - active = 1 - src.visible_message("[src] softly beeps and whirs to life!") - playsound(src.loc, 'sound/machines/defib_SaftyOn.ogg', 25, 1) - say("This is ship ID #[rand(1,1000)] to Orion Port Authority. We're coming in for landing, over.") - sleep(20) - src.visible_message("[src] begins to vibrate...") - say("Uh, Port? Having some issues with our reactor, could you check it out? Over.") - sleep(30) - say("Oh, God! Code Eight! CODE EIGHT! IT'S GONNA BL-") - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 25, 1) - sleep(3.6) - src.visible_message("[src] explodes!") - explosion(src.loc, 2,4,8, flame_range = 16) - qdel(src) - - -#undef ORION_TRAIL_WINTURN -#undef ORION_TRAIL_RAIDERS -#undef ORION_TRAIL_FLUX -#undef ORION_TRAIL_ILLNESS -#undef ORION_TRAIL_BREAKDOWN -#undef ORION_TRAIL_LING -#undef ORION_TRAIL_LING_ATTACK -#undef ORION_TRAIL_MALFUNCTION -#undef ORION_TRAIL_COLLISION -#undef ORION_TRAIL_SPACEPORT -#undef ORION_TRAIL_BLACKHOLE - -#undef ORION_STATUS_START -#undef ORION_STATUS_NORMAL -#undef ORION_STATUS_GAMEOVER -#undef ORION_STATUS_MARKET +/obj/machinery/computer/arcade/ + name = "random arcade" + desc = "random arcade machine" + icon_state = "arcade" + icon_keyboard = null + icon_screen = "invaders" + var/list/prizes = list( + /obj/item/weapon/storage/box/snappops = 2, + /obj/item/toy/talking/AI = 2, + /obj/item/toy/talking/codex_gigas = 2, + /obj/item/clothing/under/syndicate/tacticool = 2, + /obj/item/toy/sword = 2, + /obj/item/toy/gun = 2, + /obj/item/weapon/gun/projectile/shotgun/toy/crossbow = 2, + /obj/item/weapon/storage/box/fakesyndiesuit = 2, + /obj/item/weapon/storage/crayons = 2, + /obj/item/toy/spinningtoy = 2, + /obj/item/toy/prize/ripley = 1, + /obj/item/toy/prize/fireripley = 1, + /obj/item/toy/prize/deathripley = 1, + /obj/item/toy/prize/gygax = 1, + /obj/item/toy/prize/durand = 1, + /obj/item/toy/prize/honk = 1, + /obj/item/toy/prize/marauder = 1, + /obj/item/toy/prize/seraph = 1, + /obj/item/toy/prize/mauler = 1, + /obj/item/toy/prize/odysseus = 1, + /obj/item/toy/prize/phazon = 1, + /obj/item/toy/prize/reticence = 1, + /obj/item/toy/cards/deck = 2, + /obj/item/toy/nuke = 2, + /obj/item/toy/minimeteor = 2, + /obj/item/toy/redbutton = 2, + /obj/item/toy/talking/owl = 2, + /obj/item/toy/talking/griffin = 2, + /obj/item/toy/talking/skeleton = 2, + /obj/item/weapon/coin/antagtoken = 2, + /obj/item/stack/tile/fakespace/loaded = 2, + /obj/item/toy/toy_xeno = 2, + /obj/item/weapon/restraints/handcuffs/fake = 2) + +/obj/machinery/computer/arcade/New() + ..() + // If it's a generic arcade machine, pick a random arcade + // circuit board for it and make the new machine + if(!circuit) + var/choice = pick(subtypesof(/obj/item/weapon/circuitboard/computer/arcade)) + var/obj/item/weapon/circuitboard/CB = new choice() + new CB.build_path(loc, CB) + qdel(src) + +/obj/machinery/computer/arcade/proc/prizevend() + if(prob(0.0001)) //1 in a million + new /obj/item/weapon/gun/energy/pulse(src) + + if(!contents.len) + var/prizeselect = pickweight(prizes) + new prizeselect(src) + + var/atom/movable/prize = pick(contents) + visible_message( + "[src] dispenses a [prize]!", + "You hear a chime and a clunk.") + + prize.loc = src.loc + +/obj/machinery/computer/arcade/emp_act(severity) + ..(severity) + + if(stat & (NOPOWER|BROKEN)) + return + + var/empprize = null + var/num_of_prizes = 0 + switch(severity) + if(1) + num_of_prizes = rand(1,4) + if(2) + num_of_prizes = rand(0,2) + for(var/i = num_of_prizes; i > 0; i--) + empprize = pickweight(prizes) + new empprize(src.loc) + explosion(src.loc, -1, 0, 1+num_of_prizes, flame_range = 1+num_of_prizes) + + +// ** BATTLE ** // + + +/obj/machinery/computer/arcade/battle + name = "arcade machine" + desc = "Does not support Pinball." + icon_state = "arcade" + circuit = /obj/item/weapon/circuitboard/computer/arcade/battle + var/enemy_name = "Space Villian" + var/temp = "Winners don't use space drugs" //Temporary message, for attack messages, etc + var/player_hp = 30 //Player health/attack points + var/player_mp = 10 + var/enemy_hp = 45 //Enemy health/attack points + var/enemy_mp = 20 + var/gameover = 0 + var/blocked = 0 //Player cannot attack/heal while set + var/turtle = 0 + +/obj/machinery/computer/arcade/battle/New() + ..() + var/name_action + var/name_part1 + var/name_part2 + + name_action = pick("Defeat ", "Annihilate ", "Save ", "Strike ", "Stop ", "Destroy ", "Robust ", "Romance ", "Pwn ", "Own ", "Ban ") + + name_part1 = pick("the Automatic ", "Farmer ", "Lord ", "Professor ", "the Cuban ", "the Evil ", "the Dread King ", "the Space ", "Lord ", "the Great ", "Duke ", "General ") + name_part2 = pick("Melonoid", "Murdertron", "Sorcerer", "Ruin", "Jeff", "Ectoplasm", "Crushulon", "Uhangoid", "Vhakoid", "Peteoid", "slime", "Griefer", "ERPer", "Lizard Man", "Unicorn", "Bloopers") + + src.enemy_name = replacetext((name_part1 + name_part2), "the ", "") + src.name = (name_action + name_part1 + name_part2) + +/obj/machinery/computer/arcade/battle/attack_hand(mob/user) + if(..()) + return + user.set_machine(src) + var/dat = "Close" + dat += "
[src.enemy_name]
[src.temp]
Game Over
Forever." + if(settlers.len == 0) + dat += "
Your entire crew died, your ship joins the fleet of ghost-ships littering the galaxy." + else + if(food <= 0) + dat += "
You ran out of food and starved." + if(emagged) + user.nutrition = 0 //yeah you pretty hongry + user << "Your body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor." + if(fuel <= 0) + dat += "
You ran out of fuel, and drift, slowly, into a star." + if(emagged) + var/mob/living/M = user + M.adjust_fire_stacks(5) + M.IgniteMob() //flew into a star, so you're on fire + user << "You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames." + dat += "
" + + if(emagged) + user << "You're never going to make it to Orion..." + user.death() + emagged = 0 //removes the emagged status after you lose + gameStatus = ORION_STATUS_START + name = "The Orion Trail" + desc = "Learn how our ancestors got to Orion, and have fun in the process!" + + else if(event) + dat = eventdat + else if(gameStatus == ORION_STATUS_NORMAL) + var/title = stops[turns] + var/subtext = stopblurbs[turns] + dat = "
[title]
Crew:
" + dat += english_list(settlers) + dat += "Food: [food] | Fuel: [fuel]" + dat += "
Engine Parts: [engine] | Hull Panels: [hull] | Electronics: [electronics]" + if(turns == 7) + dat += "" + else + dat += "" + dat += "" + dat += "" + else + dat = "
The Orion Trail
Experience the journey of your ancestors!
" + dat += "
[event]
They have stolen [sfood] Food and [sfuel] Fuel." + else if(prob(10)) + var/deadname = remove_crewmember() + eventdat += "
[deadname] tried to fight back but was killed." + else + eventdat += "
Fortunately you fended them off without any trouble." + eventdat += "" + eventdat += "" + canContinueEvent = 1 + + if(ORION_TRAIL_FLUX) + eventdat += "This region of space is highly turbulent.
If we go slowly we may avoid more damage, but if we keep our speed we won't waste supplies." + eventdat += "
What will you do?" + eventdat += "" + eventdat += "" + + if(ORION_TRAIL_ILLNESS) + eventdat += "A deadly illness has been contracted!" + var/deadname = remove_crewmember() + eventdat += "
[deadname] was killed by the disease." + eventdat += "" + eventdat += "" + canContinueEvent = 1 + + if(ORION_TRAIL_BREAKDOWN) + eventdat += "Oh no! The engine has broken down!" + eventdat += "
You can repair it with an engine part, or you can make repairs for 3 days." + if(engine >= 1) + eventdat += "" + else + eventdat += "" + eventdat += "" + + if(ORION_TRAIL_MALFUNCTION) + eventdat += "The ship's systems are malfunctioning!" + eventdat += "
You can replace the broken electronics with spares, or you can spend 3 days troubleshooting the AI." + if(electronics >= 1) + eventdat += "" + else + eventdat += "" + eventdat += "" + + if(ORION_TRAIL_COLLISION) + eventdat += "Something hit us! Looks like there's some hull damage." + if(prob(25)) + var/sfood = rand(5,15) + var/sfuel = rand(5,15) + food -= sfood + fuel -= sfuel + eventdat += "
[sfood] Food and [sfuel] Fuel was vented out into space." + if(prob(10)) + var/deadname = remove_crewmember() + eventdat += "
[deadname] was killed by rapid depressurization." + eventdat += "
You can repair the damage with hull plates, or you can spend the next 3 days welding scrap together." + if(hull >= 1) + eventdat += "" + else + eventdat += "" + eventdat += "" + + if(ORION_TRAIL_BLACKHOLE) + eventdat += "You were swept away into the black hole." + eventdat += "" + eventdat += "" + settlers = list() + + if(ORION_TRAIL_LING) + eventdat += "Strange reports warn of changelings infiltrating crews on trips to Orion..." + if(settlers.len <= 2) + eventdat += "
Your crew's chance of reaching Orion is so slim the changelings likely avoided your ship..." + eventdat += "" + eventdat += "" + if(prob(10)) // "likely", I didn't say it was guaranteed! + lings_aboard = min(++lings_aboard,2) + else + if(lings_aboard) //less likely to stack lings + if(prob(20)) + lings_aboard = min(++lings_aboard,2) + else if(prob(70)) + lings_aboard = min(++lings_aboard,2) + + eventdat += "" + eventdat += "" + eventdat += "" + canContinueEvent = 1 + + if(ORION_TRAIL_LING_ATTACK) + if(lings_aboard <= 0) //shouldn't trigger, but hey. + eventdat += "Haha, fooled you, there are no changelings on board!" + eventdat += "
(You should report this to a coder :S)" + else + var/ling1 = remove_crewmember() + var/ling2 = "" + if(lings_aboard >= 2) + ling2 = remove_crewmember() + + eventdat += "Oh no, some of your crew are Changelings!" + if(ling2) + eventdat += "
[ling1] and [ling2]'s arms twist and contort into grotesque blades!" + else + eventdat += "
[ling1]'s arm twists and contorts into a grotesque blade!" + + var/chance2attack = alive*20 + if(prob(chance2attack)) + var/chancetokill = 30*lings_aboard-(5*alive) //eg: 30*2-(10) = 50%, 2 lings, 2 crew is 50% chance + if(prob(chancetokill)) + var/deadguy = remove_crewmember() + eventdat += "
The Changeling[ling2 ? "s":""] run[ling2 ? "":"s"] up to [deadguy] and capitulates them!" + else + eventdat += "
You valiantly fight off the Changeling[ling2 ? "s":""]!" + eventdat += "
You cut the Changeling[ling2 ? "s":""] up into meat... Eww" + if(ling2) + food += 30 + lings_aboard = max(0,lings_aboard-2) + else + food += 15 + lings_aboard = max(0,--lings_aboard) + else + eventdat += "
The Changeling[ling2 ? "s":""] run[ling2 ? "":"s"] away, What wimps!" + if(ling2) + lings_aboard = max(0,lings_aboard-2) + else + lings_aboard = max(0,--lings_aboard) + + eventdat += "" + eventdat += "" + canContinueEvent = 1 + + + if(ORION_TRAIL_SPACEPORT) + gameStatus = ORION_STATUS_MARKET + if(spaceport_raided) + eventdat += "The Spaceport is on high alert! they wont let you dock since you tried to attack them!" + if(last_spaceport_action) + eventdat += "
Last Spaceport Action: [last_spaceport_action]" + eventdat += "" + eventdat += "" + else + eventdat += "You pull the ship up to dock at a nearby Spaceport, lucky find!" + eventdat += "
This Spaceport is home to travellers who failed to reach Orion, but managed to find a different home..." + eventdat += "
Trading terms: FU = Fuel, FO = Food" + if(last_spaceport_action) + eventdat += "
Last Spaceport Action: [last_spaceport_action]" + eventdat += "
Crew:
" + eventdat += english_list(settlers) + eventdat += "Food: [food] | Fuel: [fuel]" + eventdat += "
Engine Parts: [engine] | Hull Panels: [hull] | Electronics: [electronics]" + + + //If your crew is pathetic you can get freebies (provided you haven't already gotten one from this port) + if(!spaceport_freebie && (fuel < 20 || food < 20)) + spaceport_freebie++ + var/FU = 10 + var/FO = 10 + var/freecrew = 0 + if(prob(30)) + FU = 25 + FO = 25 + + if(prob(10)) + add_crewmember() + freecrew++ + + eventdat += "
The traders of the spaceport take pitty on you, and give you some food and fuel (+[FU]FU,+[FO]FO)" + if(freecrew) + eventdat += "
You also gain a new crewmember!" + + fuel += FU + food += FO + + //CREW INTERACTIONS + eventdat += "
Crew Management:
" + + //Buy crew + if(food >= 10 && fuel >= 10) + eventdat += "Hire a new Crewmember (-10FU,-10FO)
" + else + eventdat += "Cant afford a new Crewmember
" + + //Sell crew + if(settlers.len > 1) + eventdat += "Sell crew for Fuel and Food (+7FU,+7FO)
" + else + eventdat += "Cant afford to sell a Crewmember
" + + //BUY/SELL STUFF + eventdat += "Spare Parts:
" + + //Engine parts + if(fuel > 5) + eventdat += "" + else + eventdat += "Cant afford to buy Engine Parts" + + //Hull plates + if(fuel > 5) + eventdat += "
" + else + eventdat += "Cant afford to buy Hull Plates" + + //Electronics + if(fuel > 5) + eventdat += "
" + else + eventdat += "Cant afford to buy Spare Electronics" + + //Trade + if(fuel > 5) + eventdat += "
Trade Fuel for Food (-5FU,+5FO)
" + else + eventdat += "Cant afford to Trade Fuel for Food 5) + eventdat += "
Trade Food for Fuel (+5FU,-5FO)
" + else + eventdat += "Cant afford to Trade Food for FuelYou override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode." + name = "The Orion Trail: Realism Edition" + desc = "Learn how our ancestors got to Orion, and try not to die in the process!" + newgame() + emagged = 1 + +/mob/living/simple_animal/hostile/syndicate/ranged/orion + name = "Spaceport Security" + desc = "The Premier security forces for all spaceports found along the Orion Trail." + faction = list("orion") + loot = list(/obj/effect/mob_spawn/human/corpse/orionsecurity, + /obj/item/weapon/gun/projectile/automatic/c20r/unrestricted, + /obj/item/weapon/shield/energy) + +/obj/effect/mob_spawn/human/corpse/orionsecurity + name = "Spaceport Security" + uniform = /obj/item/clothing/under/syndicate + suit = /obj/item/clothing/suit/armor/vest + shoes = /obj/item/clothing/shoes/combat + gloves = /obj/item/clothing/gloves/combat + radio = /obj/item/device/radio/headset + mask = /obj/item/clothing/mask/gas + helmet = /obj/item/clothing/head/helmet/swat + back = /obj/item/weapon/storage/backpack + has_id = 1 + id_job = "Officer" + id_access = "Syndicate" + +/obj/item/weapon/orion_ship + name = "model settler ship" + desc = "A model spaceship, it looks like those used back in the day when travelling to Orion! It even has a miniature FX-293 reactor, which was renowned for its instability and tendency to explode..." + icon = 'icons/obj/toy.dmi' + icon_state = "ship" + w_class = 2 + var/active = 0 //if the ship is on + +/obj/item/weapon/orion_ship/examine(mob/user) + ..() + if(!(in_range(user, src))) + return + if(!active) + user << "There's a little switch on the bottom. It's flipped down." + else + user << "There's a little switch on the bottom. It's flipped up." + +/obj/item/weapon/orion_ship/attack_self(mob/user) //Minibomb-level explosion. Should probably be more because of how hard it is to survive the machine! Also, just over a 5-second fuse + if(active) + return + + message_admins("[key_name_admin(usr)] primed an explosive Orion ship for detonation.") + log_game("[key_name(usr)] primed an explosive Orion ship for detonation.") + + user << "You flip the switch on the underside of [src]." + active = 1 + src.visible_message("[src] softly beeps and whirs to life!") + playsound(src.loc, 'sound/machines/defib_SaftyOn.ogg', 25, 1) + say("This is ship ID #[rand(1,1000)] to Orion Port Authority. We're coming in for landing, over.") + sleep(20) + src.visible_message("[src] begins to vibrate...") + say("Uh, Port? Having some issues with our reactor, could you check it out? Over.") + sleep(30) + say("Oh, God! Code Eight! CODE EIGHT! IT'S GONNA BL-") + playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 25, 1) + sleep(3.6) + src.visible_message("[src] explodes!") + explosion(src.loc, 2,4,8, flame_range = 16) + qdel(src) + + +#undef ORION_TRAIL_WINTURN +#undef ORION_TRAIL_RAIDERS +#undef ORION_TRAIL_FLUX +#undef ORION_TRAIL_ILLNESS +#undef ORION_TRAIL_BREAKDOWN +#undef ORION_TRAIL_LING +#undef ORION_TRAIL_LING_ATTACK +#undef ORION_TRAIL_MALFUNCTION +#undef ORION_TRAIL_COLLISION +#undef ORION_TRAIL_SPACEPORT +#undef ORION_TRAIL_BLACKHOLE + +#undef ORION_STATUS_START +#undef ORION_STATUS_NORMAL +#undef ORION_STATUS_GAMEOVER +#undef ORION_STATUS_MARKET diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index f265bfe46ef..04fe6350d4c 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -320,39 +320,63 @@ doortype = /obj/structure/door_assembly/door_assembly_cult hackProof = 1 aiControlDisabled = 1 + var/openingoverlaytype = /obj/effect/overlay/temp/cult/door + var/friendly = FALSE /obj/machinery/door/airlock/cult/allowed(mob/M) - if(!iscultist(M)) + if(!density) + return 1 + if(friendly || \ + iscultist(M) || \ + istype(M, /mob/living/simple_animal/shade) || \ + istype(M, /mob/living/simple_animal/hostile/construct)) + PoolOrNew(openingoverlaytype, src.loc) + return 1 + else PoolOrNew(/obj/effect/overlay/temp/cult/sac, src.loc) var/atom/throwtarget throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(M, src))) M << pick(sound('sound/hallucinations/turn_around1.ogg',0,1,50), sound('sound/hallucinations/turn_around2.ogg',0,1,50)) + if(M.client) + var/old_color = M.client.color + M.client.color = "#960000" + spawn(0)//animate is a delay, avoid delay, etc + animate(M.client,color = old_color, time = 20) M.Weaken(2) M.throw_at_fast(throwtarget, 5, 1,src) return 0 - else - PoolOrNew(/obj/effect/overlay/temp/cult/door, src.loc) - return 1 - /obj/machinery/door/airlock/cult/narsie_act() return +/obj/machinery/door/airlock/cult/friendly + friendly = TRUE + /obj/machinery/door/airlock/cult/glass doortype = /obj/structure/door_assembly/door_assembly_cult/glass glass = 1 opacity = 0 +/obj/machinery/door/airlock/cult/glass/friendly + friendly = TRUE + /obj/machinery/door/airlock/cult/unruned icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi' overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi' doortype = /obj/structure/door_assembly/door_assembly_cult/unruned + openingoverlaytype = /obj/effect/overlay/temp/cult/door/unruned + +/obj/machinery/door/airlock/cult/unruned/friendly + friendly = TRUE /obj/machinery/door/airlock/cult/unruned/glass doortype = /obj/structure/door_assembly/door_assembly_cult/unruned/glass glass = 1 opacity = 0 +/obj/machinery/door/airlock/cult/unruned/glass/friendly + friendly = TRUE + ////////////////////////////////// /* Misc Airlocks diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index dc9bf8e0115..c9836d94f24 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -14,8 +14,8 @@ var/icon_recharging = "recharge" var/icon_creating = "make" - var/metal = 0 - var/glass = 0 + var/datum/material_container/materials + var/list/using_materials var/metal_cost = 1000 var/glass_cost = 1000 var/power_used = 1000 @@ -39,25 +39,31 @@ /obj/machinery/droneDispenser/New() ..() health = max_health + materials = new(src, list(MAT_METAL=1, MAT_GLASS=1), MINERAL_MATERIAL_AMOUNT*MAX_STACK_SIZE*2) + using_materials = list(MAT_METAL=metal_cost, MAT_GLASS=glass_cost) SSmachine.processing |= src /obj/machinery/droneDispenser/Destroy() SSmachine.processing -= src + qdel(materials) + materials = null return ..() -/obj/machinery/droneDispenser/preloaded - metal = 5000 - glass = 5000 +/obj/machinery/droneDispenser/preloaded/New() + ..() + materials.insert_amount(5000) /obj/machinery/droneDispenser/syndrone //Please forgive me name = "syndrone shell dispenser" desc = "A suspicious machine that will create Syndicate exterminator drones when supplied with metal and glass. Disgusting." - metal = 25000 - glass = 25000 dispense_type = /obj/item/drone_shell/syndrone cooldownTime = 100 //If we're gonna be a jackass, go the full mile - 10 second recharge timer end_create_message = "dispenses a suspicious drone shell." +/obj/machinery/droneDispenser/syndrone/New() + ..() + materials.insert_amount(25000) + /obj/machinery/droneDispenser/syndrone/badass //Please forgive me name = "badass syndrone shell dispenser" desc = "A suspicious machine that will create Syndicate exterminator drones when supplied with metal and glass. Disgusting. This one seems ominous." @@ -74,9 +80,9 @@ glass_cost = 2000 power_used = 2000 -/obj/machinery/droneDispenser/snowflake/preloaded - metal = 10000 - glass = 10000 +/obj/machinery/droneDispenser/snowflake/preloaded/New() + ..() + materials.insert_amount(10000) /obj/machinery/droneDispenser/hivebot //An example of a custom drone dispenser. This one requires no materials and creates basic hivebots name = "hivebot fabricator" @@ -125,9 +131,9 @@ if(stat & BROKEN) user << "[src] is smoking and steadily buzzing. It seems to be broken." if(metal_cost) - user << "It has [metal] units of metal stored." + user << "It has [materials.amount(MAT_METAL)] units of metal stored." if(glass_cost) - user << "It has [glass] units of glass stored." + user << "It has [materials.amount(MAT_GLASS)] units of glass stored." /obj/machinery/droneDispenser/power_change() ..() @@ -144,7 +150,7 @@ ..() if(stat & (NOPOWER|BROKEN) || !anchored) return - if((metal_cost && glass_cost) && (metal < metal_cost || glass < glass_cost)) + if((metal_cost && glass_cost) && materials.can_use_amount(mats=using_materials)) return if(droneMadeRecently) icon_state = icon_recharging @@ -157,12 +163,7 @@ icon_state = icon_creating sleep(30) icon_state = icon_on - metal -= metal_cost - glass -= glass_cost - if(metal < 0) - metal = 0 - if(glass < 0) - glass = 0 + materials.use_amount(using_materials) if(power_used) use_power(power_used) new dispense_type(loc) @@ -197,19 +198,16 @@ return if(!user.canUseTopic(src)) return - stack = Clamp(stack, 0, sheets.max_amount) - sheets.use(stack) - if(!stack) - if(!user.unEquip(O)) - user << "[O] is stuck to your hand, you can't get it off!" - return - user.drop_item() - O.loc = src - metal += O.materials[MAT_METAL] * stack - glass += O.materials[MAT_GLASS] * stack - user << "You insert [stack] sheet[stack > 1 ? "s" : ""] to [src]." - if((O && O.loc == src) || !stack) - qdel(O) + if(!user.canUnEquip(sheets)) + user << "[O] is stuck to your hand, you can't get it off!" + return + stack = Clamp(stack, 1, sheets.max_amount) + stack = materials.insert_stack(sheets, stack) + if(stack) + user << "You insert [stack] sheet[stack > 1 ? "s" : ""] into [src]." + else + user << "The [src] can't use [sheets]." + else if(istype(O, /obj/item/weapon/weldingtool)) if(stat & BROKEN) var/obj/item/weapon/weldingtool/WT = O diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 77028a43d1a..d3e9e6727dc 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -323,9 +323,9 @@ Class Procs: add_fingerprint(user) return 0 -/obj/machinery/CheckParts() +/obj/machinery/CheckParts(list/parts_list) + ..() RefreshParts() - return /obj/machinery/proc/RefreshParts() //Placeholder proc for machines that are built using frames. return diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index a37a0e4d14e..319ce51d949 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -8,13 +8,15 @@ var/const/SAFETY_COOLDOWN = 100 layer = MOB_LAYER+1 // Overhead anchored = 1 density = 1 - var/safety_mode = 0 // Temporality stops the machine if it detects a mob - var/grinding = 0 + var/safety_mode = FALSE // Temporarily stops machine if it detects a mob var/icon_name = "grinder-o" var/blood = 0 var/eat_dir = WEST var/amount_produced = 1 var/datum/material_container/materials + var/crush_damage = 1000 + var/eat_victim_items = TRUE + var/item_recycle_sound = 'sound/items/Welder.ogg' /obj/machinery/recycler/New() ..() @@ -72,9 +74,9 @@ var/const/SAFETY_COOLDOWN = 100 /obj/machinery/recycler/emag_act(mob/user) if(!emagged) - emagged = 1 + emagged = TRUE if(safety_mode) - safety_mode = 0 + safety_mode = FALSE update_icon() playsound(src.loc, "sparks", 75, 1, -1) user << "You use the cryptographic sequencer on the [src.name]." @@ -83,7 +85,7 @@ var/const/SAFETY_COOLDOWN = 100 ..() var/is_powered = !(stat & (BROKEN|NOPOWER)) if(safety_mode) - is_powered = 0 + is_powered = FALSE icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end // This is purely for admin possession !FUN!. @@ -104,24 +106,34 @@ var/const/SAFETY_COOLDOWN = 100 var/move_dir = get_dir(loc, AM.loc) if(move_dir == eat_dir) + eat(AM) + +/obj/machinery/recycler/proc/eat(atom/AM0, sound=TRUE) + var/list/to_eat = list(AM0) + if(istype(AM0, /obj/item)) + to_eat += AM0.GetAllContents() + var/items_recycled = 0 + + for(var/i in to_eat) + var/atom/movable/AM = i if(isliving(AM)) if(emagged) - eat(AM) + crush_living(AM) else - stop(AM) + emergency_stop(AM) else if(istype(AM, /obj/item)) - recycle(AM) - else // Can't recycle + recycle_item(AM) + items_recycled++ + else playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) AM.loc = src.loc -/obj/machinery/recycler/proc/recycle(obj/item/I, sound = 1) - I.loc = src.loc - if(!istype(I)) - return + if(items_recycled && sound) + playsound(src.loc, item_recycle_sound, 50, 1) + +/obj/machinery/recycler/proc/recycle_item(obj/item/I) + I.loc = src.loc - if(sound) - playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) var/material_amount = materials.get_item_material_amount(I) if(!material_amount) qdel(I) @@ -131,18 +143,18 @@ var/const/SAFETY_COOLDOWN = 100 materials.retrieve_all() -/obj/machinery/recycler/proc/stop(mob/living/L) +/obj/machinery/recycler/proc/emergency_stop(mob/living/L) playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) - safety_mode = 1 + safety_mode = TRUE update_icon() L.loc = src.loc spawn(SAFETY_COOLDOWN) playsound(src.loc, 'sound/machines/ping.ogg', 50, 0) - safety_mode = 0 + safety_mode = FALSE update_icon() -/obj/machinery/recycler/proc/eat(mob/living/L) +/obj/machinery/recycler/proc/crush_living(mob/living/L) L.loc = src.loc @@ -151,22 +163,23 @@ var/const/SAFETY_COOLDOWN = 100 else playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) - var/gib = 1 + var/gib = TRUE // By default, the emagged recycler will gib all non-carbons. (human simple animal mobs don't count) if(iscarbon(L)) - gib = 0 + gib = FALSE if(L.stat == CONSCIOUS) L.say("ARRRRRRRRRRRGH!!!") add_blood(L) if(!blood && !issilicon(L)) - blood = 1 + blood = TRUE update_icon() - // Remove and recycle the equipped items. - for(var/obj/item/I in L.get_equipped_items()) - if(L.unEquip(I)) - recycle(I, 0) + // Remove and recycle the equipped items + if(eat_victim_items) + for(var/obj/item/I in L.get_equipped_items()) + if(L.unEquip(I)) + eat(I, sound=FALSE) // Instantly lie down, also go unconscious from the pain, before you die. L.Paralyse(5) @@ -175,9 +188,13 @@ var/const/SAFETY_COOLDOWN = 100 if(gib || emagged == 2) L.gib() else if(emagged == 1) - L.adjustBruteLoss(1000) - + L.adjustBruteLoss(crush_damage) +/obj/machinery/recycler/deathtrap + name = "dangerous old crusher" + emagged = TRUE + crush_damage = 120 + flags = NODECONSTRUCT /obj/item/weapon/paper/recycler name = "paper - 'garbage duty instructions'" diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index ed76ccd8768..1ee601cc453 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -224,6 +224,7 @@ if(target == "input") target = input("New target temperature:", name, round(targetTemperature - T0C, 1)) as num|null if(!isnull(target) && !..()) + target += T0C . = TRUE else if(adjust) target = targetTemperature + adjust diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 79bc642c579..a947c472511 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -413,7 +413,8 @@ return ..() -/obj/item/weapon/bombcore/chemical/CheckParts() +/obj/item/weapon/bombcore/chemical/CheckParts(list/parts_list) + ..() // Using different grenade casings, causes the payload to have different properties. var/obj/item/weapon/stock_parts/matter_bin/MB = locate(/obj/item/weapon/stock_parts/matter_bin) in src if(MB) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index d4d6b8ea72b..eb062334719 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -2,306 +2,245 @@ name = "washing machine" desc = "Gets rid of those pesky bloodstains, or your money back!" icon = 'icons/obj/machines/washing_machine.dmi' - icon_state = "wm_10" + icon_state = "wm_1_0" density = 1 anchored = 1 - var/state = 1 - //1 = empty, open door - //2 = empty, closed door - //3 = full, open door - //4 = full, closed door - //5 = running - //6 = blood, open door - //7 = blood, closed door - //8 = blood, running - var/gibs_ready = 0 - var/obj/crayon - var/obj/paper + state_open = 1 + var/busy = 0 + var/bloody_mess = 0 + var/has_corgi = 0 + var/obj/item/color_source + var/max_wash_capacity = 5 + +/obj/machinery/washing_machine/examine(mob/user) + ..() + user << "Alt-click it to start a wash cycle." /obj/machinery/washing_machine/AltClick(mob/user) if(!user.canUseTopic(src)) return - if( state != 4 ) - usr << "The washing machine cannot run in this state." + if(busy) return - if( locate(/mob,contents) ) - state = 8 - else - state = 5 + if(state_open) + user << "Close the door first" + return + + if(bloody_mess) + user << "[src] must be cleaned up first." + return + + if(has_corgi) + bloody_mess = 1 + + busy = 1 update_icon() sleep(200) - for(var/atom/A in contents) - A.clean_blood() + wash_cycle() - //Tanning! - for(var/obj/item/stack/sheet/hairlesshide/HH in contents) - var/obj/item/stack/sheet/wetleather/WL = new(src) - WL.amount = HH.amount - qdel(HH) - - //Corgi costume says goodbye - for(var/obj/item/clothing/suit/hooded/ian_costume/IC in contents) - new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi(src) - qdel(IC) - - for(var/obj/item/weapon/paper/P in contents) - if(crayon) - var/dye_color - if(istype(crayon,/obj/item/toy/crayon)) - var/obj/item/toy/crayon/CR = crayon - dye_color = CR.paint_color - if(dye_color) - P.color = dye_color - qdel(crayon) - crayon = null - - if(crayon) - var/wash_color - if(istype(crayon,/obj/item/toy/crayon)) - var/obj/item/toy/crayon/CR = crayon - wash_color = CR.paint_color - else if(istype(crayon,/obj/item/weapon/stamp)) - var/obj/item/weapon/stamp/ST = crayon - wash_color = ST.item_color - - - if(wash_color) - var/new_jumpsuit_icon_state = "" - var/new_jumpsuit_item_state = "" - var/new_jumpsuit_name = "" - var/new_can_adjust - var/new_glove_icon_state = "" - var/new_glove_item_state = "" - var/new_glove_name = "" - var/new_shoe_icon_state = "" - var/new_shoe_name = "" - var/new_sheet_icon_state = "" - var/new_sheet_name = "" - var/new_softcap_icon_state = "" - var/new_softcap_name = "" - var/new_desc = "The colors are a bit dodgy." - for(var/T in typesof(/obj/item/clothing/under/color)) - var/obj/item/clothing/under/color/J = new T - //world << "DEBUG: [wash_color] == [J.item_color]" - if(wash_color == J.item_color) - new_jumpsuit_icon_state = J.icon_state - new_jumpsuit_item_state = J.item_state - new_jumpsuit_name = J.name - new_can_adjust = J.can_adjust - qdel(J) - break - qdel(J) - for(var/T in typesof(/obj/item/clothing/gloves/color)) - var/obj/item/clothing/gloves/color/G = new T - if(wash_color == G.item_color) - new_glove_icon_state = G.icon_state - new_glove_item_state = G.item_state - new_glove_name = G.name - qdel(G) - break - qdel(G) - for(var/T in typesof(/obj/item/clothing/shoes/sneakers)) - var/obj/item/clothing/shoes/sneakers/S = new T - if(wash_color == S.item_color) - new_shoe_icon_state = S.icon_state - new_shoe_name = S.name - qdel(S) - break - qdel(S) - for(var/T in typesof(/obj/item/weapon/bedsheet)) - var/obj/item/weapon/bedsheet/B = new T - if(wash_color == B.item_color) - new_sheet_icon_state = B.icon_state - new_sheet_name = B.name - qdel(B) - break - qdel(B) - for(var/T in typesof(/obj/item/clothing/head/soft)) - var/obj/item/clothing/head/soft/H = new T - if(wash_color == H.item_color) - new_softcap_icon_state = H.icon_state - new_softcap_name = H.name - qdel(H) - break - qdel(H) - if(new_jumpsuit_icon_state && new_jumpsuit_item_state && new_jumpsuit_name) - for(var/obj/item/clothing/under/color/J in contents) - J.item_state = new_jumpsuit_item_state - J.icon_state = new_jumpsuit_icon_state - J.item_color = wash_color - J.name = new_jumpsuit_name - J.desc = new_desc - J.suit_color = wash_color - J.can_adjust = new_can_adjust - if(new_glove_icon_state && new_glove_item_state && new_glove_name) - for(var/obj/item/clothing/gloves/color/G in contents) - G.item_state = new_glove_item_state - G.icon_state = new_glove_icon_state - G.item_color = wash_color - G.name = new_glove_name - G.desc = new_desc - if(new_shoe_icon_state && new_shoe_name) - for(var/obj/item/clothing/shoes/sneakers/S in contents) - if (S.chained == 1) - S.chained = 0 - S.slowdown = SHOES_SLOWDOWN - new /obj/item/weapon/restraints/handcuffs( src ) - S.icon_state = new_shoe_icon_state - S.item_color = wash_color - S.name = new_shoe_name - S.desc = new_desc - if(new_sheet_icon_state && new_sheet_name) - for(var/obj/item/weapon/bedsheet/B in contents) - B.icon_state = new_sheet_icon_state - B.item_color = wash_color - B.name = new_sheet_name - B.desc = new_desc - if(new_softcap_icon_state && new_softcap_name) - for(var/obj/item/clothing/head/soft/H in contents) - H.icon_state = new_softcap_icon_state - H.item_color = wash_color - H.name = new_softcap_name - H.desc = new_desc - qdel(crayon) - crayon = null +/obj/machinery/washing_machine/clean_blood() + ..() + if(!busy) + bloody_mess = 0 + update_icon() - if( locate(/mob,contents) ) - state = 7 - gibs_ready = 1 - else - state = 4 +/obj/machinery/washing_machine/proc/wash_cycle() + for(var/X in contents) + var/atom/movable/AM = X + AM.clean_blood() + AM.machine_wash(src) + + busy = 0 + if(color_source) + qdel(color_source) + color_source = null update_icon() -/obj/machinery/washing_machine/verb/climb_out() - set name = "Climb out" - set category = "Object" - set src in usr.loc - sleep(20) - if(state in list(1,3,6) ) - usr.loc = src.loc +//what happens to this object when washed inside a washing machine +/atom/movable/proc/machine_wash(obj/machinery/washing_machine/WM) + return + +/obj/item/stack/sheet/hairlesshide/machine_wash(obj/machinery/washing_machine/WM) + var/obj/item/stack/sheet/wetleather/WL = new(loc) + WL.amount = amount + qdel(src) + +/obj/item/clothing/suit/hooded/ian_costume/machine_wash(obj/machinery/washing_machine/WM) + new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi(loc) + qdel(src) + +/obj/item/weapon/paper/machine_wash(obj/machinery/washing_machine/WM) + if(WM.color_source) + if(istype(WM.color_source,/obj/item/toy/crayon)) + var/obj/item/toy/crayon/CR = WM.color_source + color = CR.paint_color + +/mob/living/simple_animal/pet/dog/corgi/machine_wash(obj/machinery/washing_machine/WM) + gib() + +/obj/item/clothing/under/color/machine_wash(obj/machinery/washing_machine/WM) + jumpsuit_wash(WM) + +/obj/item/clothing/under/rank/machine_wash(obj/machinery/washing_machine/WM) + jumpsuit_wash(WM) + +/obj/item/clothing/under/proc/jumpsuit_wash(obj/machinery/washing_machine/WM) + if(WM.color_source) + var/wash_color = WM.color_source.item_color + var/obj/item/clothing/under/U + for(var/T in typesof(/obj/item/clothing/under/color)) + var/obj/item/clothing/under/color/J = T + if(wash_color == initial(J.item_color)) + U = J + break + if(!U) + for(var/T in typesof(/obj/item/clothing/under/rank)) + var/obj/item/clothing/under/rank/R = T + if(wash_color == initial(R.item_color)) + U = R + break + if(U) + item_state = initial(U.item_state) + icon_state = initial(U.icon_state) + item_color = wash_color + name = initial(U.name) + desc = "The colors are a bit dodgy." + can_adjust = initial(U.can_adjust) + if(!can_adjust && adjusted) //we deadjust the uniform if it's now unadjustable + toggle_jumpsuit_adjust() + +/obj/item/clothing/gloves/color/machine_wash(obj/machinery/washing_machine/WM) + if(WM.color_source) + var/wash_color = WM.color_source.item_color + for(var/T in typesof(/obj/item/clothing/gloves/color)) + var/obj/item/clothing/gloves/color/G = T + if(wash_color == initial(G.item_color)) + item_state = initial(G.item_state) + icon_state = initial(G.icon_state) + item_color = wash_color + name = initial(G.name) + desc = "The colors are a bit dodgy." + break + +/obj/item/clothing/shoes/sneakers/machine_wash(obj/machinery/washing_machine/WM) + if(chained) + chained = 0 + slowdown = SHOES_SLOWDOWN + new /obj/item/weapon/restraints/handcuffs(loc) + if(WM.color_source) + var/wash_color = WM.color_source.item_color + for(var/T in typesof(/obj/item/clothing/shoes/sneakers)) + var/obj/item/clothing/shoes/sneakers/S = T + if(wash_color == initial(S.item_color)) + icon_state = initial(S.icon_state) + item_color = wash_color + name = initial(S.name) + desc = "The colors are a bit dodgy." + break + +/obj/item/weapon/bedsheet/machine_wash(obj/machinery/washing_machine/WM) + if(WM.color_source) + var/wash_color = WM.color_source.item_color + for(var/T in typesof(/obj/item/weapon/bedsheet)) + var/obj/item/weapon/bedsheet/B = T + if(wash_color == initial(B.item_color)) + icon_state = initial(B.icon_state) + item_color = wash_color + name = initial(B.name) + desc = "The colors are a bit dodgy." + break + +/obj/item/clothing/head/soft/machine_wash(obj/machinery/washing_machine/WM) + if(WM.color_source) + var/wash_color = WM.color_source.item_color + for(var/T in typesof(/obj/item/clothing/head/soft)) + var/obj/item/clothing/head/soft/H = T + if(wash_color == initial(H.item_color)) + icon_state = initial(H.icon_state) + item_color = wash_color + name = initial(H.name) + desc = "The colors are a bit dodgy." + break + + +/obj/machinery/washing_machine/relaymove(mob/user) + container_resist(user) + +/obj/machinery/washing_machine/container_resist(mob/user) + if(!busy) + add_fingerprint(user) + open_machine() + /obj/machinery/washing_machine/update_icon() - icon_state = "wm_[state]0" + overlays.Cut() + if(busy) + icon_state = "wm_running_[bloody_mess]" + else if(bloody_mess) + icon_state = "wm_[state_open]_blood" + else + var/full = contents.len ? 1 : 0 + icon_state = "wm_[state_open]_[full]" + if(panel_open) + overlays += image(icon, icon_state = "wm_panel") /obj/machinery/washing_machine/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W,/obj/item/toy/crayon) ||istype(W,/obj/item/weapon/stamp)) - if( state in list( 1, 3, 6 ) ) - if(!crayon) - if(!user.drop_item()) - return - crayon = W - crayon.loc = src - else - ..() - else - ..() + if(default_deconstruction_screwdriver(user, null, null, W)) + update_icon() + return else if(istype(W,/obj/item/weapon/grab)) - if(state == 1) + if(state_open) var/obj/item/weapon/grab/G = W if(iscorgi(G.affecting)) + has_corgi = 1 G.affecting.loc = src qdel(G) - state = 3 - else - ..() + update_icon() - else if(istype(W,/obj/item/stack/sheet/hairlesshide) || \ - istype(W,/obj/item/clothing/under) || \ - istype(W,/obj/item/clothing/mask) || \ - istype(W,/obj/item/clothing/head) || \ - istype(W,/obj/item/clothing/gloves) || \ - istype(W,/obj/item/clothing/shoes) || \ - istype(W,/obj/item/clothing/suit) || \ - istype(W,/obj/item/weapon/bedsheet) || \ - istype(W,/obj/item/weapon/paper)) + else if(user.a_intent != "harm") - //YES, it's hardcoded... saves a var/can_be_washed for every single clothing item. - if ( istype(W,/obj/item/clothing/suit/space ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/suit/syndicatefake ) ) - user << "This item does not fit." - return -// if ( istype(W,/obj/item/clothing/suit/powered ) ) -// user << "This item does not fit." -// return - if ( istype(W,/obj/item/clothing/suit/cyborg_suit ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/suit/bomb_suit ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/suit/armor ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/suit/armor ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/mask/gas ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/mask/cigarette ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/head/syndicatefake ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/head/helmet ) ) - user << "This item does not fit." - return - if(W.flags & NODROP) //if "can't drop" item - user << "\The [W] is stuck to your hand, you cannot put it in the washing machine!" - return + if (!state_open) + user << "Open the door first!" + return 1 - if(contents.len < 5) - if ( state in list(1, 3) ) - if(!user.drop_item()) - return - W.loc = src - state = 3 - else - user << "You can't put the item in right now!" - else + if(bloody_mess) + user << "[src] must be cleaned up first." + return 1 + + if(contents.len >= max_wash_capacity) user << "The washing machine is full!" + return 1 + + if(!user.unEquip(W)) + user << "\The [W] is stuck to your hand, you cannot put it in the washing machine!" + return 1 + + if(istype(W,/obj/item/toy/crayon) || istype(W,/obj/item/weapon/stamp)) + color_source = W + W.loc = src + update_icon() + else - ..() - update_icon() + return ..() /obj/machinery/washing_machine/attack_hand(mob/user) - switch(state) - if(1) - state = 2 - if(2) - state = 1 - for(var/atom/movable/O in contents) - O.loc = src.loc - if(3) - state = 4 - if(4) - state = 3 - for(var/atom/movable/O in contents) - O.loc = src.loc - crayon = null - state = 1 - if(5) - user << "The [src] is busy." - if(6) - state = 7 - if(7) - if(gibs_ready) - gibs_ready = 0 - if(locate(/mob,contents)) - var/mob/M = locate(/mob,contents) - M.gib() - for(var/atom/movable/O in contents) - O.loc = src.loc - crayon = null - state = 1 + if(busy) + user << "[src] is busy." + return + + if(!state_open) + open_machine() + else + state_open = 0 //close the door + update_icon() - update_icon() +/obj/machinery/washing_machine/open_machine(drop = 1) + ..() + density = 1 //because machinery/open_machine() sets it to 0 + color_source = null + has_corgi = 0 diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 17aa0d4288b..7bb81bc54e0 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -4,6 +4,7 @@ damage_absorption = list("brute"=0.7,"fire"=1,"bullet"=0.7,"laser"=0.85,"energy"=1,"bomb"=0.8) /obj/mecha/combat/CheckParts(atom/holder) + ..() var/obj/item/weapon/stock_parts/capacitor/C = locate() in holder var/obj/item/weapon/stock_parts/scanning_module/SM = locate() in holder step_energy_drain = 20 - (5 * SM.rating) //10 is normal, so on lowest part its worse, on second its ok and on higher its real good up to 0 on best diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm index a43d273ac65..a5363b7795a 100644 --- a/code/game/mecha/equipment/tools/mining_tools.dm +++ b/code/game/mecha/equipment/tools/mining_tools.dm @@ -113,6 +113,7 @@ icon_state = "mecha_analyzer" origin_tech = "materials=3;engineering=2" selectable = 0 + equip_cooldown = 30 var/scanning = 0 /obj/item/mecha_parts/mecha_equipment/mining_scanner/New() diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index c3847474e60..9ab089a34ff 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -94,36 +94,35 @@ return interact(user) -/obj/machinery/computer/mech_bay_power_console/interact(mob/user) - var/data - if(!recharge_port) - data += "
No recharging port detected.
" - data += "Reconnect" - else - data += "
Mech status
" - if(!recharge_port.recharging_mech) - data += "No mech detected.
"
- else
- data += "Integrity: [recharge_port.recharging_mech.health]
" +/obj/machinery/computer/mech_bay_power_console/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "mech_bay_power_console", "Mech Bay Power Control Console", 400, 170, master_ui, state) + ui.open() - if(!recharge_port.recharging_mech.cell) - data += "WARNING : the mech cell is missing!
"
- else if(recharge_port.recharging_mech.cell.crit_fail)
- data += "WARNING : the mech cell seems faulty!"
- else
- data += "Power: [recharge_port.recharging_mech.cell.charge]/[recharge_port.recharging_mech.cell.maxcharge]"
-
- var/datum/browser/popup = new(user, "mech recharger", name, 300, 300)
- popup.set_content(data)
- popup.open()
- return
-
-/obj/machinery/computer/mech_bay_power_console/Topic(href, href_list)
+/obj/machinery/computer/mech_bay_power_console/ui_act(action, params)
if(..())
return
- if(href_list["reconnect"])
- reconnect()
- updateUsrDialog()
+ switch(action)
+ if("reconnect")
+ reconnect()
+ . = TRUE
+ update_icon()
+
+/obj/machinery/computer/mech_bay_power_console/ui_data(mob/user)
+ var/list/data = list()
+ if(recharge_port && !qdeleted(recharge_port))
+ data["recharge_port"] = list("mech" = null)
+ if(recharge_port.recharging_mech && !qdeleted(recharge_port.recharging_mech))
+ data["recharge_port"]["mech"] = list("health" = recharge_port.recharging_mech.health, "maxhealth" = initial(recharge_port.recharging_mech.health), "cell" = null)
+ if(recharge_port.recharging_mech.cell && !qdeleted(recharge_port.recharging_mech.cell))
+ data["recharge_port"]["mech"]["cell"] = list(
+ "critfail" = recharge_port.recharging_mech.cell.crit_fail,
+ "charge" = recharge_port.recharging_mech.cell.charge,
+ "maxcharge" = recharge_port.recharging_mech.cell.maxcharge
+ )
+ return data
+
/obj/machinery/computer/mech_bay_power_console/proc/reconnect()
if(recharge_port)
@@ -142,11 +141,6 @@
else
recharge_port = null
-/obj/machinery/computer/mech_bay_power_console/process()
- if(recharge_port && recharge_port.recharging_mech && recharge_port.recharging_mech.cell)
- updateDialog()
-
-
/obj/machinery/computer/mech_bay_power_console/update_icon()
..()
if(!recharge_port || !recharge_port.recharging_mech || !recharge_port.recharging_mech.cell || !(recharge_port.recharging_mech.cell.charge < recharge_port.recharging_mech.cell.maxcharge) || stat & (NOPOWER|BROKEN))
diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm
index 99f894aa392..8daf88c6c42 100644
--- a/code/game/objects/effects/decals/misc.dm
+++ b/code/game/objects/effects/decals/misc.dm
@@ -22,4 +22,17 @@
name = "chemicals"
icon = 'icons/obj/chempuff.dmi'
pass_flags = PASSTABLE | PASSGRILLE
- layer = 5
\ No newline at end of file
+ layer = 5
+
+/obj/effect/decal/sandeffect
+ name = "sandy tile"
+ icon = 'icons/turf/floors.dmi'
+ icon_state = "sandeffect"
+ layer = 2
+
+/obj/effect/decal/fakelattice
+ name = "lattice"
+ desc = "A lightweight support lattice."
+ icon = 'icons/obj/smooth_structures/lattice.dmi'
+ icon_state = "lattice"
+ density = 1
\ No newline at end of file
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index 0c0b566390a..c929d74e5ca 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -43,10 +43,12 @@
icon_state = "heal"
duration = 15
-/obj/effect/overlay/temp/heal/New()
+/obj/effect/overlay/temp/heal/New(loc, colour)
..()
pixel_x = rand(-12, 12)
pixel_y = rand(-9, 0)
+ if(colour)
+ color = colour
/obj/effect/overlay/temp/explosion
name = "explosion"
@@ -90,6 +92,24 @@
randomdir = 0
duration = 10
+/obj/effect/overlay/temp/cult/sparks
+ randomdir = 1
+ name = "blood sparks"
+ icon_state = "bloodsparkles"
+
+/obj/effect/overlay/temp/cult/phase
+ name = "phase glow"
+ duration = 7
+ icon_state = "cultin"
+
+/obj/effect/overlay/temp/cult/phase/New(loc, set_dir)
+ ..()
+ if(set_dir)
+ dir = set_dir
+
+/obj/effect/overlay/temp/cult/phase/out
+ icon_state = "cultout"
+
/obj/effect/overlay/temp/cult/sac
name = "maw of Nar-Sie"
icon_state = "sacconsume"
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 1536d5f1f85..7c61b5d152f 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -575,7 +575,22 @@ obj/item/proc/item_action_slot_check(slot, mob/user)
/obj/item/proc/is_sharp()
return sharpness
-/obj/item/proc/can_dismember()
- if((sharpness || damtype == BURN) && w_class >= 3)
- return 1
- return 0
\ No newline at end of file
+/obj/item/proc/get_dismemberment_chance(obj/item/bodypart/affecting)
+ if(affecting.can_dismember(src))
+ if((sharpness || damtype == BURN) && w_class >= 3)
+ . = force*(w_class-1)
+
+/obj/item/proc/get_dismember_sound()
+ if(damtype == BURN)
+ . = 'sound/weapons/sear.ogg'
+ else
+ . = pick('sound/misc/desceration-01.ogg', 'sound/misc/desceration-02.ogg', 'sound/misc/desceration-03.ogg')
+
+/obj/item/proc/open_flame()
+ var/turf/location = loc
+ if(ismob(location))
+ var/mob/M = location
+ if(M.l_hand == src || M.r_hand == src)
+ location = get_turf(M)
+ if(isturf(location))
+ location.hotspot_expose(700, 5)
diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm
index 9a20f3b8e37..eced5d1af07 100644
--- a/code/game/objects/items/candle.dm
+++ b/code/game/objects/items/candle.dm
@@ -1,22 +1,23 @@
#define CANDLE_LUMINOSITY 2
/obj/item/candle
name = "red candle"
- desc = "a candle"
+ desc = "In Greek myth, Prometheus stole fire from the Gods and gave it to \
+ humankind. The jewelry he kept for himself."
icon = 'icons/obj/candle.dmi'
icon_state = "candle1"
item_state = "candle1"
w_class = 1
var/wax = 200
- var/lit = 0
- var/infinite = 0
- var/start_lit = 0
+ var/lit = FALSE
+ var/infinite = FALSE
+ var/start_lit = FALSE
heat = 1000
/obj/item/candle/New()
..()
if(start_lit)
// No visible message
- light(null)
+ light(show_message = FALSE)
/obj/item/candle/update_icon()
var/i
@@ -56,12 +57,13 @@
light() //honk
return
-/obj/item/candle/proc/light(flavor_text = "[usr] lights the [name].")
+/obj/item/candle/proc/light(show_message)
if(!src.lit)
- src.lit = 1
+ src.lit = TRUE
//src.damtype = "fire"
- if(flavor_text)
- usr.visible_message(flavor_text)
+ if(show_message)
+ usr.visible_message(
+ "[usr] lights the [name].")
SetLuminosity(CANDLE_LUMINOSITY)
SSobj.processing |= src
update_icon()
@@ -79,14 +81,13 @@
M.unEquip(src, 1) //src is being deleted anyway
qdel(src)
update_icon()
- if(istype(loc, /turf)) //start a fire if possible
- var/turf/T = loc
- T.hotspot_expose(700, 5)
-
+ open_flame()
/obj/item/candle/attack_self(mob/user)
if(lit)
- lit = 0
+ user.visible_message(
+ "[user] snuffs [src].")
+ lit = FALSE
update_icon()
SetLuminosity(0)
user.AddLuminosity(-CANDLE_LUMINOSITY)
@@ -110,7 +111,7 @@
/obj/item/candle/infinite
- infinite = 1
- start_lit = 1
+ infinite = TRUE
+ start_lit = TRUE
#undef CANDLE_LUMINOSITY
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index c101d2fbb61..79848f024f5 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -1,43 +1,263 @@
+
+/*
+ * Crayons
+ */
+
+/obj/item/toy/crayon
+ name = "crayon"
+ desc = "A colourful crayon. Looks tasty. Mmmm..."
+ icon = 'icons/obj/crayons.dmi'
+ icon_state = "crayonred"
+ item_color = "red"
+ w_class = 1
+ attack_verb = list("attacked", "coloured")
+ var/paint_color = "#FF0000" //RGB
+ var/drawtype = "rune"
+ var/text_buffer = ""
+ var/list/graffiti = list("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","body","cyka","arrow","star","poseur tag")
+ var/list/letters = list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z")
+ var/list/numerals = list("0","1","2","3","4","5","6","7","8","9")
+ var/list/oriented = list("arrow","body") // These turn to face the same way as the drawer
+ var/uses = 30 //-1 or less for unlimited uses
+ var/instant = 0
+ var/dat
+ var/list/validSurfaces = list(/turf/open/floor)
+ var/gang = 0 //For marking territory
+ var/edible = 1
+
+/obj/item/toy/crayon/suicide_act(mob/user)
+ user.visible_message("[user] is jamming the [src.name] up \his nose and into \his brain. It looks like \he's trying to commit suicide.")
+ return (BRUTELOSS|OXYLOSS)
+
+/obj/item/toy/crayon/New()
+ ..()
+ name = "[item_color] crayon" //Makes crayons identifiable in things like grinders
+ drawtype = pick(pick(graffiti), pick(letters), "rune[rand(1,6)]")
+ if(config)
+ if(config.mutant_races == 1)
+ graffiti |= "antilizard"
+ graffiti |= "prolizard"
+
+/obj/item/toy/crayon/initialize()
+ if(config.mutant_races == 1)
+ graffiti |= "antilizard"
+ graffiti |= "prolizard"
+
+/obj/item/toy/crayon/attack_self(mob/living/user)
+ update_window(user)
+
+/obj/item/toy/crayon/proc/update_window(mob/living/user)
+ dat += "" +/obj/machinery/computer/mech_bay_power_console/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "mech_bay_power_console", "Mech Bay Power Control Console", 400, 170, master_ui, state) + ui.open() - if(!recharge_port.recharging_mech.cell) - data += "WARNING : the mech cell is missing!
Currently selected: [drawtype]
" + dat += "Random letterPick letter/number" + dat += "Write" + dat += "
" + dat += "
Runes:
" + dat += "Random rune" + for(var/i = 1; i <= 6; i++) + dat += "Rune[i]" + if(!((i + 1) % 3)) //3 buttons in a row + dat += "
" + dat += "
" + graffiti.Find() + dat += "
Graffiti:
" + dat += "Random graffiti" + var/c = 1 + for(var/T in graffiti) + dat += "[T]" + if(!((c + 1) % 3)) //3 buttons in a row + dat += "
" + c++ + dat += "
" + var/datum/browser/popup = new(user, "crayon", name, 300, 500) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + dat = "" + +/obj/item/toy/crayon/proc/crayon_text_strip(text) + var/list/base = char_split(lowertext(text)) + var/list/out = list() + for(var/a in base) + if(a in (letters|numerals)) + out += a + return jointext(out,"") + +/obj/item/toy/crayon/Topic(href, href_list, hsrc) + var/temp = "a" + if(href_list["buffer"]) + text_buffer = crayon_text_strip(stripped_input(usr,"Choose what to write.", "Scribbles",default = text_buffer)) + if(href_list["type"]) + switch(href_list["type"]) + if("random_letter") + temp = pick(letters) + if("letter") + temp = input("Choose what to write.", "Scribbles") in (letters|numerals) + if("random_rune") + temp = "rune[rand(1,6)]" + if("random_graffiti") + temp = pick(graffiti) + else + temp = href_list["type"] + if ((usr.restrained() || usr.stat || usr.get_active_hand() != src)) + return + drawtype = temp + update_window(usr) + +/obj/item/toy/crayon/afterattack(atom/target, mob/user, proximity) + if(!proximity || !check_allowed_items(target)) return + if(!uses) + user << "There is no more of [src.name] left!" + if(!instant) + qdel(src) + return + if(istype(target, /obj/effect/decal/cleanable)) + target = target.loc + if(is_type_in_list(target,validSurfaces)) + + var/temp = "rune" + if(letters.Find(drawtype)) + temp = "letter" + else if(graffiti.Find(drawtype)) + temp = "graffiti" + else if(numerals.Find(drawtype)) + temp = "number" + + ////////////////////////// GANG FUNCTIONS + var/area/territory + var/gangID + if(gang) + //Determine gang affiliation + gangID = user.mind.gang_datum + + //Check area validity. Reject space, player-created areas, and non-station z-levels. + if(gangID) + territory = get_area(target) + if(territory && (territory.z == ZLEVEL_STATION) && territory.valid_territory) + //Check if this area is already tagged by a gang + if(!(locate(/obj/effect/decal/cleanable/crayon/gang) in target)) //Ignore the check if the tile being sprayed has a gang tag + if(territory_claimed(territory, user)) + return + if(locate(/obj/machinery/power/apc) in (user.loc.contents | target.contents)) + user << "You cannot tag here." + return + else + user << "[territory] is unsuitable for tagging." + return + ///////////////////////////////////////// + + var/graf_rot + if(oriented.Find(drawtype)) + switch(user.dir) + if(EAST) + graf_rot = 90 + if(SOUTH) + graf_rot = 180 + if(WEST) + graf_rot = 270 + else + graf_rot = 0 + + user << "You start [instant ? "spraying" : "drawing"] a [temp] on the [target.name]..." + if(instant) + playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) + if((instant>0) || do_after(user, 50, target = target)) + + if(length(text_buffer)) + drawtype = copytext(text_buffer,1,2) + text_buffer = copytext(text_buffer,2) + + //Gang functions + if(gangID) + //Delete any old markings on this tile, including other gang tags + if(!(locate(/obj/effect/decal/cleanable/crayon/gang) in target)) //Ignore the check if the tile being sprayed has a gang tag + if(territory_claimed(territory, user)) + return + for(var/obj/effect/decal/cleanable/crayon/old_marking in target) + qdel(old_marking) + new /obj/effect/decal/cleanable/crayon/gang(target,gangID,"graffiti",graf_rot) + user << "You tagged [territory] for your gang!" + + else + new /obj/effect/decal/cleanable/crayon(target,paint_color,drawtype,temp,graf_rot) + + user << "You finish [instant ? "spraying" : "drawing"] \the [temp]." + if(instant<0) + playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) + if(uses < 0) + return + uses = max(0,uses-1) + if(!uses) + user << "There is no more of [src.name] left!" + if(!instant) + qdel(src) + return + +/obj/item/toy/crayon/attack(mob/M, mob/user) + if(edible && (M == user)) + user << "You take a bite of the [src.name]. Delicious!" + user.nutrition += 5 + if(uses < 0) + return + uses = max(0,uses-5) + if(!uses) + user << "There is no more of [src.name] left!" + qdel(src) + else + ..() + +/obj/item/toy/crayon/proc/territory_claimed(area/territory,mob/user) + var/occupying_gang + for(var/datum/gang/G in ticker.mode.gangs) + if(territory.type in (G.territory|G.territory_new)) + occupying_gang = G.name + break + if(occupying_gang) + user << "[territory] has already been tagged by the [occupying_gang] gang! You must get rid of or spray over the old tag first!" + return 1 + return 0 + + + /obj/item/toy/crayon/red icon_state = "crayonred" paint_color = "#DA0000" - colourName = "red" + item_color = "red" /obj/item/toy/crayon/orange icon_state = "crayonorange" paint_color = "#FF9300" - colourName = "orange" + item_color = "orange" /obj/item/toy/crayon/yellow icon_state = "crayonyellow" paint_color = "#FFF200" - colourName = "yellow" + item_color = "yellow" /obj/item/toy/crayon/green icon_state = "crayongreen" paint_color = "#A8E61D" - colourName = "green" + item_color = "green" /obj/item/toy/crayon/blue icon_state = "crayonblue" paint_color = "#00B7EF" - colourName = "blue" + item_color = "blue" /obj/item/toy/crayon/purple icon_state = "crayonpurple" paint_color = "#DA00FF" - colourName = "purple" + item_color = "purple" /obj/item/toy/crayon/white icon_state = "crayonwhite" paint_color = "#FFFFFF" - colourName = "white" + item_color = "white" /obj/item/toy/crayon/mime icon_state = "crayonmime" desc = "A very sad-looking crayon." paint_color = "#FFFFFF" - colourName = "mime" + item_color = "mime" uses = -1 /obj/item/toy/crayon/mime/attack_self(mob/living/user) @@ -62,7 +282,7 @@ /obj/item/toy/crayon/rainbow icon_state = "crayonrainbow" paint_color = "#FFF000" - colourName = "rainbow" + item_color = "rainbow" uses = -1 /obj/item/toy/crayon/rainbow/attack_self(mob/living/user) @@ -110,12 +330,12 @@ /obj/item/weapon/storage/crayons/update_icon() overlays.Cut() for(var/obj/item/toy/crayon/crayon in contents) - overlays += image('icons/obj/crayons.dmi',crayon.colourName) + overlays += image('icons/obj/crayons.dmi',crayon.item_color) /obj/item/weapon/storage/crayons/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/toy/crayon)) var/obj/item/toy/crayon/C = W - switch(C.colourName) + switch(C.item_color) if("mime") usr << "This crayon is too sad to be contained in this box." return diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index ba14a0d3540..dec0a8d6acc 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -254,7 +254,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if (3) dat += "
Atmospheric Readings
"
- var/turf/T = get_turf(user.loc)
+ var/turf/T = user.loc
if (isnull(T))
dat += "Unable to obtain a reading." else @@ -269,7 +269,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if (total_moles) for(var/id in env_gases) var/gas_level = env_gases[id][MOLES]/total_moles - if(id in hardcoded_gases || gas_level > 0.001) + if(gas_level > 0) dat += "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_level*100, 0.01)]%
" dat += "Temperature: [round(environment.temperature-T0C)]°C
" diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm index 3ee33acd12f..b3c9fa46254 100644 --- a/code/game/objects/items/devices/PDA/PDA_types.dm +++ b/code/game/objects/items/devices/PDA/PDA_types.dm @@ -9,7 +9,7 @@ /obj/item/device/pda/clown/Crossed(AM as mob|obj) if (istype(AM, /mob/living/carbon)) var/mob/living/carbon/M = AM - if(M.slip(8, 5, src, NO_SLIP_WHEN_WALKING)) + if(M.slip(0, 6, src, NO_SLIP_WHEN_WALKING)) if (ishuman(M) && (M.real_name != src.owner)) if (istype(src.cartridge, /obj/item/weapon/cartridge/clown)) var/obj/item/weapon/cartridge/clown/cart = src.cartridge @@ -197,4 +197,4 @@ /obj/item/device/pda/geneticist name = "geneticist PDA" default_cartridge = /obj/item/weapon/cartridge/medical - icon_state = "pda-genetics" \ No newline at end of file + icon_state = "pda-genetics" diff --git a/code/game/objects/items/devices/modificationkit.dm b/code/game/objects/items/devices/modificationkit.dm new file mode 100644 index 00000000000..f4de7b7491c --- /dev/null +++ b/code/game/objects/items/devices/modificationkit.dm @@ -0,0 +1,29 @@ +/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 ..() + 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/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 798a8ce3614..6102f97caee 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -300,6 +300,7 @@ MASS SPECTROMETER else user << "Plasma: [round(plasma_concentration*100, 0.01)] %" + for(var/id in env_gases) if(id in hardcoded_gases) continue diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index b722c70fb6d..688a5ebc37a 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -72,7 +72,7 @@ effective or pretty fucking useless. name = "health analyzer" icon_state = "health" item_state = "analyzer" - desc = "A hand-held body scanner able to distinguish vital signs of the subject. A strange microlaser is hooked on to the scanning end." + desc = "A hand-held body scanner able to distinguish vital signs of the subject." flags = CONDUCT slot_flags = SLOT_BELT throwforce = 3 diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm index b3335fd4898..043fcd80cb0 100644 --- a/code/game/objects/items/documents.dm +++ b/code/game/objects/items/documents.dm @@ -50,8 +50,8 @@ user << "You have already forged a seal on [src]!" else var/obj/item/toy/crayon/C = O - name = "[C.colourName] secret documents" - icon_state = "docs_[C.colourName]" - forgedseal = C.colourName - user << "You forge the official seal with a [C.colourName] crayon. No one will notice... right?" + name = "[C.item_color] secret documents" + icon_state = "docs_[C.item_color]" + forgedseal = C.item_color + user << "You forge the official seal with a [C.item_color] crayon. No one will notice... right?" update_icon() \ No newline at end of file diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index ce91a198c11..0b5fa01aff8 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -63,6 +63,7 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \ icon_state = "sandbags" singular_name = "sandbag" force = 5 + layer = 2.95 throwforce = 5 w_class = 3 throw_speed = 1 diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 6ff3d3ff714..24f20ce70c5 100755 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -323,223 +323,6 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced") hitsound = 'sound/weapons/bladeslice.ogg' -/* - * Crayons - */ - -/obj/item/toy/crayon - name = "crayon" - desc = "A colourful crayon. Looks tasty. Mmmm..." - icon = 'icons/obj/crayons.dmi' - icon_state = "crayonred" - w_class = 1 - attack_verb = list("attacked", "coloured") - var/paint_color = "#FF0000" //RGB - var/drawtype = "rune" - var/text_buffer = "" - var/list/graffiti = list("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","body","cyka","arrow","star","poseur tag") - var/list/letters = list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z") - var/list/numerals = list("0","1","2","3","4","5","6","7","8","9") - var/list/oriented = list("arrow","body") // These turn to face the same way as the drawer - var/uses = 30 //-1 or less for unlimited uses - var/instant = 0 - var/colourName = "red" //for updateIcon purposes - var/dat - var/list/validSurfaces = list(/turf/open/floor) - var/gang = 0 //For marking territory - var/edible = 1 - -/obj/item/toy/crayon/suicide_act(mob/user) - user.visible_message("[user] is jamming the [src.name] up \his nose and into \his brain. It looks like \he's trying to commit suicide.") - return (BRUTELOSS|OXYLOSS) - -/obj/item/toy/crayon/New() - ..() - name = "[colourName] crayon" //Makes crayons identifiable in things like grinders - drawtype = pick(pick(graffiti), pick(letters), "rune[rand(1,6)]") - if(config) - if(config.mutant_races == 1) - graffiti |= "antilizard" - graffiti |= "prolizard" - -/obj/item/toy/crayon/initialize() - if(config.mutant_races == 1) - graffiti |= "antilizard" - graffiti |= "prolizard" - -/obj/item/toy/crayon/attack_self(mob/living/user) - update_window(user) - -/obj/item/toy/crayon/proc/update_window(mob/living/user) - dat += "
Currently selected: [drawtype]
" - dat += "Random letterPick letter/number" - dat += "Write" - dat += "
" - dat += "
Runes:
" - dat += "Random rune" - for(var/i = 1; i <= 6; i++) - dat += "Rune[i]" - if(!((i + 1) % 3)) //3 buttons in a row - dat += "
" - dat += "
" - graffiti.Find() - dat += "
Graffiti:
" - dat += "Random graffiti" - var/c = 1 - for(var/T in graffiti) - dat += "[T]" - if(!((c + 1) % 3)) //3 buttons in a row - dat += "
" - c++ - dat += "
" - var/datum/browser/popup = new(user, "crayon", name, 300, 500) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - dat = "" - -/obj/item/toy/crayon/proc/crayon_text_strip(text) - var/list/base = char_split(lowertext(text)) - var/list/out = list() - for(var/a in base) - if(a in (letters|numerals)) - out += a - return jointext(out,"") - -/obj/item/toy/crayon/Topic(href, href_list, hsrc) - var/temp = "a" - if(href_list["buffer"]) - text_buffer = crayon_text_strip(stripped_input(usr,"Choose what to write.", "Scribbles",default = text_buffer)) - if(href_list["type"]) - switch(href_list["type"]) - if("random_letter") - temp = pick(letters) - if("letter") - temp = input("Choose what to write.", "Scribbles") in (letters|numerals) - if("random_rune") - temp = "rune[rand(1,6)]" - if("random_graffiti") - temp = pick(graffiti) - else - temp = href_list["type"] - if ((usr.restrained() || usr.stat || usr.get_active_hand() != src)) - return - drawtype = temp - update_window(usr) - -/obj/item/toy/crayon/afterattack(atom/target, mob/user, proximity) - if(!proximity || !check_allowed_items(target)) return - if(!uses) - user << "There is no more of [src.name] left!" - if(!instant) - qdel(src) - return - if(istype(target, /obj/effect/decal/cleanable)) - target = target.loc - if(is_type_in_list(target,validSurfaces)) - - var/temp = "rune" - if(letters.Find(drawtype)) - temp = "letter" - else if(graffiti.Find(drawtype)) - temp = "graffiti" - else if(numerals.Find(drawtype)) - temp = "number" - - ////////////////////////// GANG FUNCTIONS - var/area/territory - var/gangID - if(gang) - //Determine gang affiliation - gangID = user.mind.gang_datum - - //Check area validity. Reject space, player-created areas, and non-station z-levels. - if(gangID) - territory = get_area(target) - if(territory && (territory.z == ZLEVEL_STATION) && territory.valid_territory) - //Check if this area is already tagged by a gang - if(!(locate(/obj/effect/decal/cleanable/crayon/gang) in target)) //Ignore the check if the tile being sprayed has a gang tag - if(territory_claimed(territory, user)) - return - if(locate(/obj/machinery/power/apc) in (user.loc.contents | target.contents)) - user << "You cannot tag here." - return - else - user << "[territory] is unsuitable for tagging." - return - ///////////////////////////////////////// - - var/graf_rot - if(oriented.Find(drawtype)) - switch(user.dir) - if(EAST) - graf_rot = 90 - if(SOUTH) - graf_rot = 180 - if(WEST) - graf_rot = 270 - else - graf_rot = 0 - - user << "You start [instant ? "spraying" : "drawing"] a [temp] on the [target.name]..." - if(instant) - playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) - if((instant>0) || do_after(user, 50, target = target)) - - if(length(text_buffer)) - drawtype = copytext(text_buffer,1,2) - text_buffer = copytext(text_buffer,2) - - //Gang functions - if(gangID) - //Delete any old markings on this tile, including other gang tags - if(!(locate(/obj/effect/decal/cleanable/crayon/gang) in target)) //Ignore the check if the tile being sprayed has a gang tag - if(territory_claimed(territory, user)) - return - for(var/obj/effect/decal/cleanable/crayon/old_marking in target) - qdel(old_marking) - new /obj/effect/decal/cleanable/crayon/gang(target,gangID,"graffiti",graf_rot) - user << "You tagged [territory] for your gang!" - - else - new /obj/effect/decal/cleanable/crayon(target,paint_color,drawtype,temp,graf_rot) - - user << "You finish [instant ? "spraying" : "drawing"] \the [temp]." - if(instant<0) - playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) - if(uses < 0) - return - uses = max(0,uses-1) - if(!uses) - user << "There is no more of [src.name] left!" - if(!instant) - qdel(src) - return - -/obj/item/toy/crayon/attack(mob/M, mob/user) - if(edible && (M == user)) - user << "You take a bite of the [src.name]. Delicious!" - user.nutrition += 5 - if(uses < 0) - return - uses = max(0,uses-5) - if(!uses) - user << "There is no more of [src.name] left!" - qdel(src) - else - ..() - -/obj/item/toy/crayon/proc/territory_claimed(area/territory,mob/user) - var/occupying_gang - for(var/datum/gang/G in ticker.mode.gangs) - if(territory.type in (G.territory|G.territory_new)) - occupying_gang = G.name - break - if(occupying_gang) - user << "[territory] has already been tagged by the [occupying_gang] gang! You must get rid of or spray over the old tag first!" - return 1 - return 0 - /* * Snap pops */ @@ -674,50 +457,6 @@ icon_state = "reticenceprize" quiet = 1 -/* - * AI core prizes - */ -/obj/item/toy/AI - name = "toy AI" - desc = "A little toy model AI core with real law announcing action!" - icon = 'icons/obj/toy.dmi' - icon_state = "AI" - w_class = 2 - var/cooldown = 0 - -/obj/item/toy/AI/attack_self(mob/user) - if(!cooldown) //for the sanity of everyone - var/message = generate_ion_law() - user << "You press the button on [src]." - playsound(user, 'sound/machines/click.ogg', 20, 1) - src.loc.visible_message("\icon[src] [message]") - cooldown = 1 - spawn(30) cooldown = 0 - return - ..() - -/obj/item/toy/codex_gigas - name = "Toy Codex Gigas" - desc = "A tool to help you write fictional devils!" - icon = 'icons/obj/library.dmi' - icon_state = "demonomicon" - w_class = 2 - var/cooldown = 0 - -/obj/item/toy/codex_gigas/attack_self(mob/user) - if(!cooldown) - var/datum/devilinfo/devil = randomDevilInfo() - user << "You press the button on [src]." - cooldown = 1 - playsound(user, 'sound/machines/click.ogg', 20, 1) - src.loc.visible_message("\icon[src]Some fun facts about: [devil.truename]") - src.loc.visible_message("[lawlorify[LORE][devil.bane]]") - src.loc.visible_message("[lawlorify[LORE][devil.obligation]]") - src.loc.visible_message("[lawlorify[LORE][devil.ban]]") - src.loc.visible_message("[lawlorify[LORE][devil.banish]]") - spawn(60) cooldown = 0 - return - ..() /obj/item/toy/talking name = "talking action figure" @@ -725,37 +464,175 @@ icon = 'icons/obj/toy.dmi' icon_state = "owlprize" w_class = 2 - var/cooldown = 0 + var/cooldown = FALSE var/messages = list("I'm super generic!", "Mathematics class is of variable difficulty!") var/span = "danger" var/recharge_time = 30 + var/chattering = FALSE + var/phomeme + +// Talking toys are language universal, and thus all species can use them +/obj/item/toy/talking/attack_alien(mob/user) + . = attack_hand(user) + /obj/item/toy/talking/attack_self(mob/user) if(!cooldown) - var/message = pick(messages) - user << "You pull the string on the [src]." - toy_talk(user, message) - cooldown = 1 - spawn(recharge_time) cooldown = 0 + var/list/messages = generate_messages() + activation_message(user) + playsound(loc, 'sound/machines/click.ogg', 20, 1) + + spawn(0) + for(var/message in messages) + toy_talk(user, message) + sleep(10) + + cooldown = TRUE + spawn(recharge_time) + cooldown = FALSE return ..() -/obj/item/toy/talking/proc/toy_talk(user, message) - playsound(user, 'sound/machines/click.ogg', 20, 1) - src.loc.visible_message("\icon[src] [message]") +/obj/item/toy/talking/proc/activation_message(mob/user) + user.visible_message( + "[user] pulls the string on \the [src].", + "You pull the string on \the [src].", + "You hear a string being pulled.") + +/obj/item/toy/talking/proc/generate_messages() + return list(pick(messages)) + +/obj/item/toy/talking/proc/toy_talk(mob/user, message) + user.loc.visible_message("\icon[src] [message]") + if(chattering) + chatter(message, phomeme, user) + +/* + * AI core prizes + */ +/obj/item/toy/talking/AI + name = "toy AI" + desc = "A little toy model AI core with real law announcing action!" + icon_state = "AI" + +/obj/item/toy/talking/AI/generate_messages() + return list(generate_ion_law()) + +/obj/item/toy/talking/codex_gigas + name = "Toy Codex Gigas" + desc = "A tool to help you write fictional devils!" + icon = 'icons/obj/library.dmi' + icon_state = "demonomicon" + w_class = 2 + recharge_time = 60 + +/obj/item/toy/talking/codex_gigas/activation_message(mob/user) + user.visible_message( + "[user] presses the button on \the [src].", + "You press the button on \the [src].", + "You hear a soft click.") + +/obj/item/toy/talking/codex_gigas/generate_messages() + var/datum/devilinfo/devil = randomDevilInfo() + var/list/messages = list() + messages += "Some fun facts about: [devil.truename]" + messages += "[lawlorify[LORE][devil.bane]]" + messages += "[lawlorify[LORE][devil.obligation]]" + messages += "[lawlorify[LORE][devil.ban]]" + messages += "[lawlorify[LORE][devil.banish]]" + return messages /obj/item/toy/talking/owl name = "owl action figure" desc = "An action figure modeled after 'The Owl', defender of justice." icon_state = "owlprize" messages = list("You won't get away this time, Griffin!", "Stop right there, criminal!", "Hoot! Hoot!", "I am the night!") + chattering = TRUE + phomeme = "owl" /obj/item/toy/talking/griffin name = "griffin action figure" desc = "An action figure modeled after 'The Griffin', criminal mastermind." icon_state = "griffinprize" messages = list("You can't stop me, Owl!", "My plan is flawless! The vault is mine!", "Caaaawwww!", "You will never catch me!") + chattering = TRUE + phomeme = "griffin" +/obj/item/toy/talking/skeleton + name = "skeleton action figure" + desc = "An action figure modeled after 'Oh-cee', the original content \ + skeleton.\nNot suitable for infants or assistants under 36 months \ + of age." + icon_state = "skeletonprize" + attack_verb = list("boned", "dunked on", "worked down to the bone") + chattering = TRUE + + var/list/regular_messages = list( + "Why was the skeleton such a bad liar? \ + Because you can see right through him!", + "When does a skeleton laugh? When something tickles his funny bone!", + "Why couldn't the skeleton win the beauty contest? \ + Because he had no body!", + "What do you call a skeleton in the winter? A numbskull!", + "What did the skeleton say before eating? Bone appetit!", + "What type of art do skeletons like? Skulltures!", + "What instrument do skeletons play? The trom-bone!", + "Why are skeletons always so calm? \ + Because nothing gets under their skin!", + "How did the skeleton know it was going to rain? \ + He could feel it in his bones.", + "Why did the skeleton go to the hospital? \ + To get his ghoul stones removed.", + "Why can't skeletons play music in churches? \ + Because they have no organs.", + "There's a skeleton inside everyone! Except slime people I guess...", + "The birds are too busy to notice me acting in the shadows!", + "Giraffes have the same number of bones in their necks as humans. \ + You should never trust a giraffe.", + "When I meet a dog in the street, I always offer it a bone!", + "In corsetry, a bone is one of the rigid parts of a corset that \ + forms its frame and gives it rigidity.", + "A person who plays the trombone is called a trombonist or \ + trombone player.", + "Remember, compromise is for those without backbones!", + "If you go up to the captain and say the word 'bone' repeatedly, \ + eventually he'll brig you.", + "Yo ho ho, shiver me bones!", + "So what you're saying is, you only love me for my legs?", + "You will never again find socks that match!", + "BONES! BONES! BONES!", + "Bones absorb x-rays, which is why radiation gives you superpowers.", + "Oh-cee! The ORIGINAL CONTENT SKELETON. Suitable for ages 36 months \ + and up.", + "I just don't have the heart to judge you.", + "I don't have the stomach for this.", + "I'm a fighter, not a liver.", + "How can I see without eyeballs?", + "Ask your parents about 'boning', before you get pregnant.", + "Remember, a dog is for life, not just for christmas.") + +/obj/item/toy/talking/skeleton/suicide_act(mob/user) + user.visible_message("[user] is trying to commit \ + suicide with \the [src].") + + if(ishuman(user)) + var/mob/living/carbon/human/H = user + H.set_species(/datum/species/skeleton) + + toy_talk(user, "RATTLE ME BONES") + + user.Stun(5) + sleep(20) + return OXYLOSS + +/obj/item/toy/talking/skeleton/generate_messages() + return list(pick(regular_messages)) + +/obj/item/toy/talking/skeleton/toy_talk(user, message) + phomeme = pick("sans", "papyrus") + + span = "danger [phomeme]" + ..() /* || A Deck of Cards for playing various games of chance || diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index ccc8fc78ce6..a0279af71e9 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -134,4 +134,29 @@ desc = "Damn son, where'd you find this?" icon_state = "air_horn" honksound = 'sound/items/AirHorn2.ogg' - cooldowntime = 50 \ No newline at end of file + cooldowntime = 50 + +/obj/item/weapon/bikehorn/golden + name = "golden bike horn" + desc = "Golden? Clearly, its made with bananium! Honk!" + icon_state = "gold_horn" + item_state = "gold_horn" + +/obj/item/weapon/bikehorn/golden/attack() + ..() + flip_mobs() + +/obj/item/weapon/bikehorn/golden/attack_self(mob/user) + ..() + flip_mobs() + + +/obj/item/weapon/bikehorn/golden/proc/flip_mobs(mob/living/carbon/M, mob/user) + if (!spam_flag) + var/turf/T = get_turf(src) + for(M in ohearers(7, T)) + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + if((istype(H.ears, /obj/item/clothing/ears/earmuffs)) || H.ear_deaf) + continue + M.emote("flip") \ No newline at end of file diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 5517716c4bf..c04ead47e26 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -65,7 +65,8 @@ ratio = Ceiling(ratio*4) * 25 overlays += "[initial(icon_state)]-charge[ratio]" -/obj/item/weapon/defibrillator/CheckParts() +/obj/item/weapon/defibrillator/CheckParts(list/parts_list) + ..() bcell = locate(/obj/item/weapon/stock_parts/cell) in contents update_icon() diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index fdfd0f7c4d6..218f2fba57c 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -170,7 +170,8 @@ update_icon() return -/obj/item/weapon/flamethrower/CheckParts() +/obj/item/weapon/flamethrower/CheckParts(list/parts_list) + ..() weldtool = locate(/obj/item/weapon/weldingtool) in contents igniter = locate(/obj/item/device/assembly/igniter) in contents weldtool.status = 0 diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index 8339ed98c7c..e8ae2498982 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -29,7 +29,8 @@ else range = pick(2,2,2,3,3,3,4) -/obj/item/weapon/grenade/iedcasing/CheckParts() +/obj/item/weapon/grenade/iedcasing/CheckParts(list/parts_list) + ..() var/obj/item/weapon/reagent_containers/food/drinks/soda_cans/can = locate() in contents if(can) var/muh_layer = can.layer diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 205336bfb04..520d043a9ba 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -167,6 +167,7 @@ name = "high frequency blade" desc = "Bad references are the DNA of the soul." attack_verb = list("chopped", "sliced", "cut", "zandatsu'd") + hitsound = 'sound/weapons/bladeslice.ogg' /obj/item/weapon/nullrod/hammmer icon_state = "hammeron" diff --git a/code/game/objects/items/weapons/implants/implant_track.dm b/code/game/objects/items/weapons/implants/implant_track.dm index 7443a22ab3e..a0d58369614 100644 --- a/code/game/objects/items/weapons/implants/implant_track.dm +++ b/code/game/objects/items/weapons/implants/implant_track.dm @@ -13,6 +13,13 @@ ..() tracked_implants -= src +/obj/item/weapon/implanter/tracking/New() + imp = new /obj/item/weapon/implant/tracking( src ) + ..() +/obj/item/weapon/implanter/tracking/gps/New() + imp = new /obj/item/device/gps/mining/internal( src ) + ..() + /obj/item/weapon/implant/tracking/get_data() var/dat = {"Implant Specifications:
Name: Tracking Beacon
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 9d3ac9f9fbc..c871f8bcab4 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -111,6 +111,16 @@ /obj/item/weapon/kitchen/knife/combat/survival name = "survival knife" + icon_state = "survivalknife" + desc = "A hunting grade survival knife." + force = 15 + throwforce = 15 + +/obj/item/weapon/kitchen/knife/combat/bone + name = "bone dagger" + item_state = "bone_dagger" + icon_state = "bone_dagger" + desc = "A sharpened bone. The bare mimimum in survival." force = 15 throwforce = 15 diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index 3937889f8c1..9823294dcad 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -123,7 +123,7 @@ maxWeightClass = 7 gasPerThrow = 5 -/datum/table_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but +/datum/crafting_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but name = "Pneumatic Cannon" result = /obj/item/weapon/pneumatic_cannon/ghetto tools = list(/obj/item/weapon/weldingtool, diff --git a/code/game/objects/items/weapons/signs.dm b/code/game/objects/items/weapons/signs.dm index 4454169fdd3..622f4225166 100644 --- a/code/game/objects/items/weapons/signs.dm +++ b/code/game/objects/items/weapons/signs.dm @@ -29,7 +29,7 @@ user.visible_message("[user] waves around blank sign.") user.changeNext_move(CLICK_CD_MELEE) -/datum/table_recipe/picket_sign +/datum/crafting_recipe/picket_sign name = "Picket Sign" result = /obj/item/weapon/picket_sign reqs = list(/obj/item/stack/rods = 1, diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 3cab28cd5f8..ce3249bcc2c 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -129,6 +129,12 @@ icon_state = "clownpack" item_state = "clownpack" +/obj/item/weapon/storage/backpack/explorer + name = "explorer bag" + desc = "A robust backpack for stashing your loot." + icon_state = "explorerpack" + item_state = "explorerpack" + /obj/item/weapon/storage/backpack/mime name = "Parcel Parceaux" desc = "A silent backpack made for those silent workers. Silence Co." @@ -262,6 +268,12 @@ icon_state = "satchel-sec" item_state = "securitypack" +/obj/item/weapon/storage/backpack/satchel_explorer + name = "explorer satchel" + desc = "A robust satchel for stashing your loot." + icon_state = "satchel-explorer" + item_state = "securitypack" + /obj/item/weapon/storage/backpack/satchel_cap name = "captain's satchel" desc = "An exclusive satchel for Nanotrasen officers." @@ -351,6 +363,10 @@ icon_state = "duffle-clown" item_state = "duffle-clown" +/obj/item/weapon/storage/backpack/dufflebag/clown/cream_pie/New() + . = ..() + for(var/i in 1 to 10) + new /obj/item/weapon/reagent_containers/food/snacks/pie/cream(src) /obj/item/weapon/storage/backpack/dufflebag/syndie name = "suspicious looking dufflebag" diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 8b4549cc406..59740fe1d00 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -62,6 +62,7 @@ desc = "Can hold various medical equipment." icon_state = "medicalbelt" item_state = "medical" + max_w_class = 4 can_hold = list( /obj/item/device/healthanalyzer, /obj/item/weapon/dnainjector, @@ -80,7 +81,29 @@ /obj/item/device/rad_laser, /obj/item/device/sensor_device, /obj/item/device/radio, - /obj/item/clothing/gloves/ + /obj/item/clothing/gloves/, + /obj/item/weapon/lazarus_injector, + /obj/item/weapon/bikehorn/rubberducky, + /obj/item/clothing/mask/surgical, + /obj/item/clothing/mask/breath, + /obj/item/clothing/mask/breath/medical, + /obj/item/weapon/surgical_drapes, //for true paramedics + /obj/item/weapon/scalpel, + /obj/item/weapon/circular_saw, + /obj/item/weapon/surgicaldrill, + /obj/item/weapon/retractor, + /obj/item/weapon/cautery, + /obj/item/weapon/hemostat, + /obj/item/device/geiger_counter, + /obj/item/clothing/tie/stethoscope, + /obj/item/weapon/stamp, + /obj/item/clothing/glasses, + /obj/item/weapon/wrench/medical, + /obj/item/clothing/mask/muzzle, + /obj/item/weapon/storage/bag/chemistry, + /obj/item/weapon/storage/bag/bio, + /obj/item/weapon/reagent_containers/blood, + /obj/item/weapon/tank/internals/emergency_oxygen ) @@ -120,10 +143,10 @@ /obj/item/weapon/storage/belt/mining - name = "explorer belt" - desc = "A versatile belt, cherised by miners and hunters alike." - icon_state = "ebelt" //I'm doing this because I love you, syndicate son. - item_state = "ebelt" + name = "explorer's webbing" + desc = "A versatile chest rig, cherished by miners and hunters alike." + icon_state = "explorer1" + item_state = "explorer1" storage_slots = 5 w_class = 4 max_w_class = 4 //Pickaxes are big. @@ -163,6 +186,15 @@ ) +/obj/item/weapon/storage/belt/mining/alt + icon_state = "explorer2" + item_state = "explorer2" + +/obj/item/weapon/storage/belt/mining/primitive + name = "hunter's belt" + desc = "A versatile belt, woven from sinew." + icon_state = "ebelt" + item_state = "ebelt" /obj/item/weapon/storage/belt/soulstone name = "soul stone belt" diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 6538bba7f06..03ccef5fd1d 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -57,37 +57,45 @@ return ..() -/obj/item/weapon/storage/box/survival - +// Ordinary survival box /obj/item/weapon/storage/box/survival/New() ..() new /obj/item/clothing/mask/breath(src) new /obj/item/weapon/tank/internals/emergency_oxygen(src) new /obj/item/weapon/reagent_containers/hypospray/medipen(src) -/obj/item/weapon/storage/box/engineer +/obj/item/weapon/storage/box/survival/radio/New() + ..() + new /obj/item/device/radio/off(src) +// Engineer survival box /obj/item/weapon/storage/box/engineer/New() ..() new /obj/item/clothing/mask/breath(src) new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src) new /obj/item/weapon/reagent_containers/hypospray/medipen(src) -/obj/item/weapon/storage/box/syndie +/obj/item/weapon/storage/box/engineer/radio/New() + ..() + new /obj/item/device/radio/off(src) +// Syndie survival box /obj/item/weapon/storage/box/syndie/New() ..() new /obj/item/clothing/mask/gas/syndicate(src) new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src) -/obj/item/weapon/storage/box/security - +// Security survival box /obj/item/weapon/storage/box/security/New() ..() new /obj/item/clothing/mask/gas/sechailer(src) new /obj/item/weapon/tank/internals/emergency_oxygen(src) new /obj/item/weapon/reagent_containers/hypospray/medipen(src) +/obj/item/weapon/storage/box/security/radio/New() + ..() + new /obj/item/device/radio/off(src) + /obj/item/weapon/storage/box/gloves name = "box of latex gloves" desc = "Contains sterile latex gloves." @@ -231,6 +239,19 @@ new /obj/item/weapon/implantpad(src) new /obj/item/weapon/locator(src) +/obj/item/weapon/storage/box/minertracker + name = "boxed tracking implant kit" + desc = "For finding those who have died on the accursed lavaworld." + icon_state = "implant" + +/obj/item/weapon/storage/box/minertracker/New() + ..() + for(var/i in 1 to 3) + new /obj/item/weapon/implantcase/tracking(src) + new /obj/item/weapon/implanter(src) + new /obj/item/weapon/implantpad(src) + new /obj/item/weapon/locator(src) + /obj/item/weapon/storage/box/chemimp name = "boxed chemical implant kit" desc = "Box of stuff used to implant chemicals." diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 248f0c7b116..e10c5776a88 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -27,6 +27,7 @@ if(locked) icon_state = icon_locked user << "You lock the [src.name]!" + close_all() return else icon_state = icon_closed diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 83842b332a8..9f7b37c2542 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -290,14 +290,9 @@ remove_fuel(1) update_icon() + //This is to start fires. process() is only called if the welder is on. - var/turf/location = loc - if(ismob(location)) - var/mob/M = location - if(M.l_hand == src || M.r_hand == src) - location = get_turf(M) - if(isturf(location)) - location.hotspot_expose(700, 5) + open_flame() /obj/item/weapon/weldingtool/afterattack(atom/O, mob/user, proximity) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 7c0860f9506..2419cd93645 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -5,6 +5,7 @@ * Double-Bladed Energy Swords * Spears * CHAINSAWS + * Bone Axe and Spear */ /*################################################################## @@ -339,7 +340,8 @@ if(input) src.war_cry = input -/obj/item/weapon/twohanded/spear/CheckParts() +/obj/item/weapon/twohanded/spear/CheckParts(list/parts_list) + ..() if(explosive) explosive.loc = get_turf(src.loc) explosive = null @@ -389,9 +391,9 @@ var/datum/action/A = X A.UpdateButtonIcon() -/obj/item/weapon/twohanded/required/chainsaw/can_dismember() - return wielded - +/obj/item/weapon/twohanded/required/chainsaw/get_dismemberment_chance() + if(wielded) + . = ..() //GREY TIDE /obj/item/weapon/twohanded/spear/grey_tide @@ -507,4 +509,42 @@ else owner.visible_message("[owner] parries [attack_text] with [src]!") return 1 - return 0 \ No newline at end of file + return 0 + +/obj/item/weapon/twohanded/vibro_weapon/update_icon() + icon_state = "hfrequency[wielded]" + +/* + * Bone Axe + */ +/obj/item/weapon/twohanded/fireaxe/boneaxe // Blatant imitation of the fireaxe, but made out of bone. + icon_state = "bone_axe0" + name = "bone axe" + desc = "A large, vicious axe crafted out of several sharpened bone plates and crudely tied together. Made of monsters, by killing monsters, for killing monsters." + force_wielded = 23 + +/obj/item/weapon/twohanded/fireaxe/boneaxe/update_icon() + icon_state = "bone_axe[wielded]" + +/* + * Bone Spear + */ +/obj/item/weapon/twohanded/bonespear //Blatant imitation of spear, but made out of bone. Not valid for explosive modification. + icon_state = "bone_spear0" + name = "bone spear" + desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology." + force = 11 + w_class = 4 + slot_flags = SLOT_BACK + force_unwielded = 11 + force_wielded = 20 //I have no idea how to balance + throwforce = 22 + throw_speed = 4 + embedded_impact_pain_multiplier = 3 + armour_penetration = 15 //Enhanced armor piercing + hitsound = 'sound/weapons/bladeslice.ogg' + attack_verb = list("attacked", "poked", "jabbed", "torn", "gored") + sharpness = IS_SHARP + +/obj/item/weapon/twohanded/bonespear/update_icon() + icon_state = "bone_spear[wielded]" \ No newline at end of file diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 05c037c478c..faf3b4b8cb3 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -16,7 +16,8 @@ handle_layer() /obj/structure/chair/deconstruct() - if(buildstacktype) + // If we have materials, and don't have the NOCONSTRUCT flag + if(buildstacktype && (!(flags & NODECONSTRUCT))) new buildstacktype(loc,buildstackamount) ..() diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index df6f9ce90db..1265b21905c 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -395,7 +395,7 @@ add_fingerprint(user) locked = !locked user.visible_message("[user] [locked ? null : "un"]locks [src].", - "You [locked ? null : "un"]locks [src].") + "You [locked ? null : "un"]lock [src].") update_icon() else user << "Access Denied" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index f84d9889d59..88cb7d65b73 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -61,3 +61,12 @@ new /obj/item/stack/spacecash/c500(src) for(var/i = 0, i < 6, i++) new /obj/item/stack/spacecash/c200(src) + +/obj/structure/closet/secure_closet/freezer/cream_pie + name = "cream pie closet" + desc = "Contains pies filled with cream and/or custard, you sickos." + req_access = list(access_theatre) + +/obj/structure/closet/secure_closet/freezer/pie/New() + ..() + new /obj/item/weapon/reagent_containers/food/snacks/pie/cream(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index c8fa71c24dc..6c6e0f78446 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -111,6 +111,7 @@ ..() new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/head/helmet/sec(src) + new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/device/radio/headset/headset_sec/alt(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/device/flashlight/seclite(src) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index d81af121c14..8bf04d32eea 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -239,38 +239,23 @@ //a rock is flora according to where the icon file is //and now these defines + /obj/structure/flora/rock - name = "rock" - desc = "a rock" - icon_state = "rock" + icon_state = "basalt" + desc = "A volcanic rock" icon = 'icons/obj/flora/rocks.dmi' anchored = 1 burn_state = FIRE_PROOF density = 1 /obj/structure/flora/rock/New() - ..() - icon_state = "[icon_state][rand(1,5)]" - -/obj/structure/flora/rock/pile - name = "rocks" - desc = "some rocks" - icon_state = "rockpile" - density = 0 - - -/obj/structure/flora/rock/volcanic - icon_state = "basalt" - desc = "A volcanic rock" - - -/obj/structure/flora/rock/volcanic/New() ..() icon_state = "[icon_state][rand(1,3)]" -/obj/structure/flora/rock/pile/volcanic +/obj/structure/flora/rock/pile icon_state = "lavarocks" + desc = "A pile of rocks" -/obj/structure/flora/rock/pile/volcanic/New() +/obj/structure/flora/rock/pile/New() ..() icon_state = "[icon_state][rand(1,3)]" \ No newline at end of file diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 010789c22e2..a781894bfc5 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -328,7 +328,7 @@ add_fingerprint(user) if(istype(W, /obj/item/weapon/tome) && iscultist(user)) //Cultists can demolish cult girders instantly with their tomes user.visible_message("[user] strikes [src] with [W]!", "You demolish [src].") - var/obj/item/stack/sheet/metal/R = new(get_turf(src)) + var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src)) R.amount = 1 qdel(src) @@ -342,7 +342,7 @@ return user << "You slice apart the girder." var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src)) - R.amount = 2 + R.amount = 1 transfer_fingerprints_to(R) qdel(src) @@ -352,7 +352,7 @@ if(do_after(user, 30, target = src)) user << "You slice apart the girder." var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src)) - R.amount = 2 + R.amount = 1 transfer_fingerprints_to(R) qdel(src) @@ -367,15 +367,16 @@ else if(istype(W, /obj/item/stack/sheet/runed_metal)) var/obj/item/stack/sheet/runed_metal/R = W - if(R.amount < 2) - user << "You need at least two sheets of runed metal to construct a runed wall!" + if(R.amount < 1) + user << "You need at least one sheet of runed metal to construct a runed wall!" return 0 user.visible_message("[user] begins laying runed metal on [src]...", "You begin constructing a runed wall...") if(!do_after(user, 50, target = src)) return 0 user.visible_message("[user] plates [src] with runed metal.", "You construct a runed wall.") - R.use(2) - new/turf/closed/wall/cult(get_turf(src)) + R.use(1) + var/turf/T = get_turf(src) + T.ChangeTurf(/turf/closed/wall/cult) qdel(src) else @@ -390,9 +391,9 @@ qdel(src) if(2) if(prob(30)) - new/obj/item/stack/sheet/runed_metal/(get_turf(src), 2) + new/obj/item/stack/sheet/runed_metal/(get_turf(src), 1) qdel(src) if(3) if(prob(5)) - new/obj/item/stack/sheet/runed_metal/(get_turf(src), 2) + new/obj/item/stack/sheet/runed_metal/(get_turf(src), 1) qdel(src) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 5da6f3aaaa7..745d27a0e5c 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -258,3 +258,13 @@ /obj/structure/grille/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user) return 0 + +/obj/structure/grille/broken // Pre-broken grilles for map placement + icon_state = "brokengrille" + density = 0 + health = 0 + destroyed = 1 + +/obj/structure/grille/broken/New() + ..() + stored.amount = 1 \ No newline at end of file diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index b699da49dd3..28cc59a701b 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -27,7 +27,9 @@ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) user.visible_message("[user] unfastens [src].", \ "You unfasten [src].") - new /obj/item/sign_backing(get_turf(user)) + var/obj/item/sign_backing/SB = new (get_turf(user)) + SB.icon_state = icon_state + SB.sign_path = type qdel(src) else if(istype(O, /obj/item/weapon/pen)) var/list/sign_types = list("Secure Area", "Biohazard", "High Voltage", "Radiation", "Hard Vacuum Ahead", "Disposal: Leads To Space", "Danger: Fire", "No Smoking", "Medbay", "Science", "Chemistry", \ @@ -82,11 +84,12 @@ /obj/item/sign_backing name = "sign backing" - desc = "A blank sign with adhesive backing." + desc = "A sign with adhesive backing." icon = 'icons/obj/decals.dmi' icon_state = "backing" w_class = 3 burn_state = FLAMMABLE + var/sign_path = /obj/structure/sign/basic //the type of sign that will be created when placed on a turf /obj/item/sign_backing/afterattack(atom/target, mob/user, proximity) if(isturf(target) && proximity) @@ -94,7 +97,7 @@ user.visible_message("[user] fastens [src] to [T].", \ "You attach a blank sign to [T].") playsound(T, 'sound/items/Deconstruct.ogg', 50, 1) - new /obj/structure/sign/basic(T) + new sign_path(T) user.drop_item() qdel(src) else diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index d56212c5835..9d8f2f93bbc 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -14,10 +14,10 @@ var/reinf = 0 var/wtype = "glass" var/fulltile = 0 - var/list/storeditems = list() // var/silicate = 0 // number of units of silicate // var/icon/silicateIcon = null // the silicated icon var/image/crack_overlay + var/list/debris = list() can_be_unanchored = 1 /obj/structure/window/examine(mob/user) @@ -32,21 +32,25 @@ if(reinf) state = 2*anchored - spawn(5) // The NODECONSTRUCT flag gets added immediately by the holodeck (but not immediately enough) - if(!(flags & NODECONSTRUCT)) - storeditems.Add(new/obj/item/weapon/shard(src)) - if(fulltile) - storeditems.Add(new/obj/item/weapon/shard(src)) - if(reinf) - var/obj/item/stack/rods/R = new/obj/item/stack/rods(src) - storeditems.Add(R) - if(fulltile) - R.add(1) - ini_dir = dir air_update_turf(1) - return + // Precreate our own debris + + var/shards = 1 + if(fulltile) + shards++ + var/rods = 0 + if(reinf) + rods++ + if(fulltile) + rods++ + + for(var/i in 1 to shards) + debris += new /obj/item/weapon/shard(src) + if(rods) + debris += new /obj/item/stack/rods(src, rods) + /obj/structure/window/bullet_act(obj/item/projectile/P) . = ..() @@ -65,7 +69,10 @@ shatter() /obj/structure/window/narsie_act() - color = "#7D1919" + var/evil_color = "#7D1919" + color = evil_color + for(var/obj/item/weapon/shard/shard in debris) + shard.color = evil_color /obj/structure/window/singularity_pull(S, current_size) if(current_size >= STAGE_FIVE) @@ -276,9 +283,13 @@ return playsound(src, "shatter", 70, 1) var/turf/T = loc - for(var/obj/item/I in storeditems) - I.loc = T - transfer_fingerprints_to(I) + + if(!(flags & NODECONSTRUCT)) + for(var/i in debris) + var/obj/item/I = i + + I.loc = T + transfer_fingerprints_to(I) qdel(src) update_nearby_icons() diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 068f0b945a6..acb286f3c7f 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -43,6 +43,15 @@ excited = 1 SSair.active_turfs |= src +/turf/open/proc/GetHeatCapacity() + . = air.heat_capacity() + +/turf/open/proc/GetTemperature() + . = air.temperature + +/turf/open/proc/TakeTemperature(temp) + air.temperature += temp + air_update_turf() /turf/open/handle_fall(mob/faller, forced) faller.lying = pick(90, 270) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 625bcbf18fa..afca2aebd16 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -205,6 +205,13 @@ processing = 0 SSobj.processing.Remove(src) +/turf/open/floor/plating/lava/GetHeatCapacity() + . = 700000 + +/turf/open/floor/plating/lava/GetTemperature() + . = 5000 + +/turf/open/floor/plating/lava/TakeTemperature(temp) /turf/open/floor/plating/lava/proc/burn_stuff() . = 0 diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index bcfeae80afd..9551bed794f 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -38,7 +38,8 @@ else playsound(src, 'sound/items/Welder.ogg', 100, 1) var/newgirder = break_wall() - transfer_fingerprints_to(newgirder) + if(newgirder) //maybe we don't /want/ a girder! + transfer_fingerprints_to(newgirder) for(var/obj/O in src.contents) //Eject contents! if(istype(O,/obj/structure/sign/poster)) diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index 038bfb3fd26..83e29d65bce 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -1,5 +1,5 @@ /turf/closed/wall/cult - name = "runed wall" + 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" @@ -12,16 +12,26 @@ ..() /turf/closed/wall/cult/break_wall() - new/obj/item/stack/sheet/metal/(get_turf(src), 1) + new/obj/item/stack/sheet/runed_metal(get_turf(src), 1) return (new /obj/structure/girder/cult(src)) /turf/closed/wall/cult/devastate_wall() - new /obj/effect/decal/cleanable/blood(src) - new /obj/effect/decal/remains/human(src) + new/obj/item/stack/sheet/runed_metal(get_turf(src), 1) /turf/closed/wall/cult/narsie_act() return +/turf/closed/wall/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/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/cult/artificer/devastate_wall() + PoolOrNew(/obj/effect/overlay/temp/cult/turf, get_turf(src)) + /turf/closed/wall/vault icon = 'icons/turf/walls.dmi' icon_state = "rockvault" diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index da7f0648d5c..06581872610 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -28,6 +28,8 @@ /turf/open/space/ChangeTurf(path) . = ..() +/turf/open/space/TakeTemperature(temp) + /turf/open/space/AfterChange() ..() atmos_overlay_types.Cut() diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index ea8622dd70b..33971447d07 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -101,10 +101,13 @@ var/mob/living/carbon/M = AM switch(wet) if(TURF_WET_WATER) - if(!M.slip(3, 1, null, NO_SLIP_WHEN_WALKING)) + if(!M.slip(0, 3, null, NO_SLIP_WHEN_WALKING)) M.inertia_dir = 0 if(TURF_WET_LUBE) - M.slip(0, 7, null, (SLIDE|GALOSHES_DONT_HELP)) + if(M.slip(0, 4, null, (SLIDE|GALOSHES_DONT_HELP))) + M.confused = max(M.confused, 8) + if(TURF_WET_ICE) + M.slip(0, 6, null, (SLIDE|GALOSHES_DONT_HELP)) if(TURF_WET_ICE || TURF_WET_PERMAFROST) M.slip(0, 4, null, (SLIDE|NO_SLIP_WHEN_WALKING)) diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index ceaab94ab26..7f192fce020 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -9,6 +9,7 @@ return if(confirm == "Yes") suiciding = 1 + log_game("[key_name(src)] (job: [job ? "[job]" : "None"]) commited suicide at [get_area(src)].") var/obj/item/held_item = get_active_hand() if(held_item) var/damagetype = held_item.suicide_act(src) diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index ee509be5fc9..d7b3be526cd 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -534,7 +534,9 @@ for(var/obj/machinery/capture_the_flag/CTF in machines) ctf_enabled = !CTF.ctf_enabled CTF.ctf_enabled = !CTF.ctf_enabled + CTF.TellGhost() message_admins("[key_name_admin(usr)] has [ctf_enabled? "enabled" : "disabled"] CTF!") + notify_ghosts("CTF has been [ctf_enabled? "enabled" : "disabled"]!",'sound/effects/ghost2.ogg') if(E) E.processing = 0 diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index fae5f96e1b9..a69cc1df9dc 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -15,8 +15,7 @@ usr << "@[target.x],[target.y]: [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]" for(var/id in GM_gases) - if(id in hardcoded_gases || GM_gases[id][MOLES]) - usr << "[GM_gases[id][GAS_META][META_GAS_NAME]]: [GM_gases[id][MOLES]]" + usr << "[GM_gases[id][GAS_META][META_GAS_NAME]]: [GM_gases[id][MOLES]]" feedback_add_details("admin_verb","DAST") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/fix_next_move() @@ -100,4 +99,4 @@ load_admins() feedback_add_details("admin_verb","RLDA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - message_admins("[key_name_admin(usr)] manually reloaded admins") \ No newline at end of file + message_admins("[key_name_admin(usr)] manually reloaded admins") diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index fdf936ae8f2..2e3d584999b 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -135,41 +135,14 @@ return 0 /datum/admins/proc/makeWizard() - var/datum/game_mode/wizard/temp = new - var/list/mob/dead/observer/candidates = list() - var/mob/dead/observer/theghost = null - var/time_passed = world.time - for(var/mob/dead/observer/G in player_list) - if(!jobban_isbanned(G, "wizard") && !jobban_isbanned(G, "Syndicate")) - if(temp.age_check(G.client)) - spawn(0) - switch(alert(G, "Do you wish to be considered for the position of Space Wizard Foundation 'diplomat'?","Please answer in 30 seconds!","Yes","No")) - if("Yes") - if((world.time-time_passed)>300)//If more than 30 game seconds passed. - return - candidates += G - if("No") - return - else - return + var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered for the position of a Wizard Foundation 'diplomat'?", "wizard", null) - sleep(300) + var/mob/dead/observer/selected = popleft(candidates) - if(candidates.len) - shuffle(candidates) - for(var/mob/i in candidates) - if(!i || !i.client) continue //Dont bother removing them from the list since we only grab one wizard - - theghost = i - break - - if(theghost) - var/mob/living/carbon/human/new_character=makeBody(theghost) - new_character.mind.make_Wizard() - return 1 - - return 0 + var/mob/living/carbon/human/new_character = makeBody(selected) + new_character.mind.make_Wizard() + return TRUE /datum/admins/proc/makeCult() @@ -269,11 +242,15 @@ /datum/admins/proc/makeAliens() - new /datum/round_event/alien_infestation{spawncount=3}() - return 1 + var/datum/round_event/ghost_role/alien_infestation/E = new(FALSE) + E.spawncount = 3 + // TODO The fact we have to do this rather than just have events start + // when we ask them to, is bad. + E.processing = TRUE + return TRUE /datum/admins/proc/makeSpaceNinja() - new /datum/round_event/ninja() + new /datum/round_event/ghost_role/ninja() return 1 // DEATH SQUADS @@ -540,22 +517,11 @@ //Abductors /datum/admins/proc/makeAbductorTeam() - new /datum/round_event/abductor + new /datum/round_event/ghost_role/abductor return 1 /datum/admins/proc/makeRevenant() - var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered for becoming a revenant?", "revenant", null) - if(candidates.len >= 1) - var/spook_op = pick(candidates) - var/mob/dead/observer/O = spook_op - candidates -= spook_op - var/mob/living/simple_animal/revenant/revvie = new /mob/living/simple_animal/revenant(get_turf(O)) - revvie.key = O.key - revvie.mind.assigned_role = "revenant" - revvie.mind.special_role = "Revenant" - return 1 - else - return + new /datum/round_event/ghost_role/revenant //Shadowling /datum/admins/proc/makeShadowling() diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 77dd2e39eee..9da33d33da2 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -26,8 +26,6 @@ var/sound/admin_sound for(var/mob/M in player_list) if(M.client.prefs.toggles & SOUND_MIDI) - var/vol = M.client.prefs.adminmusicvolume - admin_sound.volume = vol M << admin_sound feedback_add_details("admin_verb","PGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm index bb79aa21bfe..5188750f085 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -68,6 +68,11 @@ var/list/hardcoded_gases = list("o2","n2","co2","plasma") //the main four gases, specific_heat = 30 name = "Volatile Fuel" +/datum/gas/bz + id = "bz" + specific_heat = 20 + name = "BZ" + /obj/effect/overlay/gas/ icon = 'icons/effects/tile_effects.dmi' mouse_opacity = 0 diff --git a/code/modules/atmospherics/gasmixtures/space_mixture.dm b/code/modules/atmospherics/gasmixtures/space_mixture.dm index 15e1b44af9c..608974f0ce0 100644 --- a/code/modules/atmospherics/gasmixtures/space_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/space_mixture.dm @@ -2,7 +2,6 @@ //it can be changed, but any changes will ultimately be undone before they can have any effect /datum/gas_mixture/space - var/static/datum/gas_mixture/dummy = new /datum/gas_mixture/space/New() ..() @@ -18,6 +17,12 @@ /datum/gas_mixture/space/merge() return 0 //we're immutable. +/datum/gas_mixture/space/heat_capacity() + . = 700000 + +/datum/gas_mixture/space/heat_capacity_archived() + . = heat_capacity() + /datum/gas_mixture/space/remove() return copy() //we're immutable, so we can just return a copy. @@ -25,8 +30,9 @@ return copy() //we're immutable, so we can just return a copy. /datum/gas_mixture/space/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4) - . = dummy.share(sharer, atmos_adjacent_turfs) //keep all the sharing calculations, but don't actually change anything about ourselves - dummy.copy_from(src) + . = ..(sharer, 0) + temperature = TCMB + gases.Cut() /datum/gas_mixture/space/after_share() temperature = TCMB @@ -50,6 +56,6 @@ /datum/gas_mixture/space/parse_gas_string() return 0 //we're immutable. -/datum/gas_mixture/space/temperature_share() - ..() - temperature = TCMB +/datum/gas_mixture/space/temperature_share(datum/gas_mixture/sharer, conduction_coefficient, sharer_temperature, sharer_heat_capacity) + . = ..(sharer, 1, sharer_temperature, sharer_heat_capacity) + temperature = TCMB \ No newline at end of file diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 93cb87e4d1e..4b8791c3400 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -76,6 +76,7 @@ "co2" = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa "plasma" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa "n2o" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa + "bz" = new/datum/tlv(-1, -1, 0.2, 0.5) ) /obj/machinery/airalarm/server // No checks here. @@ -87,6 +88,7 @@ "co2" = new/datum/tlv(-1, -1, -1, -1), "plasma" = new/datum/tlv(-1, -1, -1, -1), "n2o" = new/datum/tlv(-1, -1, -1, -1), + "bz" = new/datum/tlv(-1, -1, -1, -1), ) /obj/machinery/airalarm/kitchen_cold_room // Copypasta: to check temperatures. @@ -98,6 +100,7 @@ "co2" = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa "plasma" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa "n2o" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa + "bz" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa ) //all air alarms in area are connected via magic diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index cdd0e0fea57..0198186a411 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -161,7 +161,7 @@ user << "[src] seems empty." /obj/machinery/atmospherics/components/unary/cryo_cell/MouseDrop_T(mob/target, mob/user) - if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target)) + if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser()) return close_machine(target) diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm index 0735a876106..cb97092e629 100644 --- a/code/modules/atmospherics/machinery/datum_pipeline.dm +++ b/code/modules/atmospherics/machinery/datum_pipeline.dm @@ -140,27 +140,32 @@ var/pipenetwarnings = 10 /datum/pipeline/proc/temperature_interact(turf/target, share_volume, thermal_conductivity) var/total_heat_capacity = air.heat_capacity() var/partial_heat_capacity = total_heat_capacity*(share_volume/air.volume) + var/target_temperature + var/target_heat_capacity if(istype(target, /turf/open)) + var/turf/open/modeled_location = target + target_temperature = modeled_location.GetTemperature() + target_heat_capacity = modeled_location.GetHeatCapacity() if(modeled_location.blocks_air) if((modeled_location.heat_capacity>0) && (partial_heat_capacity>0)) - var/delta_temperature = air.temperature - modeled_location.temperature + var/delta_temperature = air.temperature - target_temperature var/heat = thermal_conductivity*delta_temperature* \ - (partial_heat_capacity*modeled_location.heat_capacity/(partial_heat_capacity+modeled_location.heat_capacity)) + (partial_heat_capacity*target_heat_capacity/(partial_heat_capacity+target_heat_capacity)) air.temperature -= heat/total_heat_capacity - modeled_location.temperature += heat/modeled_location.heat_capacity + modeled_location.TakeTemperature(heat/target_heat_capacity) else var/delta_temperature = 0 var/sharer_heat_capacity = 0 - delta_temperature = (air.temperature - modeled_location.air.temperature) - sharer_heat_capacity = modeled_location.air.heat_capacity() + delta_temperature = (air.temperature - target_temperature) + sharer_heat_capacity = target_heat_capacity var/self_temperature_delta = 0 var/sharer_temperature_delta = 0 @@ -175,9 +180,7 @@ var/pipenetwarnings = 10 return 1 air.temperature += self_temperature_delta - - modeled_location.air.temperature += sharer_temperature_delta - modeled_location.air_update_turf() + modeled_location.TakeTemperature(sharer_temperature_delta) else diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm index 6ecb554eab7..8b3c53864e2 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm @@ -36,8 +36,8 @@ else if(T.blocks_air) environment_temperature = T.temperature else - var/datum/gas_mixture/environment = T.return_air() - environment_temperature = environment.temperature + var/turf/open/OT = T + environment_temperature = OT.GetTemperature() else environment_temperature = T.temperature diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 100b9af99b7..ca92eeb06c9 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -28,6 +28,7 @@ "co2" = /obj/machinery/portable_atmospherics/canister/carbon_dioxide, "plasma" = /obj/machinery/portable_atmospherics/canister/toxins, "n2o" = /obj/machinery/portable_atmospherics/canister/nitrous_oxide, + "bz" = /obj/machinery/portable_atmospherics/canister/bz, "air" = /obj/machinery/portable_atmospherics/canister/air, "caution" = /obj/machinery/portable_atmospherics/canister, ) @@ -56,6 +57,11 @@ name = "agent b canister" desc = "Oxygen Agent B. You're not quite sure what it does." gas_type = "agent_b" +/obj/machinery/portable_atmospherics/canister/bz + name = "BZ canister" + desc = "BZ, a powerful hallucinogenic nerve agent." + icon_state = "purple" + gas_type = "bz" /obj/machinery/portable_atmospherics/canister/nitrous_oxide name = "n2o canister" desc = "Nitrous oxide gas. Known to cause drowsiness." diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index c1ca56c5ae5..bba79f6b5f7 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -7,7 +7,7 @@ var/volume_rate = 1000 volume = 1000 - var/list/scrubbing = list("plasma", "co2", "n2o", "agent_b") + var/list/scrubbing = list("plasma", "co2", "n2o", "agent_b", "bz") /obj/machinery/portable_atmospherics/scrubber/Destroy() var/turf/T = get_turf(src) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index ea4446dcd21..d5b92844f51 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -172,6 +172,16 @@ M.faction += team M.equipOutfit(ctf_gear) +/obj/machinery/capture_the_flag/proc/TellGhost() + if(ctf_enabled) + notify_ghosts("[name] has been activated!", enter_link="(Click to join the [team] team!) or click on the controller directly!", source = src, attack_not_jump = 0) + +/obj/machinery/capture_the_flag/Topic(href, href_list) + if(href_list["join"]) + var/mob/dead/observer/ghost = usr + if(istype(ghost)) + attack_ghost(ghost) + /obj/machinery/capture_the_flag/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/twohanded/required/ctf)) var/obj/item/weapon/twohanded/required/ctf/flag = I @@ -214,6 +224,12 @@ CTF.ctf_gear = CTF.instagib_gear CTF.respawn_cooldown = INSTAGIB_RESPAWN +/obj/machinery/capture_the_flag/proc/normal_mode() + for(var/obj/machinery/capture_the_flag/CTF in machines) + if(CTF.ctf_enabled == TRUE) + CTF.ctf_gear = initial(ctf_gear) + CTF.respawn_cooldown = DEFAULT_RESPAWN + /obj/item/weapon/gun/projectile/automatic/pistol/deagle/CTF desc = "This looks like it could really hurt in melee." force = 75 diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 7e1e469d3b0..6c45742bb27 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -359,6 +359,11 @@ suit = /obj/item/clothing/suit/space/hardsuit/mining mask = /obj/item/clothing/mask/breath +/obj/effect/mob_spawn/human/miner/explorer + uniform = /obj/item/clothing/under/rank/miner/lavaland + gloves = /obj/item/clothing/gloves/color/black + back = /obj/item/weapon/storage/backpack/security + shoes = /obj/item/clothing/shoes/jackboots /obj/effect/mob_spawn/human/plasmaman mob_species = /datum/species/plasmaman @@ -453,6 +458,17 @@ icon_state = "sleeper" flavour_text = "You are a Nanotrasen Commander!" +/obj/effect/mob_spawn/human/wwii + name = "World War II Reenactor" + uniform = /obj/item/clothing/under/wwii + shoes = /obj/item/clothing/shoes/combat + gloves = /obj/item/clothing/gloves/combat + mask = /obj/item/clothing/mask/gas + helmet = /obj/item/clothing/head/helmet/stahlhelm + back = /obj/item/weapon/storage/backpack/security + has_id = 0 + + /////////////////Spooky Undead////////////////////// /obj/effect/mob_spawn/human/skeleton diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm index b554a8a4547..6f5ba2a4d64 100644 --- a/code/modules/awaymissions/mission_code/Cabin.dm +++ b/code/modules/awaymissions/mission_code/Cabin.dm @@ -73,16 +73,16 @@ /obj/machinery/recycler/lumbermill name = "lumbermill saw" desc = "Faster then the cartoons!" - emagged = 2 //Always grinds people + emagged = 2 //Always gibs people + item_recycle_sound = 'sound/weapons/chainsawhit.ogg' -/obj/machinery/recycler/lumbermill/recycle(obj/item/weapon/grown/log/L, sound = 1) - L.loc = src.loc +/obj/machinery/recycler/lumbermill/recycle_item(obj/item/weapon/grown/log/L) if(!istype(L)) return - if(sound) - playsound(src.loc, 'sound/weapons/chainsawhit.ogg', 100, 1) - new L.plank_type(src.loc, 1 + round(L.seed.potency / 25)) - qdel(L) + else + var/potency = L.seed.potency + ..() + new L.plank_type(src.loc, 1 + round(potency / 25)) /mob/living/simple_animal/chicken/rabbit/normal icon_state = "b_rabbit" @@ -130,4 +130,4 @@ spawnableAtoms = list(/obj/structure/flora/rock/icy = 5, /obj/structure/flora/rock/pile/icy = 5) /obj/effect/landmark/mapGenerator/snowy - mapGeneratorType = /datum/mapGenerator/snowy \ No newline at end of file + mapGeneratorType = /datum/mapGenerator/snowy diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index 79c29d2b705..e213e8e3e3c 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -151,8 +151,7 @@ var/sc_safecode5 = "[rand(0,9)]" l_set = 1 new /obj/item/weapon/gun/energy/mindflayer(src) new /obj/item/device/soulstone(src) - new /obj/item/clothing/head/helmet/space/cult(src) - new /obj/item/clothing/suit/space/cult(src) + new /obj/item/clothing/suit/space/hardsuit/cult(src) //new /obj/item/weapon/teleportation_scroll(src) new /obj/item/weapon/ore/diamond(src) diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm index 4a3e5bdfec0..968f230be28 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -5,6 +5,9 @@ circuit = /obj/item/weapon/circuitboard/computer/cargo var/requestonly = FALSE var/contraband = FALSE + var/safety_warning = "For safety reasons the automated supply shuttle \ + cannot transport live organisms, classified nuclear weaponry or \ + homing beacons." /obj/machinery/computer/cargo/request name = "supply request console" @@ -94,7 +97,7 @@ switch(action) if("send") if(SSshuttle.supply.canMove()) - say("For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.") + say(safety_warning) return if(SSshuttle.supply.getDockedId() == "supply_home") SSshuttle.supply.emagged = emagged @@ -110,6 +113,9 @@ if("loan") if(!SSshuttle.shuttle_loan) return + if(SSshuttle.supply.canMove()) + say(safety_warning) + return else if(SSshuttle.supply.mode == SHUTTLE_IDLE) SSshuttle.shuttle_loan.loan_shuttle() say("The supply shuttle has been loaned to Centcom.") diff --git a/code/modules/cargo/exports.dm b/code/modules/cargo/exports.dm index bd7c588c973..59f8362a98a 100644 --- a/code/modules/cargo/exports.dm +++ b/code/modules/cargo/exports.dm @@ -70,8 +70,12 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they // Adds item's cost and amount to the current export cycle. // get_cost, get_amount and applies_to do not neccesary mean a successful sale. /datum/export/proc/sell_object(obj/O, contr = 0, emag = 0) - total_cost += get_cost(O) - total_amount += get_amount(O) + var/cost = get_cost(O) + var/amount = get_amount(O) + total_cost += cost + total_amount += amount + feedback_add_details("export_sold_amount","[O.type]|[amount]") + feedback_add_details("export_sold_cost","[O.type]|[cost]") // Total printout for the cargo console. // Called before the end of current export cycle. @@ -99,4 +103,4 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they // The current export cycle is over now. Reset all the export temporary vars. /datum/export/proc/export_end() total_cost = 0 - total_amount = 0 \ No newline at end of file + total_amount = 0 diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index ef657aedc10..69cedb462e2 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -559,6 +559,12 @@ contains = list(/obj/machinery/the_singularitygen) crate_name = "singularity generator crate" +/datum/supply_pack/engineering/engine/tesla_gen + name = "Tesla Generator Crate" + cost = 5000 + contains = list(/obj/machinery/the_singularitygen/tesla) + crate_name = "tesla generator crate" + /datum/supply_pack/engineering/engine/collector name = "Collector Crate" cost = 2500 @@ -829,6 +835,14 @@ /obj/item/pizzabox/vegetable) crate_name = "pizza crate" +/datum/supply_pack/organic/cream_piee + name = "High-yield Clown-grade Cream Pie Crate" + cost = 6000 + contains = list(/obj/item/weapon/storage/backpack/dufflebag/clown/cream_pie) + crate_name = "party equipment crate" + contraband = TRUE + access = access_theatre + /datum/supply_pack/organic/monkey name = "Monkey Crate" cost = 2000 @@ -1198,7 +1212,9 @@ /obj/item/weapon/folder/red, /obj/item/weapon/folder/yellow, /obj/item/weapon/clipboard, - /obj/item/weapon/clipboard) + /obj/item/weapon/clipboard, + /obj/item/weapon/stamp, + /obj/item/weapon/stamp/denied) crate_name = "bureaucracy crate" /datum/supply_pack/misc/toner @@ -1346,9 +1362,10 @@ contains = list(/obj/item/toy/spinningtoy, /obj/item/toy/sword, /obj/item/toy/foamblade, - /obj/item/toy/AI, + /obj/item/toy/talking/AI, /obj/item/toy/talking/owl, /obj/item/toy/talking/griffin, + /obj/item/toy/talking/skeleton, /obj/item/toy/nuke, /obj/item/toy/minimeteor, /obj/item/toy/carpplushie, diff --git a/code/modules/chatter/chatter.dm b/code/modules/chatter/chatter.dm new file mode 100644 index 00000000000..4d1048e3ca9 --- /dev/null +++ b/code/modules/chatter/chatter.dm @@ -0,0 +1,56 @@ +/proc/chatter(message, phomeme, atom/A) + // We want to transform any message into a list of numbers + // and punctuation marks + // For example: + // "Hi." -> [2, '.'] + // "HALP GEROGE MELLONS, that swine, is GRIFFIN ME!" + // -> [4, 6, 7, ',', 4, 5, ',', '2', 7, 2, '!'] + // "fuck,thissentenceissquashed" -> [4, ',', 21] + + var/list/punctuation = list(",",":",";",".","?","!","\'","-") + var/regex/R = regex("(\[\\l\\d]*)(\[^\\l\\d\\s])?", "g") + var/list/letter_count = list() + while(R.Find(message) != 0) + if(R.group[1]) + letter_count += length(R.group[1]) + if(R.group[2]) + letter_count += R.group[2] + + spawn(0) + for(var/item in letter_count) + if (item in punctuation) + // simulate pausing in talking + // ignore semi-colons because of their use in HTML escaping + if (item in list(",", ":")) + sleep(3) + if (item in list("!", "?", ".")) + sleep(6) + continue + + if(isnum(item)) + var/length = min(item, 10) + if (length == 0) + // "verbalise" long spaces + sleep(1) + chatter_speak_word(A.loc, phomeme, length) + +/proc/chatter_speak_word(loc, phomeme, length) + var/path = "sound/chatter/[phomeme]_[length].ogg" + + playsound(loc, path, + vol = 40, vary = 0, extrarange = 3, falloff = FALSE, surround = 1) + + sleep((length + 1) * chatter_get_sleep_multiplier(phomeme)) + +/proc/chatter_get_sleep_multiplier(phomeme) + // These values are tenths of seconds, so 0.5 == 0.05seconds + . = 1 + switch(phomeme) + if("papyrus") + . = 0.5 + if("griffin") + . = 0.5 + if("sans") + . = 0.7 + if("owl") + . = 0.7 diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 5ead2090726..57854738378 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -62,7 +62,6 @@ var/list/preferences_datums = list() var/list/features = list("mcolor" = "FFF", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", "horns" = "None", "ears" = "None", "wings" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None") var/list/custom_names = list("clown", "mime", "ai", "cyborg", "religion", "deity") - var/adminmusicvolume = 50 //Mob preview var/icon/preview_icon = null diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index b988dd25e1e..33ff7efcaed 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -2,7 +2,7 @@ #define SAVEFILE_VERSION_MIN 8 //This is the current version, anything below this will attempt to update (if it's not obsolete) -#define SAVEFILE_VERSION_MAX 14 +#define SAVEFILE_VERSION_MAX 15 /* SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn This proc checks if the current directory of the savefile S needs updating @@ -101,6 +101,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car toggles = TOGGLES_DEFAULT if(current_version < 12) ignoring = list() + if(current_version < 15) + toggles |= SOUND_ANNOUNCEMENTS //should this proc get fairly long (say 3 versions long), //just increase SAVEFILE_VERSION_MIN so it's not as far behind @@ -223,7 +225,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["preferred_map"] >> preferred_map S["ignoring"] >> ignoring S["ghost_hud"] >> ghost_hud - S["adminmusicvolume"] >> adminmusicvolume S["inquisitive_ghost"] >> inquisitive_ghost //try to fix any outdated data if necessary @@ -275,7 +276,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["preferred_map"] << preferred_map S["ignoring"] << ignoring S["ghost_hud"] << ghost_hud - S["adminmusicvolume"] << adminmusicvolume S["inquisitive_ghost"] << inquisitive_ghost return 1 diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 8e8e856b4ae..bf3071d1dda 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -330,15 +330,6 @@ var/global/list/ghost_orbits = list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS set category = "Preferences" set desc = ".Toggles hearing Central Command, Captain, VOX, and other announcement sounds" prefs.toggles ^= SOUND_ANNOUNCEMENTS - src << "You will now [(prefs.toggles & SOUND_ANNOUNCEMENTS) ? "no longer hear announcements" : "hear announcement sounds"]." - prefs.save_preferences() - feedback_add_details("admin_verb","TAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - -/client/verb/set_admin_volume() - set name = "Set Admin Music Volume" - set category = "Preferences" - set desc = "Set the volume you hear admin music at." - var/musinput = input("Range of 0 to 100.","Admin Music Volume", prefs.adminmusicvolume) as num - prefs.adminmusicvolume = max(0,min(musinput,100)) + src << "You will now [(prefs.toggles & SOUND_ANNOUNCEMENTS) ? "hear announcement sounds" : "no longer hear announcements"]." prefs.save_preferences() + feedback_add_details("admin_verb","TAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! \ No newline at end of file diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 2f678e92241..a3856b0ee1c 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -25,7 +25,8 @@ /obj/item/clothing/Destroy() - dropped() + if(isliving(loc)) + dropped(loc) user_vars_remembered = null //Oh god somebody put REFERENCES in here? not to worry, we'll clean it up return ..() @@ -340,7 +341,6 @@ BLIND // can't see anything var/can_adjust = 1 var/adjusted = 0 var/alt_covers_chest = 0 // for adjusted/rolled-down jumpsuits, 0 = exposes chest and arms, 1 = exposes arms only - var/suit_color = null var/obj/item/clothing/tie/hastie = null /obj/item/clothing/under/worn_overlays(var/isinhands = FALSE) @@ -362,7 +362,6 @@ BLIND // can't see anything //make the sensor mode favor higher levels, except coords. sensor_mode = pick(0, 1, 1, 2, 2, 2, 3, 3) adjusted = 0 - suit_color = item_color ..() /obj/item/clothing/under/attackby(obj/item/I, mob/user, params) @@ -481,25 +480,25 @@ BLIND // can't see anything if(!can_adjust) usr << "You cannot wear this suit any differently!" return - if(src.adjusted == 1) - src.fitted = initial(fitted) - src.item_color = initial(item_color) - src.item_color = src.suit_color //colored jumpsuits are shit and break without this - src.body_parts_covered = CHEST|GROIN|LEGS|ARMS - usr << "You adjust the suit back to normal." - src.adjusted = 0 - else - if(src.fitted != FEMALE_UNIFORM_TOP) - src.fitted = NO_FEMALE_UNIFORM - src.item_color += "_d" - if (alt_covers_chest) // for the special snowflake suits that don't expose the chest when adjusted - src.body_parts_covered = CHEST|GROIN|LEGS - else - src.body_parts_covered = GROIN|LEGS + if(toggle_jumpsuit_adjust()) usr << "You adjust the suit to wear it more casually." - src.adjusted = 1 + else + usr << "You adjust the suit back to normal." usr.update_inv_w_uniform() - ..() + +/obj/item/clothing/under/proc/toggle_jumpsuit_adjust() + adjusted = !adjusted + if(adjusted) + if(fitted != FEMALE_UNIFORM_TOP) + fitted = NO_FEMALE_UNIFORM + if (alt_covers_chest) // for the special snowflake suits that don't expose the chest when adjusted + body_parts_covered = CHEST|GROIN|LEGS + else + body_parts_covered = GROIN|LEGS + else + fitted = initial(fitted) + body_parts_covered = CHEST|GROIN|LEGS|ARMS + return adjusted /obj/item/clothing/under/examine(mob/user) ..() diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 0de25cc3366..6aa577594d7 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -206,7 +206,7 @@ /obj/item/clothing/head/helmet/skull name = "skull helmet" desc = "An intimidating tribal helmet, it doesn't look very comfortable." - flags_inv = HIDEEARS|HIDEHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES armor = list(melee = 25, bullet = 25, laser = 25, energy = 10, bomb = 10, bio = 5, rad = 20) icon_state = "skull" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index e96dd88e631..24a18a98808 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -261,3 +261,36 @@ desc = "A paper sack with crude holes cut out for eyes and a sketchy smile drawn on the front. Not creepy at all." icon_state = "papersack_smile" flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS + +/* +-!WARNING!- +-POTENTIAL TRIGGER-INDUCING ITEMS AHEAD- +-TREAD WITH CAUTION- +*/ + +/obj/item/clothing/head/helmet/stahlhelm + name = "stahlhelm" + desc = "A hard military helmet, seems dusty." + icon_state = "stalhelm" + item_state = "stalhelm" + armor = list(melee = 15, bullet = 10, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + strip_delay = 30 + +/obj/item/clothing/head/helmet/panzer + name = "Panzer Cap" + desc = "A fancy-looking military cap." + icon_state = "panzercap" + item_state = "panzercap" + +/obj/item/clothing/head/helmet/naziofficer + name = "Officer Cap" + desc = "A cap fit for a commanding officer." + icon_state = "officercap" + item_state = "officercap" + armor = list(melee = 20, bullet = 15, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + strip_delay = 60 + +/* +-YOU HAVE SAFETLY PASSED THE POTENTIALLY-TRIGGERING CONTENT- +-PLEASE RESUME NORMAL, POLITICALLY CORRECT ACTIVITY- +*/ \ No newline at end of file diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 154cf6a5d71..dd1875aaead 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -48,6 +48,7 @@ icon_state = "hardhat0_cakehat" item_state = "hardhat0_cakehat" item_color = "cakehat" + hitsound = 'sound/weapons/tap.ogg' flags_inv = HIDEEARS|HIDEHAIR armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) brightness_on = 2 //luminosity when on @@ -69,6 +70,7 @@ force = 15 throwforce = 15 damtype = BURN + hitsound = 'sound/items/Welder.ogg' SSobj.processing |= src /obj/item/clothing/head/hardhat/cakehat/turn_off() @@ -76,6 +78,7 @@ force = 0 throwforce = 0 damtype = BRUTE + hitsound = 'sound/weapons/tap.ogg' SSobj.processing -= src /obj/item/clothing/head/hardhat/cakehat/is_hot() diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index 040ef0bab42..819d8ac9975 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -23,7 +23,7 @@ actions_types = list(/datum/action/item_action/halt) icon_state = "swat" aggressiveness = 3 - flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS + flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS|HIDEHAIR visor_flags_inv = 0 /obj/item/clothing/mask/gas/sechailer/cyborg diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index 1cce1cd3374..e4019814bce 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -11,8 +11,8 @@ heat_protection = FEET max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT - redcoat - item_color = "redcoat" //Exists for washing machines. Is not different from black shoes in any way. +/obj/item/clothing/shoes/sneakers/black/redcoat + item_color = "redcoat" //Exists for washing machines. Is not different from black shoes in any way. /obj/item/clothing/shoes/sneakers/brown name = "brown shoes" @@ -20,18 +20,23 @@ icon_state = "brown" item_color = "brown" - captain - item_color = "captain" //Exists for washing machines. Is not different from brown shoes in any way. - hop - item_color = "hop" //Exists for washing machines. Is not different from brown shoes in any way. - ce - item_color = "chief" //Exists for washing machines. Is not different from brown shoes in any way. - rd - item_color = "director" //Exists for washing machines. Is not different from brown shoes in any way. - cmo - item_color = "medical" //Exists for washing machines. Is not different from brown shoes in any way. - cmo - item_color = "cargo" //Exists for washing machines. Is not different from brown shoes in any way. +/obj/item/clothing/shoes/sneakers/brown/captain + item_color = "captain" //Exists for washing machines. Is not different from brown shoes in any way. + +/obj/item/clothing/shoes/sneakers/brown/hop + item_color = "hop" //Exists for washing machines. Is not different from brown shoes in any way. + +/obj/item/clothing/shoes/sneakers/brown/ce + item_color = "chief" //Exists for washing machines. Is not different from brown shoes in any way. + +/obj/item/clothing/shoes/sneakers/brown/rd + item_color = "director" //Exists for washing machines. Is not different from brown shoes in any way. + +/obj/item/clothing/shoes/sneakers/brown/cmo + item_color = "medical" //Exists for washing machines. Is not different from brown shoes in any way. + +/obj/item/clothing/shoes/sneakers/brown/qm + item_color = "cargo" //Exists for washing machines. Is not different from brown shoes in any way. /obj/item/clothing/shoes/sneakers/blue name = "blue shoes" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index fb0339fa62d..9a39b5e07aa 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -115,6 +115,12 @@ put_on_delay = 40 can_hold_items = 1 +/obj/item/clothing/shoes/workboots/mining + name = "mining boots" + desc = "Steel-toed mining boots for mining in hazardous environments. Very good at keeping toes uncrushed." + icon_state = "explorer" + burn_state = FIRE_PROOF + /obj/item/clothing/shoes/cult name = "nar-sian invoker boots" desc = "A pair of boots worn by the followers of Nar-Sie." diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 2d80c678690..228ba63a9c7 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -105,7 +105,7 @@ item_state = "bonearmor" blood_overlay_type = "armor" armor = list(melee = 35, bullet = 25, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0) - body_parts_covered = CHEST + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS /obj/item/clothing/suit/armor/bulletproof name = "bulletproof armor" diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 799b78c276f..16d994bde9c 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -8,7 +8,6 @@ icon_state = initial(C.icon_state) item_state = initial(C.item_state) item_color = initial(C.item_color) - suit_color = initial(C.item_color) /obj/item/clothing/under/color/black name = "black jumpsuit" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 2e360b3f31c..6b6bad92bec 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -175,8 +175,9 @@ /obj/item/clothing/under/rank/miner/lavaland - desc = "A black jumpsuit for operating in hazardous environments." + desc = "A green uniform for operating in hazardous environments." name = "shaft miner's jumpsuit" - icon_state = "syndicate" - item_state = "bl_suit" - item_color = "syndicate" + icon_state = "explorer" + item_state = "explorer" + item_color = "explorer" + can_adjust = 0 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index da4ce9a3e0c..a63fd72439e 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -574,3 +574,32 @@ item_state = "hostanclothes" item_color = "hostanclothes" +/* +-!WARNING!- +-POTENTIAL TRIGGER-INDUCING ITEMS AHEAD- +-TREAD WITH CAUTION- +*/ + +/obj/item/clothing/under/wwii + name = "dusty uniform" + desc = "A dusty old uniform, a relic from a time before." + icon_state = "soldieruniform" + item_state = "soldieruniform" + item_color = "soldieruniform" + armor = list(melee = 10, bullet = 5, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + strip_delay = 50 + + +/obj/item/clothing/under/wwii/officer + name = "dusty uniform" + desc = "A dusty old uniform, a relic from a time before. This one looks more official." + icon_state = "officeruniform" + item_state = "officeruniform" + item_color = "officeruniform" + armor = list(melee = 15, bullet = 10, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + strip_delay = 60 + +/* +-YOU HAVE SAFETLY PASSED THE POTENTIALLY-TRIGGERING CONTENT- +-PLEASE RESUME NORMAL, POLITICALLY CORRECT ACTIVITY- +*/ diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm new file mode 100644 index 00000000000..63b3290aa06 --- /dev/null +++ b/code/modules/crafting/craft.dm @@ -0,0 +1,350 @@ +/datum/personal_crafting + var/busy + var/viewing_category = 1 //typical powergamer starting on the Weapons tab + var/list/categories = list(CAT_WEAPON,CAT_AMMO,CAT_ROBOT,CAT_FOOD,CAT_MISC,CAT_PRIMAL) + var/datum/action/innate/crafting/button + + + + + +/* This is what procs do: + get_environment - gets a list of things accessable for crafting by user + get_surroundings - takes a list of things and makes a list of key-types to values-amounts of said type in the list + check_contents - takes a recipe and a key-type list and checks if said recipe can be done with available stuff + check_tools - takes recipe, a key-type list, and a user and checks if there are enough tools to do the stuff, checks bugs one level deep + construct_item - takes a recipe and a user, call all the checking procs, calls do_after, checks all the things again, calls del_reqs, creates result, calls CheckParts of said result with argument being list returned by deel_reqs + del_reqs - takes recipe and a user, loops over the recipes reqs var and tries to find everything in the list make by get_environment and delete it/add to parts list, then returns the said list +*/ + + + + +/datum/personal_crafting/proc/check_contents(datum/crafting_recipe/R, list/contents) + main_loop: + for(var/A in R.reqs) + var/needed_amount = R.reqs[A] + for(var/B in contents) + if(ispath(B, A)) + if(contents[B] >= R.reqs[A]) + continue main_loop + else + needed_amount -= contents[B] + if(needed_amount <= 0) + continue main_loop + else + continue + return 0 + for(var/A in R.chem_catalysts) + if(contents[A] < R.chem_catalysts[A]) + return 0 + return 1 + +/datum/personal_crafting/proc/get_environment(mob/user) + . = list() + . += user.r_hand + . += user.l_hand + if(!istype(user.loc, /turf)) + return + var/list/L = block(get_step(user, SOUTHWEST), get_step(user, NORTHEAST)) + for(var/A in L) + var/turf/T = A + if(T.Adjacent(user)) + for(var/B in T) + var/atom/movable/AM = B + if(AM.flags & HOLOGRAM) + continue + . += AM + +/datum/personal_crafting/proc/get_surroundings(mob/user) + . = list() + for(var/obj/item/I in get_environment(user)) + if(I.flags & HOLOGRAM) + continue + if(istype(I, /obj/item/stack)) + var/obj/item/stack/S = I + .[I.type] += S.amount + else + if(istype(I, /obj/item/weapon/reagent_containers)) + var/obj/item/weapon/reagent_containers/RC = I + if(RC.flags & OPENCONTAINER) + for(var/datum/reagent/A in RC.reagents.reagent_list) + .[A.type] += A.volume + .[I.type] += 1 + +/datum/personal_crafting/proc/check_tools(mob/user, datum/crafting_recipe/R, list/contents) + if(!R.tools.len) + return 1 + var/list/possible_tools = list() + for(var/obj/item/I in user.contents) + if(istype(I, /obj/item/weapon/storage)) + for(var/obj/item/SI in I.contents) + possible_tools += SI.type + possible_tools += I.type + possible_tools += contents + + main_loop: + for(var/A in R.tools) + for(var/I in possible_tools) + if(ispath(I,A)) + continue main_loop + return 0 + return 1 + +/datum/personal_crafting/proc/construct_item(mob/user, datum/crafting_recipe/R) + for(var/A in R.parts) + var/list/contents = get_surroundings(user) + var/send_feedback = 1 + if(check_contents(R, contents)) + if(check_tools(user, R, contents)) + if(do_after(user, R.time, target = user)) + contents = get_surroundings(user) + if(!check_contents(R, contents)) + return ", missing component." + if(!check_tools(user, R, contents)) + return ", missing tool." + var/list/parts = del_reqs(R, user) + var/atom/movable/I = new R.result (get_turf(user.loc)) + I.CheckParts(parts, R) + if(send_feedback) + feedback_add_details("object_crafted","[I.type]") + return 0 + return "." + return ", missing tool." + return ", missing component." + + +/*Del reqs works like this: + + Loop over reqs var of the recipe + Set var amt to the value current cycle req is pointing to, its amount of type we need to delete + Get var/surroundings list of things accessable to crafting by get_environment() + Check the type of the current cycle req + If its reagent then do a while loop, inside it try to locate() reagent containers, inside such containers try to locate needed reagent, if there isnt remove thing from surroundings + If there is enough reagent in the search result then delete the needed amount, create the same type of reagent with the same data var and put it into deletion list + If there isnt enough take all of that reagent from the container, put into deletion list, substract the amt var by the volume of reagent, remove the container from surroundings list and keep searching + While doing above stuff check deletion list if it already has such reagnet, if yes merge instead of adding second one + If its stack check if it has enough amount + If yes create new stack with the needed amount and put in into deletion list, substract taken amount from the stack + If no put all of the stack in the deletion list, substract its amount from amt and keep searching + While doing above stuff check deletion list if it already has such stack type, if yes try to merge them instead of adding new one + If its anything else just locate() in in the list in a while loop, each find --s the amt var and puts the found stuff in deletion loop + + Then do a loop over parts var of the recipe + Do similar stuff to what we have done above, but now in deletion list, until the parts conditions are satisfied keep taking from the deletion list and putting it into parts list for return + + After its done loop over deletion list and delete all the shit that wasnt taken by parts loop + + del_reqs return the list of parts resulting object will recieve as argument of CheckParts proc, on the atom level it will add them all to the contents, on all other levels it calls ..() and does whatever is needed afterwards but from contents list already +*/ + +/datum/personal_crafting/proc/del_reqs(datum/crafting_recipe/R, mob/user) + var/list/surroundings + var/list/Deletion = list() + . = list() + var/data + var/amt + main_loop: + for(var/A in R.reqs) + amt = R.reqs[A] + surroundings = get_environment(user) + surroundings -= Deletion + if(ispath(A, /datum/reagent)) + var/datum/reagent/RG = new A + var/datum/reagent/RGNT + while(amt > 0) + var/obj/item/weapon/reagent_containers/RC = locate() in surroundings + RG = RC.reagents.get_reagent(A) + if(RG) + if(!locate(RG.type) in Deletion) + Deletion += new RG.type() + if(RG.volume > amt) + RG.volume -= amt + data = RG.data + RC.reagents.conditional_update(RC) + RG = locate(RG.type) in Deletion + RG.volume = amt + RG.data += data + continue main_loop + else + surroundings -= RC + amt -= RG.volume + RC.reagents.reagent_list -= RG + RC.reagents.conditional_update(RC) + RGNT = locate(RG.type) in Deletion + RGNT.volume += RG.volume + RGNT.data += RG.data + qdel(RG) + else + surroundings -= RC + else if(ispath(A, /obj/item/stack)) + var/obj/item/stack/S + var/obj/item/stack/SD + while(amt > 0) + S = locate(A) in surroundings + if(S.amount >= amt) + if(!locate(S.type) in Deletion) + SD = new S.type() + Deletion += SD + S.use(amt) + SD = locate(S.type) in Deletion + SD.amount += amt + continue main_loop + else + amt -= S.amount + if(!locate(S.type) in Deletion) + Deletion += S + else + data = S.amount + S = locate(S.type) in Deletion + S.add(data) + surroundings -= S + else + var/atom/movable/I + while(amt > 0) + I = locate(A) in surroundings + Deletion += I + surroundings -= I + amt-- + var/list/partlist = list(R.parts.len) + for(var/M in R.parts) + partlist[M] = R.parts[M] + for(var/A in R.parts) + if(istype(A, /datum/reagent)) + var/datum/reagent/RG = locate(A) in Deletion + if(RG.volume > partlist[A]) + RG.volume = partlist[A] + . += RG + Deletion -= RG + continue + else if(istype(A, /obj/item/stack)) + var/obj/item/stack/ST = locate(A) in Deletion + if(ST.amount > partlist[A]) + ST.amount = partlist[A] + . += ST + Deletion -= ST + continue + else + while(partlist[A] > 0) + var/atom/movable/AM = locate(A) in Deletion + . += AM + Deletion -= AM + partlist[A] -= 1 + while(Deletion.len) + var/DL = Deletion[Deletion.len] + Deletion.Cut(Deletion.len) + qdel(DL) + +/datum/personal_crafting/proc/craft(mob/user) + if(user.incapacitated() || user.lying || istype(user.loc, /obj/mecha)) + return + var/list/surroundings = get_surroundings(user) + var/dat = "
Crafting menu
" + if(busy) + dat += ""
+ dat += "Crafting in progress...
"
+ else
+ dat += "<--"
+ dat += " [categories[prev_cat()]] |"
+ dat += " [categories[viewing_category]] "
+ dat += "| [categories[next_cat()]] "
+ dat += "-->" + + dat += "
"
+
+ //Filter the recipes we can craft to the top
+ var/list/can_craft = list()
+ var/list/cant_craft = list()
+ for(var/datum/crafting_recipe/R in crafting_recipes)
+ if(R.category != categories[viewing_category])
+ continue
+ if(check_contents(R, surroundings))
+ can_craft += R
+ else
+ cant_craft += R
+
+ for(var/datum/crafting_recipe/R in can_craft)
+ dat += build_recipe_text(R, surroundings)
+ for(var/datum/crafting_recipe/R in cant_craft)
+ dat += build_recipe_text(R, surroundings)
+
+
+ dat += "
"
+
+ var/datum/browser/popup = new(user, "crafting", "Crafting", 500, 500)
+ popup.set_content(dat)
+ popup.open()
+ return
+
+/datum/personal_crafting/Topic(href, href_list)
+ if(usr.stat || usr.lying)
+ return
+ if(href_list["make"])
+ var/datum/crafting_recipe/TR = locate(href_list["make"])
+ busy = 1
+ craft(usr)
+ var/fail_msg = construct_item(usr, TR)
+ if(!fail_msg)
+ usr << "[TR.name] constructed."
+ else
+ usr << "Construction failed[fail_msg]"
+ busy = 0
+ craft(usr)
+ if(href_list["forwardCat"])
+ viewing_category = next_cat()
+ usr << "Category is now [categories[viewing_category]]."
+ craft(usr)
+ if(href_list["backwardCat"])
+ viewing_category = prev_cat()
+ usr << "Category is now [categories[viewing_category]]."
+ craft(usr)
+
+//Next works nicely with modular arithmetic
+/datum/personal_crafting/proc/next_cat()
+ . = viewing_category % categories.len + 1
+
+//Previous can go fuck itself
+/datum/personal_crafting/proc/prev_cat()
+ if(viewing_category == categories.len)
+ . = viewing_category-1
+ else
+ . = viewing_category % categories.len - 1
+ if(. <= 0)
+ . = categories.len
+
+/datum/personal_crafting/proc/build_recipe_text(datum/crafting_recipe/R, list/contents)
+ . = ""
+ var/name_text = ""
+ var/req_text = ""
+ var/tool_text = ""
+ var/catalist_text = ""
+ if(check_contents(R, contents))
+ name_text ="[R.name]"
+
+ else
+ name_text = "[R.name]"
+
+ if(name_text)
+ for(var/A in R.reqs)
+ if(ispath(A, /obj))
+ var/obj/O = A
+ req_text += " [R.reqs[A]] [initial(O.name)]"
+ else if(ispath(A, /datum/reagent))
+ var/datum/reagent/RE = A
+ req_text += " [R.reqs[A]] [initial(RE.name)]"
+
+ if(R.chem_catalysts.len)
+ catalist_text += ", Catalysts:"
+ for(var/C in R.chem_catalysts)
+ if(ispath(C, /datum/reagent))
+ var/datum/reagent/RE = C
+ catalist_text += " [R.chem_catalysts[C]] [initial(RE.name)]"
+
+ if(R.tools.len)
+ tool_text += ", Tools:"
+ for(var/O in R.tools)
+ if(ispath(O, /obj))
+ var/obj/T = O
+ tool_text += " [R.tools[O]] [initial(T.name)]"
+
+ . = "[name_text][req_text][tool_text][catalist_text]" \ No newline at end of file diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm index 0af951395f8..eba8c301972 100644 --- a/code/modules/crafting/guncrafting.dm +++ b/code/modules/crafting/guncrafting.dm @@ -1,5 +1,4 @@ -// This file is for projectile weapon crafting. All parts and construction paths will be contained here. -// The weapons themselves are children of other weapons and should be contained in their respective files. +//Gun crafting parts til they can be moved elsewhere // PARTS // @@ -14,70 +13,3 @@ desc = "A classic rifle stock that doubles as a grip, roughly carved out of wood." icon = 'icons/obj/improvised.dmi' icon_state = "riflestock" - - -// CRAFTING // - -/obj/item/weaponcrafting/reciever/attackby(obj/item/W, mob/user, params) - if(istype(W,/obj/item/pipe)) - user << "You attach the shotgun barrel to the receiver. The pins seem loose." - var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction - user.unEquip(src) - user.put_in_hands(I) - qdel(W) - qdel(src) - return - -// SHOTGUN // - -/obj/item/weaponcrafting/ishotgunconstruction - name = "slightly conspicuous metal construction" - desc = "A long pipe attached to a firearm receiver. The pins seem loose." - icon = 'icons/obj/improvised.dmi' - icon_state = "ishotgunstep1" - -/obj/item/weaponcrafting/ishotgunconstruction/attackby(obj/item/I, mob/user, params) - ..() - if(istype(I, /obj/item/weapon/screwdriver)) - var/obj/item/weaponcrafting/ishotgunconstruction2/C = new /obj/item/weaponcrafting/ishotgunconstruction2 - user.unEquip(src) - user.put_in_hands(C) - user << "You screw the pins into place, securing the pipe to the receiver." - qdel(src) - -/obj/item/weaponcrafting/ishotgunconstruction2 - name = "very conspicuous metal construction" - desc = "A long pipe attached to a trigger assembly." - icon = 'icons/obj/improvised.dmi' - icon_state = "ishotgunstep1" - -/obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W, mob/user, params) - if(istype(W,/obj/item/weaponcrafting/stock)) - user << "You attach the stock to the receiver-barrel assembly." - var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3 - user.unEquip(src) - user.put_in_hands(I) - qdel(W) - qdel(src) - return - -/obj/item/weaponcrafting/ishotgunconstruction3 - name = "extremely conspicuous metal construction" - desc = "A receiver-barrel shotgun assembly with a loose wooden stock. There's no way you can fire it without the stock coming loose." - icon = 'icons/obj/improvised.dmi' - icon_state = "ishotgunstep2" - -/obj/item/weaponcrafting/ishotgunconstruction3/attackby(obj/item/I, mob/user, params) - ..() - if(istype(I, /obj/item/stack/packageWrap)) - var/obj/item/stack/packageWrap/C = I - if (C.use(5)) - var/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/W = new /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised - user.unEquip(src) - user.put_in_hands(W) - user << "You tie the wrapping paper around the stock and the barrel to secure it." - qdel(src) - else - user << "You need at least five feet of wrapping paper to secure the stock!" - return - diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 2c68ecb4ff9..77cce99d702 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -1,5 +1,5 @@ -/datum/table_recipe +/datum/crafting_recipe var/name = "" //in-game display name var/reqs[] = list() //type paths of items consumed associated with how many are needed var/result //type path of item resulting from this craft @@ -10,7 +10,7 @@ var/category = CAT_NONE //where it shows up in the crafting UI -/datum/table_recipe/pin_removal +/datum/crafting_recipe/pin_removal name = "Pin Removal" result = /obj/item/weapon/gun reqs = list(/obj/item/weapon/gun = 1) @@ -19,7 +19,7 @@ time = 50 category = CAT_WEAPON -/datum/table_recipe/IED +/datum/crafting_recipe/IED name = "IED" result = /obj/item/weapon/grenade/iedcasing reqs = list(/datum/reagent/fuel = 50, @@ -30,8 +30,8 @@ time = 15 category = CAT_WEAPON -/datum/table_recipe/lance - name = "explosive lance" +/datum/crafting_recipe/lance + name = "explosive lance (grenade)" result = /obj/item/weapon/twohanded/spear reqs = list(/obj/item/weapon/twohanded/spear = 1, /obj/item/weapon/grenade = 1) @@ -39,8 +39,7 @@ time = 15 category = CAT_WEAPON - -/datum/table_recipe/molotov +/datum/crafting_recipe/molotov name = "Molotov" result = /obj/item/weapon/reagent_containers/food/drinks/bottle/molotov reqs = list(/obj/item/weapon/reagent_containers/glass/rag = 1, @@ -49,7 +48,7 @@ time = 40 category = CAT_WEAPON -/datum/table_recipe/stunprod +/datum/crafting_recipe/stunprod name = "Stunprod" result = /obj/item/weapon/melee/baton/cattleprod reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1, @@ -58,7 +57,7 @@ time = 40 category = CAT_WEAPON -/datum/table_recipe/teleprod +/datum/crafting_recipe/teleprod name = "Teleprod" result = /obj/item/weapon/melee/baton/cattleprod/teleprod reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1, @@ -68,7 +67,7 @@ time = 40 category = CAT_WEAPON -/datum/table_recipe/bola +/datum/crafting_recipe/bola name = "Bola" result = /obj/item/weapon/restraints/legcuffs/bola reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1, @@ -76,7 +75,7 @@ time = 20//15 faster than crafting them by hand! category= CAT_WEAPON -/datum/table_recipe/tailclub +/datum/crafting_recipe/tailclub name = "Tail Club" result = /obj/item/weapon/tailclub reqs = list(/obj/item/severedtail = 1, @@ -84,7 +83,7 @@ time = 40 category = CAT_WEAPON -/datum/table_recipe/tailwhip +/datum/crafting_recipe/tailwhip name = "Liz O' Nine Tails" result = /obj/item/weapon/melee/chainofcommand/tailwhip reqs = list(/obj/item/severedtail = 1, @@ -92,7 +91,7 @@ time = 40 category = CAT_WEAPON -/datum/table_recipe/ed209 +/datum/crafting_recipe/ed209 name = "ED209" result = /mob/living/simple_animal/bot/ed209 reqs = list(/obj/item/robot_parts/robot_suit = 1, @@ -110,7 +109,7 @@ time = 60 category = CAT_ROBOT -/datum/table_recipe/secbot +/datum/crafting_recipe/secbot name = "Secbot" result = /mob/living/simple_animal/bot/secbot reqs = list(/obj/item/device/assembly/signaler = 1, @@ -122,7 +121,7 @@ time = 60 category = CAT_ROBOT -/datum/table_recipe/cleanbot +/datum/crafting_recipe/cleanbot name = "Cleanbot" result = /mob/living/simple_animal/bot/cleanbot reqs = list(/obj/item/weapon/reagent_containers/glass/bucket = 1, @@ -131,7 +130,7 @@ time = 40 category = CAT_ROBOT -/datum/table_recipe/floorbot +/datum/crafting_recipe/floorbot name = "Floorbot" result = /mob/living/simple_animal/bot/floorbot reqs = list(/obj/item/weapon/storage/toolbox/mechanical = 1, @@ -141,7 +140,7 @@ time = 40 category = CAT_ROBOT -/datum/table_recipe/medbot +/datum/crafting_recipe/medbot name = "Medbot" result = /mob/living/simple_animal/bot/medbot reqs = list(/obj/item/device/healthanalyzer = 1, @@ -151,7 +150,7 @@ time = 40 category = CAT_ROBOT -/datum/table_recipe/flamethrower +/datum/crafting_recipe/flamethrower name = "Flamethrower" result = /obj/item/weapon/flamethrower reqs = list(/obj/item/weapon/weldingtool = 1, @@ -163,7 +162,7 @@ time = 10 category = CAT_WEAPON -/datum/table_recipe/meteorshot +/datum/crafting_recipe/meteorshot name = "Meteorshot Shell" result = /obj/item/ammo_casing/shotgun/meteorshot reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, @@ -173,7 +172,7 @@ time = 5 category = CAT_AMMO -/datum/table_recipe/pulseslug +/datum/crafting_recipe/pulseslug name = "Pulse Slug Shell" result = /obj/item/ammo_casing/shotgun/pulseslug reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, @@ -183,7 +182,7 @@ time = 5 category = CAT_AMMO -/datum/table_recipe/dragonsbreath +/datum/crafting_recipe/dragonsbreath name = "Dragonsbreath Shell" result = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, @@ -192,7 +191,7 @@ time = 5 category = CAT_AMMO -/datum/table_recipe/frag12 +/datum/crafting_recipe/frag12 name = "FRAG-12 Shell" result = /obj/item/ammo_casing/shotgun/frag12 reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, @@ -203,7 +202,7 @@ time = 5 category = CAT_AMMO -/datum/table_recipe/ionslug +/datum/crafting_recipe/ionslug name = "Ion Scatter Shell" result = /obj/item/ammo_casing/shotgun/ion reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, @@ -213,7 +212,7 @@ time = 5 category = CAT_AMMO -/datum/table_recipe/improvisedslug +/datum/crafting_recipe/improvisedslug name = "Improvised Shotgun Shell" result = /obj/item/ammo_casing/shotgun/improvised reqs = list(/obj/item/weapon/grenade/chem_grenade = 1, @@ -224,7 +223,7 @@ time = 5 category = CAT_AMMO -/datum/table_recipe/improvisedslugoverload +/datum/crafting_recipe/improvisedslugoverload name = "Overload Improvised Shell" result = /obj/item/ammo_casing/shotgun/improvised/overload reqs = list(/obj/item/ammo_casing/shotgun/improvised = 1, @@ -234,7 +233,7 @@ time = 5 category = CAT_AMMO -/datum/table_recipe/laserslug +/datum/crafting_recipe/laserslug name = "Laser Slug Shell" result = /obj/item/ammo_casing/shotgun/laserslug reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, @@ -244,7 +243,7 @@ time = 5 category = CAT_AMMO -/datum/table_recipe/ishotgun +/datum/crafting_recipe/ishotgun name = "Improvised Shotgun" result = /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised reqs = list(/obj/item/weaponcrafting/reciever = 1, @@ -255,7 +254,7 @@ time = 100 category = CAT_WEAPON -/datum/table_recipe/chainsaw +/datum/crafting_recipe/chainsaw name = "Chainsaw" result = /obj/item/weapon/twohanded/required/chainsaw reqs = list(/obj/item/weapon/circular_saw = 1, @@ -265,7 +264,7 @@ time = 50 category = CAT_WEAPON -/datum/table_recipe/spooky_camera +/datum/crafting_recipe/spooky_camera name = "Camera Obscura" result = /obj/item/device/camera/spooky time = 15 @@ -274,21 +273,21 @@ parts = list(/obj/item/device/camera = 1) category = CAT_MISC -/datum/table_recipe/lizardhat +/datum/crafting_recipe/lizardhat name = "Lizard Cloche Hat" result = /obj/item/clothing/head/lizard time = 10 reqs = list(/obj/item/severedtail = 1) category = CAT_MISC -/datum/table_recipe/lizardhat_alternate +/datum/crafting_recipe/lizardhat_alternate name = "Lizard Cloche Hat" result = /obj/item/clothing/head/lizard time = 10 reqs = list(/obj/item/stack/sheet/animalhide/lizard = 1) category = CAT_MISC -/datum/table_recipe/skateboard +/datum/crafting_recipe/skateboard name = "Skateboard" result = /obj/vehicle/scooter/skateboard time = 60 @@ -296,7 +295,7 @@ /obj/item/stack/rods = 10) category = CAT_MISC -/datum/table_recipe/scooter +/datum/crafting_recipe/scooter name = "Scooter" result = /obj/vehicle/scooter time = 65 @@ -304,14 +303,15 @@ /obj/item/stack/rods = 12) category = CAT_MISC -/datum/table_recipe/papersack +/datum/crafting_recipe/papersack name = "Paper Sack" result = /obj/item/weapon/storage/box/papersack time = 10 reqs = list(/obj/item/weapon/paper = 5) category = CAT_MISC -/datum/table_recipe/chemical_payload + +/datum/crafting_recipe/chemical_payload name = "Chemical Payload (C4)" result = /obj/item/weapon/bombcore/chemical reqs = list( @@ -323,7 +323,7 @@ time = 30 category = CAT_WEAPON -/datum/table_recipe/chemical_payload2 +/datum/crafting_recipe/chemical_payload2 name = "Chemical Payload (gibtonite)" result = /obj/item/weapon/bombcore/chemical reqs = list( @@ -335,14 +335,14 @@ time = 50 category = CAT_WEAPON -/datum/table_recipe/bonearmor +/datum/crafting_recipe/bonearmor name = "Bone Armor" result = /obj/item/clothing/suit/armor/bone time = 30 reqs = list(/obj/item/stack/sheet/bone = 6) category = CAT_PRIMAL -/datum/table_recipe/bonetalisman +/datum/crafting_recipe/bonetalisman name = "Bone Talisman" result = /obj/item/clothing/tie/talisman time = 20 @@ -350,7 +350,7 @@ /obj/item/stack/sheet/sinew = 1) category = CAT_PRIMAL -/datum/table_recipe/bracers +/datum/crafting_recipe/bracers name = "Bone Bracers" result = /obj/item/clothing/gloves/bracer time = 20 @@ -358,18 +358,49 @@ /obj/item/stack/sheet/sinew = 1) category = CAT_PRIMAL -/datum/table_recipe/skullhelm +/datum/crafting_recipe/skullhelm name = "Skull Helmet" result = /obj/item/clothing/head/helmet/skull time = 30 reqs = list(/obj/item/stack/sheet/bone = 4) category = CAT_PRIMAL -/datum/table_recipe/drakecloak +/datum/crafting_recipe/drakecloak name = "Ash Drake Cloak" result = /obj/item/clothing/suit/hooded/cloak/drake time = 60 reqs = list(/obj/item/stack/sheet/bone = 10, /obj/item/stack/sheet/sinew = 2, /obj/item/stack/sheet/animalhide/ashdrake = 5) + category = CAT_PRIMAL + +/datum/crafting_recipe/gold_horn + name = "Golden bike horn" + result = /obj/item/weapon/bikehorn/golden + time = 20 + reqs = list(/obj/item/stack/sheet/mineral/bananium = 5, + /obj/item/weapon/bikehorn) + category = CAT_MISC + +/datum/crafting_recipe/bonedagger + name = "Bone Dagger" + result = /obj/item/weapon/kitchen/knife/combat/bone + time = 20 + reqs = list(/obj/item/stack/sheet/bone = 2) + category = CAT_PRIMAL + +/datum/crafting_recipe/bonespear + name = "Bone Spear" + result = /obj/item/weapon/twohanded/bonespear + time = 30 + reqs = list(/obj/item/stack/sheet/bone = 4, + /obj/item/stack/sheet/sinew = 1) + category = CAT_PRIMAL + +/datum/crafting_recipe/boneaxe + name = "Bone Axe" + result = /obj/item/weapon/twohanded/fireaxe/boneaxe + time = 50 + reqs = list(/obj/item/stack/sheet/bone = 6, + /obj/item/stack/sheet/sinew = 3) category = CAT_PRIMAL \ No newline at end of file diff --git a/code/modules/crafting/table.dm b/code/modules/crafting/table.dm deleted file mode 100644 index ec813ea7e80..00000000000 --- a/code/modules/crafting/table.dm +++ /dev/null @@ -1,295 +0,0 @@ - -/obj/structure/table - mouse_drag_pointer = MOUSE_ACTIVE_POINTER - var/list/table_contents = list() - var/viewing_category = 1 //typical powergamer starting on the Weapons tab - var/list/categories = list(CAT_WEAPON,CAT_AMMO,CAT_ROBOT,CAT_FOOD,CAT_MISC,CAT_PRIMAL) - - -/obj/structure/table/MouseDrop(mob/living/user) - if(!istype(user)) - return - if(!user.IsAdvancedToolUser()) - return - tablecraft(user) - -/obj/structure/table/proc/check_contents(datum/table_recipe/R) - check_table() - main_loop: - for(var/A in R.reqs) - var/needed_amount = R.reqs[A] - for(var/B in table_contents) - if(ispath(B, A)) - if(table_contents[B] >= R.reqs[A]) - continue main_loop - else - needed_amount -= table_contents[B] - if(needed_amount <= 0) - continue main_loop - else - continue - return 0 - for(var/A in R.chem_catalysts) - if(table_contents[A] < R.chem_catalysts[A]) - return 0 - return 1 - -/obj/structure/table/proc/check_table() - table_contents = list() - for(var/obj/item/I in loc) - if(istype(I, /obj/item/stack)) - var/obj/item/stack/S = I - table_contents[I.type] += S.amount - else - if(istype(I, /obj/item/weapon/reagent_containers)) - var/obj/item/weapon/reagent_containers/RC = I - if(RC.flags & OPENCONTAINER) - for(var/datum/reagent/A in RC.reagents.reagent_list) - table_contents[A.type] += A.volume - table_contents[I.type] += 1 - -/obj/structure/table/proc/check_tools(mob/user, datum/table_recipe/R) - if(!R.tools.len) - return 1 - var/list/possible_tools = list() - for(var/obj/item/I in user.contents) - if(istype(I, /obj/item/weapon/storage)) - for(var/obj/item/SI in I.contents) - possible_tools += SI.type - else - possible_tools += I.type - possible_tools += table_contents - main_loop: - for(var/A in R.tools) - for(var/I in possible_tools) - if(ispath(I,A)) - possible_tools -= I - continue main_loop - return 0 - return 1 - -/obj/structure/table/proc/construct_item(mob/user, datum/table_recipe/R) - check_table() - var/send_feedback = 1 - if(check_contents(R)) - if(check_tools(user, R)) - if(do_after(user, R.time, target = src)) - if(!check_contents(R)) - return ", missing component." - if(!check_tools(user, R)) - return ", missing tool." - var/atom/movable/I = new R.result (loc) - if(istype(I, /obj/item/weapon/reagent_containers/food/snacks)) - var/obj/item/weapon/reagent_containers/food/snacks/S = I - S.create_reagents(S.volume) - feedback_add_details("food_made","[S.type]") - send_feedback = 0 - var/list/parts = del_reqs(R, I) - for(var/A in parts) - if(istype(A, /obj/item)) - var/atom/movable/B = A - B.loc = I - B.pixel_x = initial(B.pixel_x) - B.pixel_y = initial(B.pixel_y) - else - if(!I.reagents) - I.reagents = new /datum/reagents() - I.reagents.reagent_list.Add(A) - I.CheckParts() - if(send_feedback) - feedback_add_details("object_crafted","[I.type]") - return 0 - return "." - return ", missing tool." - return ", missing component." - -/obj/structure/table/proc/del_reqs(datum/table_recipe/R, atom/movable/resultobject) - var/list/Deletion = list() - var/amt - var/reagenttransfer = 0 - if(istype(resultobject,/obj/item/weapon/reagent_containers)) - reagenttransfer = 1 - for(var/A in R.reqs) - amt = R.reqs[A] - if(ispath(A, /obj/item/stack)) - var/obj/item/stack/S - stack_loop: - for(var/B in table_contents) - if(ispath(B, A)) - while(amt > 0) - S = locate(B) in loc - if(S.amount >= amt) - S.use(amt) - break stack_loop - else - amt -= S.amount - qdel(S) - else if(ispath(A, /obj/item)) - var/obj/item/I - item_loop: - for(var/B in table_contents) - if(ispath(B, A)) - var/item_amount = table_contents[B] - while(item_amount > 0) - I = locate(B) in loc - Deletion.Add(I) - I.loc = null //remove it from the table loc so that we don't locate the same item every time (will be relocated inside the crafted item in construct_item()) - amt-- - item_amount-- - if(reagenttransfer && istype(I,/obj/item/weapon/reagent_containers)) - var/obj/item/weapon/reagent_containers/RC = I - RC.reagents.trans_to(resultobject, RC.reagents.total_volume) - if(amt <= 0) - break item_loop - else - var/datum/reagent/RG = new A - reagent_loop: - for(var/B in table_contents) - if(ispath(B, /obj/item/weapon/reagent_containers)) - var/obj/item/RC = locate(B) in loc - if(RC.reagents.has_reagent(RG.id, amt)) - if(reagenttransfer) - RC.reagents.trans_id_to(resultobject,RG.id, amt) - else - RC.reagents.remove_reagent(RG.id, amt) - RG.volume = amt - Deletion.Add(RG) - break reagent_loop - else if(RC.reagents.has_reagent(RG.id)) - Deletion.Add(RG) - RG.volume += RC.reagents.get_reagent_amount(RG.id) - amt -= RC.reagents.get_reagent_amount(RG.id) - if(reagenttransfer) - RC.reagents.trans_id_to(resultobject,RG.id, RG.volume) - else - RC.reagents.del_reagent(RG.id) - - var/list/partlist = list(R.parts.len) - for(var/M in R.parts) - partlist[M] = R.parts[M] - deletion_loop: - for(var/B in Deletion) - for(var/A in R.parts) - if(istype(B, A)) - if(partlist[A] > 0) //do we still need a part like that? - partlist[A] -= 1 - continue deletion_loop - Deletion.Remove(B) - qdel(B) - - return Deletion - -/obj/structure/table/proc/tablecraft(mob/user) - if(user.incapacitated() || user.lying || !Adjacent(user)) - return - check_table() - user.face_atom(src) - var/dat = "
Crafting menu
" - if(busy) - dat += ""
- dat += "Crafting in progress...
"
- else
- dat += "<--"
- dat += " [categories[prev_cat()]] |"
- dat += " [categories[viewing_category]] "
- dat += "| [categories[next_cat()]] "
- dat += "-->" - - dat += "
"
-
- //Filter the recipes we can craft to the top
- var/list/can_craft = list()
- var/list/cant_craft = list()
- for(var/datum/table_recipe/R in table_recipes)
- if(R.category != categories[viewing_category])
- continue
- if(check_contents(R))
- can_craft += R
- else
- cant_craft += R
-
- for(var/datum/table_recipe/R in can_craft)
- dat += build_recipe_text(R)
- for(var/datum/table_recipe/R in cant_craft)
- dat += build_recipe_text(R)
-
-
- dat += "
"
-
- var/datum/browser/popup = new(user, "table", "Table", 500, 500)
- popup.set_content(dat)
- popup.open()
- return
-
-/obj/structure/table/Topic(href, href_list)
- if(usr.stat || !Adjacent(usr) || usr.lying)
- return
- if(href_list["make"])
- var/datum/table_recipe/TR = locate(href_list["make"])
- busy = 1
- tablecraft(usr)
- var/fail_msg = construct_item(usr, TR)
- if(!fail_msg)
- usr << "[TR.name] constructed."
- else
- usr << "Construction failed[fail_msg]"
- busy = 0
- tablecraft(usr)
- if(href_list["forwardCat"])
- viewing_category = next_cat()
- usr << "Category is now [categories[viewing_category]]."
- tablecraft(usr)
- if(href_list["backwardCat"])
- viewing_category = prev_cat()
- usr << "Category is now [categories[viewing_category]]."
- tablecraft(usr)
-
-//Next works nicely with modular arithmetic
-/obj/structure/table/proc/next_cat()
- . = viewing_category % categories.len + 1
-
-//Previous can go fuck itself
-/obj/structure/table/proc/prev_cat()
- if(viewing_category == categories.len)
- . = viewing_category-1
- else
- . = viewing_category % categories.len - 1
- if(. <= 0)
- . = categories.len
-
-/obj/structure/table/proc/build_recipe_text(datum/table_recipe/R)
- . = ""
- var/name_text = ""
- var/req_text = ""
- var/tool_text = ""
- var/catalist_text = ""
- if(check_contents(R))
- name_text ="[R.name]"
-
- else
- name_text = "[R.name]"
-
- if(name_text)
- for(var/A in R.reqs)
- if(ispath(A, /obj))
- var/obj/O = A
- req_text += " [R.reqs[A]] [initial(O.name)]"
- else if(ispath(A, /datum/reagent))
- var/datum/reagent/RE = A
- req_text += " [R.reqs[A]] [initial(RE.name)]"
-
- if(R.chem_catalysts.len)
- catalist_text += ", Catalysts:"
- for(var/C in R.chem_catalysts)
- if(ispath(C, /datum/reagent))
- var/datum/reagent/RE = C
- catalist_text += " [R.chem_catalysts[C]] [initial(RE.name)]"
-
- if(R.tools.len)
- tool_text += ", Tools:"
- for(var/O in R.tools)
- if(ispath(O, /obj))
- var/obj/T = O
- tool_text += " [R.tools[O]] [initial(T.name)]"
-
- . = "[name_text][req_text][tool_text][catalist_text]" diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm index fa324c1886c..6fa698d12d2 100644 --- a/code/modules/detectivework/detective_work.dm +++ b/code/modules/detectivework/detective_work.dm @@ -47,80 +47,59 @@ //world.log << "Added fibertext: [fibertext]" suit_fibers += "Material from a pair of [M.gloves.name]." + /atom/proc/add_hiddenprint(mob/living/M) - if(isnull(M)) return - if(isnull(M.key)) return + if(!M || !M.key) + return + + if(!fingerprintshidden) //Add the list if it does not exist + fingerprintshidden = list() + + var/hasgloves = "" if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.gloves) - if(fingerprintslast != H.ckey) - fingerprintshidden += "\[[time_stamp()]\] (Wearing gloves). Real name: [H.real_name], Key: [H.key]" - fingerprintslast = H.ckey - return 0 - if(!fingerprints) - if(fingerprintslast != H.ckey) - fingerprintshidden += "\[[time_stamp()]\] Real name: [H.real_name], Key: [H.key]" - fingerprintslast = H.ckey - return 1 + hasgloves = "(gloves)" + + var/current_time = time_stamp() + if(!fingerprintshidden[M.key]) + fingerprintshidden[M.key] = "First: [M.real_name]\[[current_time]\][hasgloves]." else - if(fingerprintslast != M.ckey) - fingerprintshidden += "\[[time_stamp()]\] Real name: [M.real_name], Key: [M.key]" - fingerprintslast = M.ckey - return + var/laststamppos = findtext(fingerprintshidden[M.key], " Last: ") + if(laststamppos) + fingerprintshidden[M.key] = copytext(fingerprintshidden[M.key], 1, laststamppos) + fingerprintshidden[M.key] += " Last: [M.real_name]\[[current_time]\][hasgloves]." + + fingerprintslast = M.ckey + //Set ignoregloves to add prints irrespective of the mob having gloves on. /atom/proc/add_fingerprint(mob/living/M, ignoregloves = 0) - if(isnull(M)) return - if(isnull(M.key)) return + if(!M || !M.key) + return + + add_hiddenprint(M) + if(ishuman(M)) var/mob/living/carbon/human/H = M - //Add the list if it does not exist. - if(!fingerprintshidden) - fingerprintshidden = list() - //Fibers~ add_fibers(H) - //Now, lets get to the dirty work. - - //Check if the gloves (if any) hide fingerprints - if(H.gloves) + if(H.gloves) //Check if the gloves (if any) hide fingerprints var/obj/item/clothing/gloves/G = H.gloves if(G.transfer_prints) ignoregloves = 1 - //Now, deal with gloves. - if(!ignoregloves) - if(H.gloves && H.gloves != src) - if(fingerprintslast != H.ckey) - fingerprintshidden += text("\[[]\](Wearing gloves). Real name: [], Key: []",time_stamp(), H.real_name, H.key) - fingerprintslast = H.ckey - H.gloves.add_fingerprint(M) - return 0 + if(!ignoregloves) + H.gloves.add_fingerprint(H, 1) //ignoregloves = 1 to avoid infinite loop. + return - //More adminstuffz - if(fingerprintslast != H.ckey) - fingerprintshidden += text("\[[]\]Real name: [], Key: []",time_stamp(), H.real_name, H.key) - fingerprintslast = H.ckey - - //Make the list if it does not exist. - if(!fingerprints) + if(!fingerprints) //Add the list if it does not exist fingerprints = list() - - //Hash this shit. var/full_print = md5(H.dna.uni_identity) - - // Add the fingerprints fingerprints[full_print] = full_print - return 1 - else - //Smudge up dem prints some - if(fingerprintslast != M.ckey) - fingerprintshidden += text("\[[]\]Real name: [], Key: []",time_stamp(), M.real_name, M.key) - fingerprintslast = M.ckey - return /atom/proc/transfer_fingerprints_to(atom/A) diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 2d886309bcb..0e66f21b100 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -67,7 +67,7 @@ return E /datum/round_event //NOTE: Times are measured in master controller ticks! - var/processing = 1 + var/processing = TRUE var/datum/round_event_control/control var/startWhen = 0 //When in the lifetime to call start(). @@ -150,7 +150,8 @@ //Sets up the event then adds the event to the the list of running events -/datum/round_event/New() +/datum/round_event/New(my_processing = TRUE) setup() + processing = my_processing SSevent.running += src - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm index 65ec0a7aae2..19ccda1472b 100644 --- a/code/modules/events/abductor.dm +++ b/code/modules/events/abductor.dm @@ -1,6 +1,6 @@ /datum/round_event_control/abductor name = "Abductors" - typepath = /datum/round_event/abductor + typepath = /datum/round_event/ghost_role/abductor weight = 5 max_occurrences = 1 @@ -9,55 +9,49 @@ gamemode_blacklist = list("nuclear","wizard","revolution","abduction") -/datum/round_event/abductor +/datum/round_event/ghost_role/abductor + minimum_required = 2 + role_name = "abductor team" -/datum/round_event/abductor/start() - //spawn abductor team - processing = 0 //so it won't fire again in next subsystem tick - if(!makeAbductorTeam()) - message_admins("Abductor event failed to find players. Retrying in 30s.") - spawn(300) - makeAbductorTeam() +/datum/round_event/ghost_role/abductor/spawn_role() + var/list/mob/dead/observer/candidates = get_candidates("abductor", null, ROLE_ABDUCTOR) -/datum/round_event/abductor/proc/makeAbductorTeam() - var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered for an Abductor Team?", "abductor", null, ROLE_ABDUCTOR ) + if(candidates.len < 2) + return NOT_ENOUGH_PLAYERS + //Oh god why we can't have static functions + // I feel your pain, bro + var/number = ticker.mode.abductor_teams + 1 - if(candidates.len >= 2) - //Oh god why we can't have static functions - var/number = ticker.mode.abductor_teams + 1 - - var/datum/game_mode/abduction/temp - if(ticker.mode.config_tag == "abduction") - temp = ticker.mode - else - temp = new - - var/agent_mind = pick(candidates) - candidates -= agent_mind - var/scientist_mind = pick(candidates) - - var/mob/living/carbon/human/agent=makeBody(agent_mind) - var/mob/living/carbon/human/scientist=makeBody(scientist_mind) - - agent_mind = agent.mind - scientist_mind = scientist.mind - - temp.scientists.len = number - temp.agents.len = number - temp.abductors.len = 2*number - temp.team_objectives.len = number - temp.team_names.len = number - temp.scientists[number] = scientist_mind - temp.agents[number] = agent_mind - temp.abductors |= list(agent_mind,scientist_mind) - temp.make_abductor_team(number,preset_scientist=scientist_mind,preset_agent=agent_mind) - temp.post_setup_team(number) - - ticker.mode.abductor_teams++ - - if(ticker.mode.config_tag != "abduction") - ticker.mode.abductors |= temp.abductors - processing = 1 //So it will get gc'd - return 1 + var/datum/game_mode/abduction/temp + if(ticker.mode.config_tag == "abduction") + temp = ticker.mode else - return 0 \ No newline at end of file + temp = new + + var/agent_mind = popleft(candidates) + var/scientist_mind = popleft(candidates) + + var/mob/living/carbon/human/agent = makeBody(agent_mind) + var/mob/living/carbon/human/scientist = makeBody(scientist_mind) + + agent_mind = agent.mind + scientist_mind = scientist.mind + + temp.scientists.len = number + temp.agents.len = number + temp.abductors.len = 2*number + temp.team_objectives.len = number + temp.team_names.len = number + temp.scientists[number] = scientist_mind + temp.agents[number] = agent_mind + temp.abductors |= list(agent_mind,scientist_mind) + temp.make_abductor_team(number,preset_scientist=scientist_mind,preset_agent=agent_mind) + temp.post_setup_team(number) + + ticker.mode.abductor_teams++ + + if(ticker.mode.config_tag != "abduction") + ticker.mode.abductors |= temp.abductors + + spawned_mobs += list(agent, scientist) + return SUCCESSFUL_SPAWN diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm index 0082e3d62fa..ff6b63b7c8a 100644 --- a/code/modules/events/alien_infestation.dm +++ b/code/modules/events/alien_infestation.dm @@ -1,73 +1,75 @@ -/datum/round_event_control/alien_infestation - name = "Alien Infestation" - typepath = /datum/round_event/alien_infestation - weight = 5 - - min_players = 10 - max_occurrences = 1 - -/datum/round_event/alien_infestation - announceWhen = 400 - - var/spawncount = 1 - var/successSpawn = 0 //So we don't make a command report if nothing gets spawned. - - -/datum/round_event/alien_infestation/setup() - announceWhen = rand(announceWhen, announceWhen + 50) - spawncount = rand(1, 2) - -/datum/round_event/alien_infestation/kill() - if(!successSpawn && control) - control.occurrences-- - return ..() - -/datum/round_event/alien_infestation/announce() - if(successSpawn) - priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", 'sound/AI/aliens.ogg') - - -/datum/round_event/alien_infestation/start() - get_alien() - -/datum/round_event/alien_infestation/proc/get_alien(end_if_fail = 0) - var/list/vents = list() - for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in machines) - if(qdeleted(temp_vent)) - continue - if(temp_vent.loc.z == ZLEVEL_STATION && !temp_vent.welded) - var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1 - if(temp_vent_parent.other_atmosmch.len > 20) //Stops Aliens getting stuck in small networks. See: Security, Virology - vents += temp_vent - - if(!vents.len) - message_admins("An event attempted to spawn an alien but no suitable vents were found. Shutting down.") - return kill() - - var/list/candidates = get_candidates(ROLE_ALIEN, ALIEN_AFK_BRACKET, "alien candidate") - if(!candidates.len) - if(end_if_fail) - return 0 - return find_alien() - while(spawncount > 0 && vents.len && candidates.len) - var/obj/vent = pick_n_take(vents) - var/client/C = pick_n_take(candidates) - - var/mob/living/carbon/alien/larva/new_xeno = new(vent.loc) - new_xeno.key = C.key - - spawncount-- - successSpawn = 1 - message_admins("[new_xeno.key] has been made into an alien by an event.") - log_game("[new_xeno.key] was spawned as an alien by an event.") - if(successSpawn) - return 1 - -/datum/round_event/alien_infestation/proc/find_alien() - message_admins("Event attempted to spawn an alien but no candidates were available. Will try again momentarily...") - spawn(50) - if(get_alien(1)) - message_admins("Situation has been resolved") - return 0 - message_admins("Unfortunately, no candidates were available for becoming an alien. Shutting down.") - return kill() +/datum/round_event_control/alien_infestation + name = "Alien Infestation" + typepath = /datum/round_event/ghost_role/alien_infestation + weight = 5 + + min_players = 10 + max_occurrences = 1 + +/datum/round_event/ghost_role/alien_infestation + announceWhen = 400 + + minimum_required = 1 + role_name = "alien larva" + + // 50% chance of being incremented by one + var/spawncount = 1 + var/successSpawn = 0 //So we don't make a command report if nothing gets spawned. + + +/datum/round_event/ghost_role/alien_infestation/setup() + announceWhen = rand(announceWhen, announceWhen + 50) + if(prob(50)) + spawncount++ + +/datum/round_event/ghost_role/alien_infestation/kill() + if(!successSpawn && control) + // This never happened, so let's not deny the future of this round + // some xenolovin + control.occurrences-- + return ..() + +/datum/round_event/ghost_role/alien_infestation/announce() + if(successSpawn) + priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", 'sound/AI/aliens.ogg') + + +/datum/round_event/ghost_role/alien_infestation/spawn_role() + var/list/vents = list() + for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in machines) + if(qdeleted(temp_vent)) + continue + if(temp_vent.loc.z == ZLEVEL_STATION && !temp_vent.welded) + var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1 + //Stops Aliens getting stuck in small networks. + //See: Security, Virology + if(temp_vent_parent.other_atmosmch.len > 20) + vents += temp_vent + + if(!vents.len) + message_admins("An event attempted to spawn an alien but no suitable vents were found. Shutting down.") + return MAP_ERROR + + var/list/candidates = get_candidates("alien", null, ROLE_ALIEN) + + if(!candidates.len) + return NOT_ENOUGH_PLAYERS + + while(spawncount > 0 && vents.len && candidates.len) + var/obj/vent = pick_n_take(vents) + var/client/C = popleft(candidates) + + var/mob/living/carbon/alien/larva/new_xeno = new(vent.loc) + new_xeno.key = C.key + + spawncount-- + successSpawn = TRUE + message_admins("[new_xeno.key] has been made into an alien by an event.") + log_game("[new_xeno.key] was spawned as an alien by an event.") + spawned_mobs += new_xeno + + if(successSpawn) + return SUCCESSFUL_SPAWN + else + // Like how did we get here? + return FALSE diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index 078f7dab63b..6a9685186d9 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -5,7 +5,7 @@ max_occurrences = 1000 earliest_start = 0 alertadmins = 0 - + /datum/round_event/meteor_wave/dust startWhen = 1 endWhen = 2 diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm index e34c532dad0..3fba86ca377 100644 --- a/code/modules/events/false_alarm.dm +++ b/code/modules/events/false_alarm.dm @@ -22,7 +22,7 @@ if(initial(event.announceWhen) <= 0) continue events_list += E - + var/datum/round_event_control/event_control = pick(events_list) if(event_control) var/datum/round_event/Event = new event_control.typepath() @@ -30,4 +30,4 @@ Event.kill() //do not process this event - no starts, no ticks, no ends Event.announce() //just announce it like it's happening - + diff --git a/code/modules/events/ghost_role.dm b/code/modules/events/ghost_role.dm new file mode 100644 index 00000000000..7bef6dbed76 --- /dev/null +++ b/code/modules/events/ghost_role.dm @@ -0,0 +1,62 @@ +/datum/round_event/ghost_role + // We expect 0 or more /clients (or things with .key) in this list + var/list/priority_candidates = list() + var/minimum_required = 1 + var/role_name = "debug rat with cancer" // Q U A L I T Y M E M E S + var/list/spawned_mobs = list() + +/datum/round_event/ghost_role/start() + try_spawning() + +/datum/round_event/ghost_role/proc/try_spawning(sanity = 0) + // The event does not run until the spawning has been attempted + // to prevent us from getting gc'd halfway through + processing = FALSE + + var/status = spawn_role() + if(status == WAITING_FOR_SOMETHING) + message_admins("The event will not spawn a [role_name] until certain \ + conditions are met. Waiting 30s and then retrying.") + spawn(300) + // I hope this doesn't end up running out of stack space + try_spawning() + return + + if(status == MAP_ERROR) + message_admins("[role_name] cannot be spawned due to a map error.") + else if(status == NOT_ENOUGH_PLAYERS) + message_admins("[role_name] cannot be spawned due to lack of players \ + signing up.") + else if(status == SUCCESSFUL_SPAWN) + message_admins("[role_name] spawned successfully.") + if(!spawned_mobs.len) + message_admins("No mobs found in the `spawned_mobs` list, this is \ + a bug.") + else + message_admins("An attempt to spawn [role_name] returned [status], \ + this is a bug.") + + processing = TRUE + +/datum/round_event/ghost_role/proc/spawn_role() + // Return true if role was successfully spawned, false if insufficent + // players could be found, and just runtime if anything else happens + return TRUE + +/datum/round_event/ghost_role/proc/get_candidates(jobban, gametypecheck, be_special) + // Returns a list of candidates in priority order, with candidates from + // `priority_candidates` first, and ghost roles randomly shuffled and + // appended after + var/list/mob/dead/observer/regular_candidates + // don't get their hopes up + if(priority_candidates.len < minimum_required) + regular_candidates = pollCandidates("Do you wish to be considered for the special role of '[role_name]'?", jobban, gametypecheck, be_special) + else + regular_candidates = list() + + shuffle(regular_candidates) + + var/list/candidates = priority_candidates + regular_candidates + + return candidates + diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm index 88ac1a8016a..13615544aaf 100644 --- a/code/modules/events/operative.dm +++ b/code/modules/events/operative.dm @@ -1,34 +1,26 @@ /datum/round_event_control/operative name = "Lone Operative" - typepath = /datum/round_event/operative + typepath = /datum/round_event/ghost_role/operative weight = 0 //Admin only max_occurrences = 1 -/datum/round_event/operative - var/key_of_operative +/datum/round_event/ghost_role/operative + minimum_required = 1 + role_name = "lone operative" + +/datum/round_event/ghost_role/operative/spawn_role() + var/list/candidates = get_candidates("operative", 3000, ROLE_OPERATIVE) + if(!candidates.len) + return NOT_ENOUGH_PLAYERS + + var/mob/dead/selected = popleft(candidates) -/datum/round_event/operative/proc/get_operative(end_if_fail = 0) - key_of_operative = null - if(!key_of_operative) - var/list/candidates = get_candidates(ROLE_OPERATIVE, 3000, "operative") - if(!candidates.len) - if(end_if_fail) - return 0 - return find_operative() - var/client/C = pick(candidates) - key_of_operative = C.key - if(!key_of_operative) - if(end_if_fail) - return 0 - return find_operative() - var/datum/mind/player_mind = new /datum/mind(key_of_operative) - player_mind.active = 1 var/list/spawn_locs = list() for(var/obj/effect/landmark/L in landmarks_list) if(L.name in list("ninjaspawn","carpspawn")) spawn_locs += L.loc if(!spawn_locs.len) - return kill() + return MAP_ERROR var/mob/living/carbon/human/operative = new(pick(spawn_locs)) var/datum/preferences/A = new @@ -37,7 +29,7 @@ operative.equipOutfit(/datum/outfit/syndicate/full) - var/datum/mind/Mind = new /datum/mind(key_of_operative) + var/datum/mind/Mind = new /datum/mind(selected.key) Mind.assigned_role = "Lone Operative" Mind.special_role = "Lone Operative" ticker.mode.traitors |= Mind @@ -61,20 +53,7 @@ Mind.transfer_to(operative) - message_admins("[key_of_operative] has been made into lone operative by an event.") - log_game("[key_of_operative] was spawned as a lone operative by an event.") - return 1 - -/datum/round_event/operative/start() - get_operative() - - -/datum/round_event/operative/proc/find_operative() - message_admins("Attempted to spawn a operative but there was no players available. Will try again momentarily.") - spawn(50) - if(get_operative(1)) - message_admins("Situation has been resolved, [key_of_operative] has been spawned as a operative.") - log_game("[key_of_operative] was spawned as a operative by an event.") - return 0 - message_admins("Unfortunately, no candidates were available for becoming a operative. Shutting down.") - return kill() \ No newline at end of file + message_admins("[operative.key] has been made into lone operative by an event.") + log_game("[operative.key] was spawned as a lone operative by an event.") + spawned_mobs += operative + return SUCCESSFUL_SPAWN diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm index fb4f68e7fba..7d4f144938b 100644 --- a/code/modules/events/portal_storm.dm +++ b/code/modules/events/portal_storm.dm @@ -11,15 +11,15 @@ /mob/living/simple_animal/hostile/syndicate/ranged/space/noloot = 2) /datum/round_event_control/portal_storm_narsie - name = "Portal Storm: Nar-sie" + name = "Portal Storm: Constructs" typepath = /datum/round_event/portal_storm/portal_storm_narsie weight = 0 max_occurrences = 0 /datum/round_event/portal_storm/portal_storm_narsie - boss_types = list(/obj/singularity/narsie/large = 1) - hostile_types = list(/mob/living/simple_animal/hostile/construct/armored/hostile = 10,\ - /mob/living/simple_animal/hostile/construct/wraith/hostile = 10) + boss_types = list(/mob/living/simple_animal/hostile/construct/builder = 6) + hostile_types = list(/mob/living/simple_animal/hostile/construct/armored/hostile = 8,\ + /mob/living/simple_animal/hostile/construct/wraith/hostile = 6) /datum/round_event/portal_storm startWhen = 7 diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm index cd4911f231a..b301049eaf4 100644 --- a/code/modules/events/wizard/greentext.dm +++ b/code/modules/events/wizard/greentext.dm @@ -68,6 +68,7 @@ new_holder.mind.objectives += O new_holder.attack_log += "\[[time_stamp()]\] Won with greentext!!!" color_altered_mobs -= new_holder + burn_state = ON_FIRE qdel(src) if(last_holder && last_holder != new_holder) //Somehow it was swiped without ever getting dropped diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm index c71b1aa2a71..852c8ed9108 100644 --- a/code/modules/food&drinks/drinks/drinks/bottle.dm +++ b/code/modules/food&drinks/drinks/drinks/bottle.dm @@ -333,7 +333,8 @@ /datum/reagent/napalm,/datum/reagent/hellwater,/datum/reagent/toxin/plasma,/datum/reagent/toxin/spore_burning) var/active = 0 -/obj/item/weapon/reagent_containers/food/drinks/bottle/molotov/CheckParts() +/obj/item/weapon/reagent_containers/food/drinks/bottle/molotov/CheckParts(list/parts_list) + ..() var/obj/item/weapon/reagent_containers/food/drinks/bottle/B = locate() in contents if(B) icon_state = B.icon_state diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm index 2a790645521..9b340df0f0d 100644 --- a/code/modules/food&drinks/food/snacks.dm +++ b/code/modules/food&drinks/food/snacks.dm @@ -19,6 +19,7 @@ var/customfoodfilling = 1 // whether it can be used as filling in custom food //Placeholder for effect that trigger on eating that aren't tied to reagents. + /obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume() if(!usr) return @@ -153,7 +154,18 @@ return 1 //Called when you finish tablecrafting a snack. -/obj/item/weapon/reagent_containers/food/snacks/CheckParts() +/obj/item/weapon/reagent_containers/food/snacks/CheckParts(list/parts_list, datum/crafting_recipe/R) + ..() + reagents.reagent_list.Cut() + for(var/obj/item/weapon/reagent_containers/RC in contents) + RC.reagents.trans_to(reagents, RC.reagents.maximum_volume) + contents_loop: + for(var/A in contents) + for(var/B in initial(R.parts)) + if(istype(A, B)) + continue contents_loop + qdel(A) + feedback_add_details("food_made","[type]") if(bonus_reagents.len) for(var/r_id in bonus_reagents) var/amount = bonus_reagents[r_id] diff --git a/code/modules/food&drinks/food/snacks_burgers.dm b/code/modules/food&drinks/food/snacks_burgers.dm index 16d5eda5f2d..061a28d6c90 100644 --- a/code/modules/food&drinks/food/snacks_burgers.dm +++ b/code/modules/food&drinks/food/snacks_burgers.dm @@ -18,7 +18,8 @@ desc = "A bloody burger." bonus_reagents = list("vitamin" = 4) -/obj/item/weapon/reagent_containers/food/snacks/burger/human/CheckParts() +/obj/item/weapon/reagent_containers/food/snacks/burger/human/CheckParts(list/parts_list) + ..() var/obj/item/weapon/reagent_containers/food/snacks/meat/M = locate(/obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human) in contents if(M) subjectname = M.subjectname @@ -29,8 +30,6 @@ name = "[subjectjob] burger" qdel(M) - ..() - /obj/item/weapon/reagent_containers/food/snacks/burger/corgi name = "corgi burger" diff --git a/code/modules/food&drinks/food/snacks_egg.dm b/code/modules/food&drinks/food/snacks_egg.dm index 473ad4ebde5..5f481bb2916 100644 --- a/code/modules/food&drinks/food/snacks_egg.dm +++ b/code/modules/food&drinks/food/snacks_egg.dm @@ -27,7 +27,7 @@ /obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W, mob/user, params) if(istype( W, /obj/item/toy/crayon )) var/obj/item/toy/crayon/C = W - var/clr = C.colourName + var/clr = C.item_color if(!(clr in list("blue", "green", "mime", "orange", "purple", "rainbow", "red", "yellow"))) usr << "[src] refuses to take on this colour!" diff --git a/code/modules/food&drinks/food/snacks_pie.dm b/code/modules/food&drinks/food/snacks_pie.dm index f3cd98cd458..915ce222b41 100644 --- a/code/modules/food&drinks/food/snacks_pie.dm +++ b/code/modules/food&drinks/food/snacks_pie.dm @@ -37,7 +37,7 @@ creamoverlay.icon_state = "creampie_human" H.Weaken(1) //splat! H.adjust_blurriness(1) - visible_message("[H] was creamed by the [src]!!") + visible_message("[H] was creamed by [src]!!") H.overlays += creamoverlay qdel(src) diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/food&drinks/kitchen machinery/gibber.dm index 93e3d1799fd..b31d4f68e18 100644 --- a/code/modules/food&drinks/kitchen machinery/gibber.dm +++ b/code/modules/food&drinks/kitchen machinery/gibber.dm @@ -230,7 +230,7 @@ skin.throw_at_fast(pick(nearby_turfs),i,3) for (var/turfs=1 to meat_produced*3) var/turf/gibturf = pick(nearby_turfs) - if (!gibturf.density && src in viewers(gibturf)) + if (!gibturf.density && src in view(gibturf)) new gibtype(gibturf,i) pixel_x = initial(pixel_x) //return to its spot after shaking diff --git a/code/modules/food&drinks/recipes/food_mixtures.dm b/code/modules/food&drinks/recipes/food_mixtures.dm index 39ad0b66acd..bfb9dcbaf4e 100644 --- a/code/modules/food&drinks/recipes/food_mixtures.dm +++ b/code/modules/food&drinks/recipes/food_mixtures.dm @@ -1,3 +1,5 @@ +/datum/crafting_recipe/food/New() + parts |= reqs //////////////////////////////////////////FOOD MIXTURES//////////////////////////////////// diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm index 083deaf6f20..56649b1f9f7 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm @@ -3,7 +3,7 @@ ////////////////////////////////////////////////BREAD//////////////////////////////////////////////// -/datum/table_recipe/meatbread +/datum/crafting_recipe/food/meatbread name = "Meat bread" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1, @@ -13,7 +13,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/meat category = CAT_FOOD -/datum/table_recipe/xenomeatbread +/datum/crafting_recipe/food/xenomeatbread name = "Xenomeat bread" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1, @@ -23,7 +23,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/xenomeat category = CAT_FOOD -/datum/table_recipe/spidermeatbread +/datum/crafting_recipe/food/spidermeatbread name = "Spidermeat bread" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1, @@ -33,7 +33,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/spidermeat category = CAT_FOOD -/datum/table_recipe/banananutbread +/datum/crafting_recipe/food/banananutbread name = "Banana nut bread" reqs = list( /datum/reagent/consumable/milk = 5, @@ -44,7 +44,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/banana category = CAT_FOOD -/datum/table_recipe/tofubread +/datum/crafting_recipe/food/tofubread name = "Tofu bread" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1, @@ -54,7 +54,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/tofu category = CAT_FOOD -/datum/table_recipe/creamcheesebread +/datum/crafting_recipe/food/creamcheesebread name = "Cream cheese bread" reqs = list( /datum/reagent/consumable/milk = 5, @@ -64,7 +64,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/creamcheese category = CAT_FOOD -/datum/table_recipe/mimanabread +/datum/crafting_recipe/food/mimanabread name = "Mimana bread" reqs = list( /datum/reagent/consumable/soymilk = 5, diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm index e3c86d5732e..8b70e10f143 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm @@ -4,7 +4,7 @@ ////////////////////////////////////////////////BURGERS//////////////////////////////////////////////// -/datum/table_recipe/humanburger +/datum/crafting_recipe/food/humanburger name = "Human burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/bun = 1, @@ -16,7 +16,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/human category = CAT_FOOD -/datum/table_recipe/burger +/datum/crafting_recipe/food/burger name = "Burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1, @@ -26,7 +26,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/plain category = CAT_FOOD -/datum/table_recipe/corgiburger +/datum/crafting_recipe/food/corgiburger name = "Corgi burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi = 1, @@ -36,7 +36,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/corgi category = CAT_FOOD -/datum/table_recipe/appendixburger +/datum/crafting_recipe/food/appendixburger name = "Appendix burger" reqs = list( /obj/item/organ/appendix = 1, @@ -45,7 +45,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/appendix category = CAT_FOOD -/datum/table_recipe/brainburger +/datum/crafting_recipe/food/brainburger name = "Brain burger" reqs = list( /obj/item/organ/brain = 1, @@ -54,7 +54,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/brain category = CAT_FOOD -/datum/table_recipe/xenoburger +/datum/crafting_recipe/food/xenoburger name = "Xeno burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/steak/xeno = 1, @@ -63,7 +63,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/xeno category = CAT_FOOD -/datum/table_recipe/bearger +/datum/crafting_recipe/food/bearger name = "Bearger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear = 1, @@ -72,7 +72,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/bearger category = CAT_FOOD -/datum/table_recipe/fishburger +/datum/crafting_recipe/food/fishburger name = "Fish burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1, @@ -81,7 +81,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/fish category = CAT_FOOD -/datum/table_recipe/tofuburger +/datum/crafting_recipe/food/tofuburger name = "Tofu burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/tofu = 1, @@ -90,7 +90,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/tofu category = CAT_FOOD -/datum/table_recipe/ghostburger +/datum/crafting_recipe/food/ghostburger name = "Ghost burger" reqs = list( /obj/item/weapon/ectoplasm = 1, @@ -99,7 +99,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/ghost category = CAT_FOOD -/datum/table_recipe/clownburger +/datum/crafting_recipe/food/clownburger name = "Clown burger" reqs = list( /obj/item/clothing/mask/gas/clown_hat = 1, @@ -108,7 +108,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/clown category = CAT_FOOD -/datum/table_recipe/mimeburger +/datum/crafting_recipe/food/mimeburger name = "Mime burger" reqs = list( /obj/item/clothing/mask/gas/mime = 1, @@ -117,7 +117,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/mime category = CAT_FOOD -/datum/table_recipe/redburger +/datum/crafting_recipe/food/redburger name = "Red burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1, @@ -127,7 +127,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/red category = CAT_FOOD -/datum/table_recipe/orangeburger +/datum/crafting_recipe/food/orangeburger name = "Orange burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1, @@ -137,7 +137,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/orange category = CAT_FOOD -/datum/table_recipe/yellowburger +/datum/crafting_recipe/food/yellowburger name = "Yellow burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1, @@ -147,7 +147,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/yellow category = CAT_FOOD -/datum/table_recipe/greenburger +/datum/crafting_recipe/food/greenburger name = "Green burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1, @@ -157,7 +157,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/green category = CAT_FOOD -/datum/table_recipe/blueburger +/datum/crafting_recipe/food/blueburger name = "Blue burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1, @@ -167,7 +167,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/blue category = CAT_FOOD -/datum/table_recipe/purpleburger +/datum/crafting_recipe/food/purpleburger name = "Purple burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1, @@ -177,15 +177,15 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/purple category = CAT_FOOD -/datum/table_recipe/spellburger +/datum/crafting_recipe/food/spellburger name = "Spell burger" reqs = list( - /obj/item/clothing/head/wizard/fake, + /obj/item/clothing/head/wizard/fake = 1, ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/spell category = CAT_FOOD -/datum/table_recipe/spellburger2 +/datum/crafting_recipe/food/spellburger2 name = "Spell burger" reqs = list( /obj/item/clothing/head/wizard = 1, @@ -194,7 +194,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/spell category = CAT_FOOD -/datum/table_recipe/bigbiteburger +/datum/crafting_recipe/food/bigbiteburger name = "Big bite burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 3, @@ -203,7 +203,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/bigbite category = CAT_FOOD -/datum/table_recipe/superbiteburger +/datum/crafting_recipe/food/superbiteburger name = "Super bite burger" reqs = list( /datum/reagent/consumable/sodiumchloride = 5, @@ -218,7 +218,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/superbite category = CAT_FOOD -/datum/table_recipe/slimeburger +/datum/crafting_recipe/food/slimeburger name = "Jelly burger" reqs = list( /datum/reagent/toxin/slimejelly = 5, @@ -227,7 +227,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/jelly/slime category = CAT_FOOD -/datum/table_recipe/jellyburger +/datum/crafting_recipe/food/jellyburger name = "Jelly burger" reqs = list( /datum/reagent/consumable/cherryjelly = 5, @@ -236,7 +236,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry category = CAT_FOOD -/datum/table_recipe/fivealarmburger +/datum/crafting_recipe/food/fivealarmburger name = "Five alarm burger" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili = 2, @@ -245,7 +245,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/fivealarm category = CAT_FOOD -/datum/table_recipe/ratburger +/datum/crafting_recipe/food/ratburger name = "Rat burger" reqs = list( /obj/item/trash/deadmouse = 1, diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_cake.dm index 63890d8b83f..03bdce39e59 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_cake.dm @@ -3,7 +3,7 @@ ////////////////////////////////////////////////CAKE//////////////////////////////////////////////// -/datum/table_recipe/carrotcake +/datum/crafting_recipe/food/carrotcake name = "Carrot cake" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1, @@ -12,7 +12,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/carrot category = CAT_FOOD -/datum/table_recipe/cheesecake +/datum/crafting_recipe/food/cheesecake name = "Cheese cake" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1, @@ -21,7 +21,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/cheese category = CAT_FOOD -/datum/table_recipe/applecake +/datum/crafting_recipe/food/applecake name = "Apple cake" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1, @@ -30,7 +30,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/apple category = CAT_FOOD -/datum/table_recipe/orangecake +/datum/crafting_recipe/food/orangecake name = "Orange cake" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1, @@ -39,7 +39,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/orange category = CAT_FOOD -/datum/table_recipe/limecake +/datum/crafting_recipe/food/limecake name = "Lime cake" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1, @@ -48,7 +48,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/lime category = CAT_FOOD -/datum/table_recipe/lemoncake +/datum/crafting_recipe/food/lemoncake name = "Lemon cake" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1, @@ -57,7 +57,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/lemon category = CAT_FOOD -/datum/table_recipe/chocolatecake +/datum/crafting_recipe/food/chocolatecake name = "Chocolate cake" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1, @@ -66,7 +66,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/chocolate category = CAT_FOOD -/datum/table_recipe/birthdaycake +/datum/crafting_recipe/food/birthdaycake name = "Birthday cake" reqs = list( /obj/item/clothing/head/hardhat/cakehat = 1, @@ -75,7 +75,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/birthday category = CAT_FOOD -/datum/table_recipe/braincake +/datum/crafting_recipe/food/braincake name = "Brain cake" reqs = list( /obj/item/organ/brain = 1, @@ -84,7 +84,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/brain category = CAT_FOOD -/datum/table_recipe/slimecake +/datum/crafting_recipe/food/slimecake name = "Slime cake" reqs = list( /obj/item/slime_extract = 1, @@ -93,7 +93,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/slimecake category = CAT_FOOD -/datum/table_recipe/pumpkinspicecake +/datum/crafting_recipe/food/pumpkinspicecake name = "Pumpkin spice cake" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1, diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_egg.dm index ae2e575fa95..b01f794fc2c 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_egg.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_egg.dm @@ -3,7 +3,7 @@ ////////////////////////////////////////////////EGG RECIPE's//////////////////////////////////////////////// -/datum/table_recipe/friedegg +/datum/crafting_recipe/food/friedegg name = "Fried egg" reqs = list( /datum/reagent/consumable/sodiumchloride = 1, @@ -13,7 +13,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/friedegg category = CAT_FOOD -/datum/table_recipe/omelette +/datum/crafting_recipe/food/omelette name = "omelette" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/boiledegg = 2, @@ -22,7 +22,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/omelette category = CAT_FOOD -/datum/table_recipe/chocolateegg +/datum/crafting_recipe/food/chocolateegg name = "Chocolate egg" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/boiledegg = 1, @@ -31,7 +31,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/chocolateegg category = CAT_FOOD -/datum/table_recipe/eggsbenedict +/datum/crafting_recipe/food/eggsbenedict name = "Eggs benedict" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/friedegg = 1, diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm index eba85761993..f20b5ae37d7 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm @@ -2,7 +2,7 @@ ////////////////////////////////////////////////KEBABS//////////////////////////////////////////////// -/datum/table_recipe/humankebab +/datum/crafting_recipe/food/humankebab name = "Human kebab" reqs = list( /obj/item/stack/rods = 1, @@ -11,7 +11,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/kebab/human category = CAT_FOOD -/datum/table_recipe/kebab +/datum/crafting_recipe/food/kebab name = "Kebab" reqs = list( /obj/item/stack/rods = 1, @@ -20,7 +20,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/kebab/monkey category = CAT_FOOD -/datum/table_recipe/tofukebab +/datum/crafting_recipe/food/tofukebab name = "Tofu kebab" reqs = list( /obj/item/stack/rods = 1, @@ -29,7 +29,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/kebab/tofu category = CAT_FOOD -/datum/table_recipe/tailkebab +/datum/crafting_recipe/food/tailkebab name = "Lizard tail kebab" reqs = list( /obj/item/stack/rods = 1, @@ -42,7 +42,7 @@ ////////////////////////////////////////////////FISH//////////////////////////////////////////////// -/datum/table_recipe/cubancarp +/datum/crafting_recipe/food/cubancarp name = "Cuban carp" reqs = list( /datum/reagent/consumable/flour = 5, @@ -52,7 +52,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/cubancarp category = CAT_FOOD -/datum/table_recipe/fishandchips +/datum/crafting_recipe/food/fishandchips name = "Fish and chips" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/fries = 1, @@ -61,7 +61,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips category = CAT_FOOD -/datum/table_recipe/fishfingers +/datum/crafting_recipe/food/fishfingers name = "Fish fingers" reqs = list( /datum/reagent/consumable/flour = 5, @@ -71,7 +71,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers category = CAT_FOOD -/datum/table_recipe/sashimi +/datum/crafting_recipe/food/sashimi name = "Sashimi" reqs = list( /datum/reagent/consumable/soysauce = 5, @@ -83,7 +83,7 @@ ////////////////////////////////////////////////MR SPIDER//////////////////////////////////////////////// -/datum/table_recipe/spidereggsham +/datum/crafting_recipe/food/spidereggsham name = "Spider eggs ham" reqs = list( /datum/reagent/consumable/sodiumchloride = 1, @@ -95,7 +95,7 @@ ////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// -/datum/table_recipe/cornedbeef +/datum/crafting_recipe/food/cornedbeef name = "Corned beef" reqs = list( /datum/reagent/consumable/sodiumchloride = 5, @@ -105,7 +105,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/cornedbeef category = CAT_FOOD -/datum/table_recipe/bearsteak +/datum/crafting_recipe/food/bearsteak name = "Filet migrawr" reqs = list( /datum/reagent/consumable/ethanol/manly_dorf = 5, @@ -115,7 +115,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/bearsteak category = CAT_FOOD -/datum/table_recipe/enchiladas +/datum/crafting_recipe/food/enchiladas name = "Enchiladas" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2, @@ -125,7 +125,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas category = CAT_FOOD -/datum/table_recipe/stewedsoymeat +/datum/crafting_recipe/food/stewedsoymeat name = "Stewed soymeat" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/soydope = 2, @@ -135,7 +135,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat category = CAT_FOOD -/datum/table_recipe/sausage +/datum/crafting_recipe/food/sausage name = "Sausage" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/faggot = 1, @@ -144,7 +144,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/sausage category = CAT_FOOD -/datum/table_recipe/nugget +/datum/crafting_recipe/food/nugget name = "Chicken nugget" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 1 diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm index 6f299b87d31..32dea3f7b57 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm @@ -3,7 +3,7 @@ // MISC -/datum/table_recipe/candiedapple +/datum/crafting_recipe/food/candiedapple name = "Candied apple" reqs = list(/datum/reagent/water = 5, /datum/reagent/consumable/sugar = 5, @@ -12,7 +12,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple category = CAT_FOOD -/datum/table_recipe/chococoin +/datum/crafting_recipe/food/chococoin name = "Choco coin" reqs = list( /obj/item/weapon/coin = 1, @@ -21,7 +21,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/chococoin category = CAT_FOOD -/datum/table_recipe/fudgedice +/datum/crafting_recipe/food/fudgedice name = "Fudge dice" reqs = list( /obj/item/weapon/dice = 1, @@ -30,7 +30,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/fudgedice category = CAT_FOOD -/datum/table_recipe/chocoorange +/datum/crafting_recipe/food/chocoorange name = "Choco orange" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange = 1, @@ -39,7 +39,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/chocoorange category = CAT_FOOD -/datum/table_recipe/loadedbakedpotato +/datum/crafting_recipe/food/loadedbakedpotato name = "Loaded baked potato" time = 40 reqs = list( @@ -49,7 +49,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato category = CAT_FOOD -/datum/table_recipe/cheesyfries +/datum/crafting_recipe/food/cheesyfries name = "Cheesy fries" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/fries = 1, @@ -58,7 +58,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/cheesyfries category = CAT_FOOD -/datum/table_recipe/wrap +/datum/crafting_recipe/food/wrap name = "Wrap" reqs = list(/datum/reagent/consumable/soysauce = 10, /obj/item/weapon/reagent_containers/food/snacks/friedegg = 1, @@ -67,7 +67,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/eggwrap category = CAT_FOOD -/datum/table_recipe/beans +/datum/crafting_recipe/food/beans name = "Beans" time = 40 reqs = list(/datum/reagent/consumable/ketchup = 5, @@ -76,7 +76,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/beans category = CAT_FOOD -/datum/table_recipe/eggplantparm +/datum/crafting_recipe/food/eggplantparm name ="Eggplant parmigiana" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2, @@ -85,7 +85,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/eggplantparm category = CAT_FOOD -/datum/table_recipe/baguette +/datum/crafting_recipe/food/baguette name = "Baguette" time = 40 reqs = list(/datum/reagent/consumable/sodiumchloride = 1, @@ -97,7 +97,7 @@ ////////////////////////////////////////////////TOAST//////////////////////////////////////////////// -/datum/table_recipe/slimetoast +/datum/crafting_recipe/food/slimetoast name = "Slime toast" reqs = list( /datum/reagent/toxin/slimejelly = 5, @@ -106,7 +106,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime category = CAT_FOOD -/datum/table_recipe/jelliedyoast +/datum/crafting_recipe/food/jelliedyoast name = "Jellied toast" reqs = list( /datum/reagent/consumable/cherryjelly = 5, @@ -115,7 +115,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry category = CAT_FOOD -/datum/table_recipe/twobread +/datum/crafting_recipe/food/twobread name = "Two bread" reqs = list( /datum/reagent/consumable/ethanol/wine = 5, @@ -124,7 +124,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/twobread category = CAT_FOOD -/datum/table_recipe/burrito +/datum/crafting_recipe/food/burrito name ="Burrito" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1, @@ -133,7 +133,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burrito category = CAT_FOOD -/datum/table_recipe/cheesyburrito +/datum/crafting_recipe/food/cheesyburrito name ="Cheesy burrito" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1, @@ -143,7 +143,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/cheesyburrito category = CAT_FOOD -/datum/table_recipe/carneburrito +/datum/crafting_recipe/food/carneburrito name ="Carne de asada burrito" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1, @@ -153,7 +153,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/carneburrito category = CAT_FOOD -/datum/table_recipe/fuegoburrito +/datum/crafting_recipe/food/fuegoburrito name ="Fuego plasma burrito" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1, @@ -163,7 +163,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito category = CAT_FOOD -/datum/table_recipe/melonfruitbowl +/datum/crafting_recipe/food/melonfruitbowl name ="Melon fruit bowl" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon = 1, @@ -176,7 +176,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/melonfruitbowl category = CAT_FOOD -/datum/table_recipe/spacefreezy +/datum/crafting_recipe/food/spacefreezy name ="Space freezy" reqs = list( /datum/reagent/consumable/bluecherryjelly = 5, @@ -186,7 +186,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/spacefreezy category = CAT_FOOD -/datum/table_recipe/sundae +/datum/crafting_recipe/food/sundae name ="Sundae" reqs = list( /datum/reagent/consumable/cream = 5, @@ -197,7 +197,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/sundae category = CAT_FOOD -/datum/table_recipe/honkdae +/datum/crafting_recipe/food/honkdae name ="Honkdae" reqs = list( /datum/reagent/consumable/cream = 5, @@ -209,7 +209,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/honkdae category = CAT_FOOD -/datum/table_recipe/nachos +/datum/crafting_recipe/food/nachos name ="Nachos" reqs = list( /datum/reagent/consumable/sodiumchloride = 1, @@ -218,7 +218,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/nachos category = CAT_FOOD -/datum/table_recipe/cheesynachos +/datum/crafting_recipe/food/cheesynachos name ="Cheesy nachos" reqs = list( /datum/reagent/consumable/sodiumchloride = 1, @@ -228,7 +228,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/cheesynachos category = CAT_FOOD -/datum/table_recipe/cubannachos +/datum/crafting_recipe/food/cubannachos name ="Cuban nachos" reqs = list( /datum/reagent/consumable/ketchup = 5, @@ -238,7 +238,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/cubannachos category = CAT_FOOD -/datum/table_recipe/melonkeg +/datum/crafting_recipe/food/melonkeg name ="Melon keg" reqs = list( /datum/reagent/consumable/ethanol/vodka = 25, @@ -249,7 +249,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/melonkeg category = CAT_FOOD -/datum/table_recipe/honeybar +/datum/crafting_recipe/food/honeybar name = "Honey nut bar" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/grown/oat = 1, @@ -259,7 +259,7 @@ category = CAT_FOOD -/datum/table_recipe/stuffedlegion +/datum/crafting_recipe/stuffedlegion name = "Stuffed legion" time = 40 reqs = list( diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm index 99305007696..850eb46b620 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm @@ -3,7 +3,7 @@ ////////////////////////////////////////////////DONUTS//////////////////////////////////////////////// -/datum/table_recipe/chaosdonut +/datum/crafting_recipe/food/chaosdonut name = "Chaos donut" reqs = list( /datum/reagent/consumable/frostoil = 5, @@ -13,7 +13,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos category = CAT_FOOD -/datum/table_recipe/donut +/datum/crafting_recipe/food/donut time = 15 name = "Donut" reqs = list( @@ -23,7 +23,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/donut category = CAT_FOOD -/datum/table_recipe/jellydonut +/datum/crafting_recipe/food/jellydonut name = "Jelly donut" reqs = list( /datum/reagent/consumable/berryjuice = 5, @@ -32,7 +32,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly category = CAT_FOOD -/datum/table_recipe/cherryjellydonut +/datum/crafting_recipe/food/cherryjellydonut name = "Cherry jelly donut" reqs = list( /datum/reagent/consumable/cherryjelly = 5, @@ -41,7 +41,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/cherryjelly category = CAT_FOOD -/datum/table_recipe/slimejellydonut +/datum/crafting_recipe/food/slimejellydonut name = "Slime jelly donut" reqs = list( /datum/reagent/toxin/slimejelly = 5, @@ -52,7 +52,7 @@ ////////////////////////////////////////////////WAFFLES//////////////////////////////////////////////// -/datum/table_recipe/waffles +/datum/crafting_recipe/food/waffles time = 15 name = "Waffles" reqs = list( @@ -62,7 +62,7 @@ category = CAT_FOOD -/datum/table_recipe/soylenviridians +/datum/crafting_recipe/food/soylenviridians name = "Soylent viridians" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2, @@ -71,7 +71,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soylenviridians category = CAT_FOOD -/datum/table_recipe/soylentgreen +/datum/crafting_recipe/food/soylentgreen name = "Soylent green" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2, @@ -81,7 +81,7 @@ category = CAT_FOOD -/datum/table_recipe/rofflewaffles +/datum/crafting_recipe/food/rofflewaffles name = "Roffle waffles" reqs = list( /datum/reagent/mushroomhallucinogen = 5, @@ -92,7 +92,7 @@ ////////////////////////////////////////////////DONKPOCCKETS//////////////////////////////////////////////// -/datum/table_recipe/donkpocket +/datum/crafting_recipe/food/donkpocket time = 15 name = "Donkpocket" reqs = list( @@ -105,7 +105,7 @@ ////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// -/datum/table_recipe/muffin +/datum/crafting_recipe/food/muffin time = 15 name = "Muffin" reqs = list( @@ -115,7 +115,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/muffin category = CAT_FOOD -/datum/table_recipe/berrymuffin +/datum/crafting_recipe/food/berrymuffin name = "Berry muffin" reqs = list( /datum/reagent/consumable/milk = 5, @@ -125,7 +125,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/muffin/berry category = CAT_FOOD -/datum/table_recipe/booberrymuffin +/datum/crafting_recipe/food/booberrymuffin name = "Booberry muffin" reqs = list( /datum/reagent/consumable/milk = 5, @@ -136,7 +136,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/muffin/booberry category = CAT_FOOD -/datum/table_recipe/chawanmushi +/datum/crafting_recipe/food/chawanmushi name = "Chawanmushi" reqs = list( /datum/reagent/water = 5, @@ -149,7 +149,7 @@ ////////////////////////////////////////////OTHER//////////////////////////////////////////// -/datum/table_recipe/hotdog +/datum/crafting_recipe/food/hotdog name = "Hot dog" reqs = list( /datum/reagent/consumable/ketchup = 5, @@ -159,7 +159,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/hotdog category = CAT_FOOD -/datum/table_recipe/meatbun +/datum/crafting_recipe/food/meatbun name = "Meat bun" reqs = list( /datum/reagent/consumable/soysauce = 5, @@ -170,7 +170,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/meatbun category = CAT_FOOD -/datum/table_recipe/sugarcookie +/datum/crafting_recipe/food/sugarcookie time = 15 name = "Sugar cookie" reqs = list( @@ -180,7 +180,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie category = CAT_FOOD -/datum/table_recipe/fortunecookie +/datum/crafting_recipe/food/fortunecookie time = 15 name = "Fortune cookie" reqs = list( @@ -193,7 +193,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie category = CAT_FOOD -/datum/table_recipe/poppypretzel +/datum/crafting_recipe/food/poppypretzel time = 15 name = "Poppy pretzel" reqs = list( @@ -203,7 +203,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel category = CAT_FOOD -/datum/table_recipe/plumphelmetbiscuit +/datum/crafting_recipe/food/plumphelmetbiscuit time = 15 name = "Plumphelmet biscuit" reqs = list( @@ -213,7 +213,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit category = CAT_FOOD -/datum/table_recipe/cracker +/datum/crafting_recipe/food/cracker time = 15 name = "Cracker" reqs = list( @@ -223,7 +223,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/cracker category = CAT_FOOD -/datum/table_recipe/chococornet +/datum/crafting_recipe/food/chococornet name = "Choco cornet" reqs = list( /datum/reagent/consumable/sodiumchloride = 1, @@ -233,7 +233,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/chococornet category = CAT_FOOD -/datum/table_recipe/oatmealcookie +/datum/crafting_recipe/food/oatmealcookie name = "Oatmeal cookie" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1, @@ -241,7 +241,7 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/oatmealcookie -/datum/table_recipe/raisincookie +/datum/crafting_recipe/food/raisincookie name = "Raisin cookie" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1, @@ -251,7 +251,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/raisincookie category = CAT_FOOD -/datum/table_recipe/cherrycupcake +/datum/crafting_recipe/food/cherrycupcake name = "Cherry cupcake" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1, @@ -260,7 +260,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/cherrycupcake category = CAT_FOOD -/datum/table_recipe/bluecherrycupcake +/datum/crafting_recipe/food/bluecherrycupcake name = "Blue cherry cupcake" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1, @@ -269,7 +269,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/bluecherrycupcake category = CAT_FOOD -/datum/table_recipe/honeybun +/datum/crafting_recipe/food/honeybun name = "Honey bun" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1, diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm index 19c72203735..f6e938ae478 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm @@ -3,7 +3,7 @@ ////////////////////////////////////////////////PIES//////////////////////////////////////////////// -/datum/table_recipe/bananacreampie +/datum/crafting_recipe/food/bananacreampie name = "Banana cream pie" reqs = list( /datum/reagent/consumable/milk = 5, @@ -13,7 +13,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/cream category = CAT_FOOD -/datum/table_recipe/meatpie +/datum/crafting_recipe/food/meatpie name = "Meat pie" reqs = list( /datum/reagent/consumable/blackpepper = 1, @@ -24,7 +24,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/meatpie category = CAT_FOOD -/datum/table_recipe/tofupie +/datum/crafting_recipe/food/tofupie name = "Tofu pie" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1, @@ -33,7 +33,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/tofupie category = CAT_FOOD -/datum/table_recipe/xenopie +/datum/crafting_recipe/food/xenopie name = "Xeno pie" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1, @@ -42,7 +42,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/xemeatpie category = CAT_FOOD -/datum/table_recipe/cherrypie +/datum/crafting_recipe/food/cherrypie name = "Cherry pie" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1, @@ -51,7 +51,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/cherrypie category = CAT_FOOD -/datum/table_recipe/berryclafoutis +/datum/crafting_recipe/food/berryclafoutis name = "Berry clafoutis" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1, @@ -60,7 +60,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/berryclafoutis category = CAT_FOOD -/datum/table_recipe/bearypie +/datum/crafting_recipe/food/bearypie name = "Beary Pie" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1, @@ -70,7 +70,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/bearypie category = CAT_FOOD -/datum/table_recipe/amanitapie +/datum/crafting_recipe/food/amanitapie name = "Amanita pie" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1, @@ -79,7 +79,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/amanita_pie category = CAT_FOOD -/datum/table_recipe/plumppie +/datum/crafting_recipe/food/plumppie name = "Plump pie" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1, @@ -88,7 +88,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/plump_pie category = CAT_FOOD -/datum/table_recipe/applepie +/datum/crafting_recipe/food/applepie name = "Apple pie" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1, @@ -97,7 +97,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/applepie category = CAT_FOOD -/datum/table_recipe/pumpkinpie +/datum/crafting_recipe/food/pumpkinpie name = "Pumpkin pie" reqs = list( /datum/reagent/consumable/milk = 5, @@ -108,7 +108,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/pumpkinpie category = CAT_FOOD -/datum/table_recipe/goldenappletart +/datum/crafting_recipe/food/goldenappletart name = "Golden apple tart" reqs = list( /datum/reagent/consumable/milk = 5, @@ -119,7 +119,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/appletart category = CAT_FOOD -/datum/table_recipe/grapetart +/datum/crafting_recipe/food/grapetart name = "Grape tart" reqs = list( /datum/reagent/consumable/milk = 5, @@ -130,7 +130,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/grapetart category = CAT_FOOD -/datum/table_recipe/blumpkinpie +/datum/crafting_recipe/food/blumpkinpie name = "Blumpkin pie" reqs = list( /datum/reagent/consumable/milk = 5, @@ -141,7 +141,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/blumpkinpie category = CAT_FOOD -/datum/table_recipe/dulcedebatata +/datum/crafting_recipe/food/dulcedebatata name = "Dulce de batata" reqs = list( /datum/reagent/consumable/vanilla = 5, @@ -151,7 +151,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pie/dulcedebatata category = CAT_FOOD -/datum/table_recipe/frostypie +/datum/crafting_recipe/food/frostypie name = "Frosty pie" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1, diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_pizza.dm index 3d34dcd93d6..f7627e2e07f 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_pizza.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_pizza.dm @@ -3,7 +3,7 @@ ////////////////////////////////////////////////PIZZA!!!//////////////////////////////////////////////// -/datum/table_recipe/margheritapizza +/datum/crafting_recipe/food/margheritapizza name = "Margherita pizza" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pizzabread = 1, @@ -13,7 +13,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pizza/margherita category = CAT_FOOD -/datum/table_recipe/meatpizza +/datum/crafting_recipe/food/meatpizza name = "Meat pizza" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pizzabread = 1, @@ -24,7 +24,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pizza/meat category = CAT_FOOD -/datum/table_recipe/mushroompizza +/datum/crafting_recipe/food/mushroompizza name = "Mushroom pizza" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pizzabread = 1, @@ -33,7 +33,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pizza/mushroom category = CAT_FOOD -/datum/table_recipe/vegetablepizza +/datum/crafting_recipe/food/vegetablepizza name = "Vegetable pizza" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pizzabread = 1, @@ -45,7 +45,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pizza/vegetable category = CAT_FOOD -/datum/table_recipe/donpocketpizza +/datum/crafting_recipe/food/donpocketpizza name = "Donkpocket pizza" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pizzabread = 1, @@ -56,7 +56,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pizza/donkpocket category = CAT_FOOD -/datum/table_recipe/dankpizza +/datum/crafting_recipe/food/dankpizza name = "Dank pizza" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pizzabread = 1, @@ -67,7 +67,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pizza/dank category = CAT_FOOD -/datum/table_recipe/sassysagepizza +/datum/crafting_recipe/food/sassysagepizza name = "Sassysage pizza" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pizzabread = 1, diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_salad.dm index 95752809085..fc4633253f0 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_salad.dm @@ -3,7 +3,7 @@ ////////////////////////////////////////////////SALADS//////////////////////////////////////////////// -/datum/table_recipe/herbsalad +/datum/crafting_recipe/food/herbsalad name = "Herb salad" reqs = list( /obj/item/weapon/reagent_containers/glass/bowl = 1, @@ -13,7 +13,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/salad/herbsalad category = CAT_FOOD -/datum/table_recipe/aesirsalad +/datum/crafting_recipe/food/aesirsalad name = "Aesir salad" reqs = list( /obj/item/weapon/reagent_containers/glass/bowl = 1, @@ -23,7 +23,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/salad/aesirsalad category = CAT_FOOD -/datum/table_recipe/validsalad +/datum/crafting_recipe/food/validsalad name = "Valid salad" reqs = list( /obj/item/weapon/reagent_containers/glass/bowl = 1, @@ -34,7 +34,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/salad/validsalad category = CAT_FOOD -/datum/table_recipe/monkeysdelight +/datum/crafting_recipe/food/monkeysdelight name = "Monkeys delight" reqs = list( /datum/reagent/consumable/flour = 5, @@ -47,7 +47,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/monkeysdelight category = CAT_FOOD -/datum/table_recipe/oatmeal +/datum/crafting_recipe/food/oatmeal name = "Oatmeal" reqs = list( /datum/reagent/consumable/milk = 10, @@ -57,7 +57,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/salad/oatmeal category = CAT_FOOD -/datum/table_recipe/fruitsalad +/datum/crafting_recipe/food/fruitsalad name = "Fruit salad" reqs = list( /obj/item/weapon/reagent_containers/glass/bowl = 1, @@ -70,7 +70,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/salad/fruit category = CAT_FOOD -/datum/table_recipe/junglesalad +/datum/crafting_recipe/food/junglesalad name = "Jungle salad" reqs = list( /obj/item/weapon/reagent_containers/glass/bowl = 1, @@ -83,7 +83,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/salad/jungle category = CAT_FOOD -/datum/table_recipe/citrusdelight +/datum/crafting_recipe/food/citrusdelight name = "Citrus delight" reqs = list( /obj/item/weapon/reagent_containers/glass/bowl = 1, @@ -95,7 +95,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/salad/citrusdelight category = CAT_FOOD -/datum/table_recipe/ricepork +/datum/crafting_recipe/food/ricepork name = "Rice and pork" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice = 1, @@ -104,7 +104,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/salad/ricepork category = CAT_FOOD -/datum/table_recipe/eggbowl +/datum/crafting_recipe/food/eggbowl name = "Egg bowl" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice = 1, @@ -115,7 +115,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/salad/eggbowl category = CAT_FOOD -/datum/table_recipe/ricepudding +/datum/crafting_recipe/food/ricepudding name = "Rice pudding" reqs = list( /datum/reagent/consumable/milk = 5, diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_sandwich.dm index a4f14d0a280..630430e2d36 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_sandwich.dm @@ -6,7 +6,7 @@ ////////////////////////////////////////////////SANDWICHES//////////////////////////////////////////////// -/datum/table_recipe/sandwich +/datum/crafting_recipe/food/sandwich name = "Sandwich" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 2, @@ -16,7 +16,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/sandwich category = CAT_FOOD -/datum/table_recipe/grilledcheesesandwich +/datum/crafting_recipe/food/grilledcheesesandwich name = "Grilled cheese sandwich" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 2, @@ -25,7 +25,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/grilledcheese category = CAT_FOOD -/datum/table_recipe/slimesandwich +/datum/crafting_recipe/food/slimesandwich name = "Jelly sandwich" reqs = list( /datum/reagent/toxin/slimejelly = 5, @@ -34,7 +34,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime category = CAT_FOOD -/datum/table_recipe/cherrysandwich +/datum/crafting_recipe/food/cherrysandwich name = "Jelly sandwich" reqs = list( /datum/reagent/consumable/cherryjelly = 5, @@ -43,7 +43,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry category = CAT_FOOD -/datum/table_recipe/icecreamsandwich +/datum/crafting_recipe/food/icecreamsandwich name = "Icecream sandwich" reqs = list( /datum/reagent/consumable/cream = 5, @@ -53,7 +53,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich category = CAT_FOOD -/datum/table_recipe/notasandwich +/datum/crafting_recipe/food/notasandwich name = "Not a sandwich" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 2, diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_soup.dm index 082fb2b352f..3df5c6b8ca8 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_soup.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_soup.dm @@ -3,7 +3,7 @@ ////////////////////////////////////////////////SOUP//////////////////////////////////////////////// -/datum/table_recipe/meatballsoup +/datum/crafting_recipe/food/meatballsoup name = "Meatball soup" reqs = list( /datum/reagent/water = 10, @@ -15,7 +15,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/meatball category = CAT_FOOD -/datum/table_recipe/vegetablesoup +/datum/crafting_recipe/food/vegetablesoup name = "Vegetable soup" reqs = list( /datum/reagent/water = 10, @@ -28,7 +28,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/vegetable category = CAT_FOOD -/datum/table_recipe/nettlesoup +/datum/crafting_recipe/food/nettlesoup name = "Nettle soup" reqs = list( /datum/reagent/water = 10, @@ -40,7 +40,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/nettle category = CAT_FOOD -/datum/table_recipe/wingfangchu +/datum/crafting_recipe/food/wingfangchu name = "Wingfangchu" reqs = list( /obj/item/weapon/reagent_containers/glass/bowl = 1, @@ -50,7 +50,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/wingfangchu category = CAT_FOOD -/datum/table_recipe/wishsoup +/datum/crafting_recipe/food/wishsoup name = "Wish soup" reqs = list( /datum/reagent/water = 20, @@ -59,7 +59,7 @@ result= /obj/item/weapon/reagent_containers/food/snacks/soup/wish category = CAT_FOOD -/datum/table_recipe/hotchili +/datum/crafting_recipe/food/hotchili name = "Hot chili" reqs = list( /obj/item/weapon/reagent_containers/glass/bowl = 1, @@ -70,7 +70,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/hotchili category = CAT_FOOD -/datum/table_recipe/coldchili +/datum/crafting_recipe/food/coldchili name = "Cold chili" reqs = list( /obj/item/weapon/reagent_containers/glass/bowl = 1, @@ -81,7 +81,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/coldchili category = CAT_FOOD -/datum/table_recipe/tomatosoup +/datum/crafting_recipe/food/tomatosoup name = "Tomato soup" reqs = list( /datum/reagent/water = 10, @@ -91,7 +91,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/tomato category = CAT_FOOD -/datum/table_recipe/milosoup +/datum/crafting_recipe/food/milosoup name = "Milo soup" reqs = list( /datum/reagent/water = 10, @@ -102,7 +102,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/milo category = CAT_FOOD -/datum/table_recipe/bloodsoup +/datum/crafting_recipe/food/bloodsoup name = "Blood soup" reqs = list( /datum/reagent/blood = 10, @@ -112,7 +112,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/blood category = CAT_FOOD -/datum/table_recipe/slimesoup +/datum/crafting_recipe/food/slimesoup name = "Slime soup" reqs = list( /datum/reagent/water = 10, @@ -122,7 +122,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/slime category = CAT_FOOD -/datum/table_recipe/clownstears +/datum/crafting_recipe/food/clownstears name = "Clowns tears" reqs = list( /datum/reagent/water = 10, @@ -133,7 +133,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/clownstears category = CAT_FOOD -/datum/table_recipe/mysterysoup +/datum/crafting_recipe/food/mysterysoup name = "Mystery soup" reqs = list( /datum/reagent/water = 10, @@ -146,7 +146,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/mystery category = CAT_FOOD -/datum/table_recipe/mushroomsoup +/datum/crafting_recipe/food/mushroomsoup name = "Mushroom soup" reqs = list( /datum/reagent/consumable/milk = 5, @@ -157,7 +157,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/mushroom category = CAT_FOOD -/datum/table_recipe/beetsoup +/datum/crafting_recipe/food/beetsoup name = "Beet soup" reqs = list( /datum/reagent/water = 10, @@ -168,7 +168,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/beet category = CAT_FOOD -/datum/table_recipe/stew +/datum/crafting_recipe/food/stew name = "Stew" reqs = list( /datum/reagent/water = 10, @@ -183,7 +183,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/stew category = CAT_FOOD -/datum/table_recipe/spacylibertyduff +/datum/crafting_recipe/food/spacylibertyduff name = "Spacy liberty duff" reqs = list( /datum/reagent/consumable/ethanol/vodka = 5, @@ -193,7 +193,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/spacylibertyduff category = CAT_FOOD -/datum/table_recipe/amanitajelly +/datum/crafting_recipe/food/amanitajelly name = "Amanita jelly" reqs = list( /datum/reagent/consumable/ethanol/vodka = 5, @@ -203,7 +203,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/amanitajelly category = CAT_FOOD -/datum/table_recipe/sweetpotatosoup +/datum/crafting_recipe/food/sweetpotatosoup name = "Sweet potato soup" reqs = list( /datum/reagent/water = 10, @@ -214,7 +214,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/sweetpotato category = CAT_FOOD -/datum/table_recipe/redbeetsoup +/datum/crafting_recipe/food/redbeetsoup name = "Red beet soup" reqs = list( /datum/reagent/water = 10, diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_spaghetti.dm index cbbcf0e6b1e..fb0ba863409 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_spaghetti.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_spaghetti.dm @@ -3,7 +3,7 @@ ////////////////////////////////////////////////SPAGHETTI//////////////////////////////////////////////// -/datum/table_recipe/tomatopasta +/datum/crafting_recipe/food/tomatopasta name = "Tomato pasta" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti = 1, @@ -12,7 +12,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pastatomato category = CAT_FOOD -/datum/table_recipe/copypasta +/datum/crafting_recipe/food/copypasta name = "Copypasta" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/pastatomato = 2 @@ -20,7 +20,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/copypasta category = CAT_FOOD -/datum/table_recipe/spaghettimeatball +/datum/crafting_recipe/food/spaghettimeatball name = "Spaghetti meatball" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti = 1, @@ -29,7 +29,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti category = CAT_FOOD -/datum/table_recipe/spesslaw +/datum/crafting_recipe/food/spesslaw name = "Spesslaw" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti = 1, @@ -38,7 +38,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw category = CAT_FOOD -/datum/table_recipe/beefnoodle +/datum/crafting_recipe/food/beefnoodle name = "Beef noodle" reqs = list( /obj/item/weapon/reagent_containers/glass/bowl = 1, @@ -49,7 +49,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/beefnoodle category = CAT_FOOD -/datum/table_recipe/chowmein +/datum/crafting_recipe/food/chowmein name = "Chowmein" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti = 1, diff --git a/code/modules/games/cas.dm b/code/modules/games/cas.dm index 8f1616f882e..ebf6a8bd4a8 100644 --- a/code/modules/games/cas.dm +++ b/code/modules/games/cas.dm @@ -13,7 +13,7 @@ var/global/list/cards_against_space icon_state = "deck_caswhite_full" deckstyle = "caswhite" var/card_face = "cas_white" - var/blanks = 10 + var/blanks = 25 var/decksize = 150 var/card_text_file = "strings/cas_white.txt" var/list/allcards = list() @@ -116,7 +116,7 @@ var/global/list/cards_against_space set name = "Flip Card" set category = "Object" set src in range(1) - if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained()) + if(!usr.canUseTopic(src,1)) return if(!flipped) name = "CAS card" @@ -125,6 +125,11 @@ var/global/list/cards_against_space flipped = !flipped update_icon() +obj/item/toy/cards/singlecard/cas/AltClick(mob/living/user) + if(!user.canUseTopic(src,1)) + return + Flip() + /obj/item/toy/cards/singlecard/cas/update_icon() if(flipped) icon_state = "[card_face]_flipped" diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 2cb75a65e7c..d233ea1362c 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -151,7 +151,7 @@ desc = "The Cross represents the Assistants that died for your sins." icon_state = "hotcrossbun" -/datum/table_recipe/hotcrossbun +/datum/crafting_recipe/food/food/hotcrossbun name = "Hot-Cross Bun" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1, @@ -175,7 +175,7 @@ icon_state = "briochecake_slice" filling_color = "#FFD700" -/datum/table_recipe/briochecake +/datum/crafting_recipe/food/food/briochecake name = "Brioche cake" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1, @@ -193,7 +193,7 @@ filling_color = "#FFFFF0" list_reagents = list("nutriment" = 6) -/datum/table_recipe/scotchegg +/datum/crafting_recipe/food/scotchegg name = "Scotch egg" reqs = list( /datum/reagent/consumable/sodiumchloride = 1, @@ -211,7 +211,7 @@ bonus_reagents = list("nutriment" = 3, "vitamin" = 1) list_reagents = list("nutriment" = 8, "vitamin" = 1) -/datum/table_recipe/mammi +/datum/crafting_recipe/food/mammi name = "Mämmi" reqs = list( /obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1, @@ -229,7 +229,7 @@ list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2) filling_color = "#A0522D" -/datum/table_recipe/chocolatebunny +/datum/crafting_recipe/food/chocolatebunny name = "Chocolate bunny" reqs = list( /datum/reagent/consumable/sugar = 2, diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 40f012af0d3..4f120caf00e 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -188,15 +188,15 @@ var/obj/item/seeds/seed = G.seed var/mob/living/carbon/M = target - var/stun_len = seed.potency * rate + var/stun_len = seed.potency * rate * 0.8 if(istype(G) && ispath(G.trash, /obj/item/weapon/grown)) return if(!istype(G, /obj/item/weapon/grown/bananapeel) && (!G.reagents || !G.reagents.has_reagent("lube"))) stun_len /= 3 - var/stun = max(stun_len * 2, 1) - var/weaken = max(stun_len, 0.5) + var/stun = min(stun_len, 7) + var/weaken = min(stun_len, 7) if(M.slip(stun, weaken, G)) for(var/datum/plant_gene/trait/T in seed.genes) @@ -309,4 +309,4 @@ /datum/plant_gene/trait/maxchem/on_new(obj/item/weapon/reagent_containers/food/snacks/grown/G, newloc) ..() - G.reagents.maximum_volume *= rate \ No newline at end of file + G.reagents.maximum_volume *= rate diff --git a/code/modules/jobs/job_types/cargo_service.dm b/code/modules/jobs/job_types/cargo_service.dm index ed87fcae838..d13ad0987d7 100644 --- a/code/modules/jobs/job_types/cargo_service.dm +++ b/code/modules/jobs/job_types/cargo_service.dm @@ -78,7 +78,7 @@ Shaft Miner belt = /obj/item/device/pda/shaftminer ears = /obj/item/device/radio/headset/headset_cargo - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/workboots/mining gloves = /obj/item/clothing/gloves/color/black uniform = /obj/item/clothing/under/rank/miner/lavaland l_pocket = /obj/item/weapon/reagent_containers/pill/patch/styptic @@ -88,9 +88,9 @@ Shaft Miner /obj/item/weapon/kitchen/knife/combat/survival=1,\ /obj/item/weapon/mining_voucher=1) - backpack = /obj/item/weapon/storage/backpack/security - satchel = /obj/item/weapon/storage/backpack/satchel_sec - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/sec + backpack = /obj/item/weapon/storage/backpack/explorer + satchel = /obj/item/weapon/storage/backpack/satchel_explorer + dufflebag = /obj/item/weapon/storage/backpack/dufflebag box = /obj/item/weapon/storage/box/engineer /* diff --git a/code/modules/library/lib_demonomicon.dm b/code/modules/library/lib_demonomicon.dm index 88a10b0720b..03f62d84d2b 100644 --- a/code/modules/library/lib_demonomicon.dm +++ b/code/modules/library/lib_demonomicon.dm @@ -30,13 +30,13 @@ var/devilName = copytext(sanitize(input(user, "What infernal being do you wish to research?", "Codex Gigas", null) as text),1,MAX_MESSAGE_LEN) var/speed = 300 var/correctness = 85 - var/willpower = 80 + var/willpower = 98 if(U.job in list("Librarian")) // the librarian is both faster, and more accurate than normal crew members at research speed = 45 correctness = 100 - willpower = 95 + willpower = 100 if(U.job in list("Captain", "Security Officer", "Head of Security", "Detective", "Warden")) - willpower = 90 + willpower = 99 if(U.job in list("Clown")) // WHO GAVE THE CLOWN A DEMONOMICON? BAD THINGS WILL HAPPEN! willpower = 25 correctness -= U.getBrainLoss() *0.5 //Brain damage makes researching hard. diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index 399cae5df69..25dcce3a9fb 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -174,6 +174,11 @@ /obj/structure/closet/crate/secure/loot/attack_animal(mob/user) boom(user) +/obj/structure/closet/crate/secure/loot/AltClick(mob/living/user) + if(!user.canUseTopic(src)) + return + attack_hand(user) + /obj/structure/closet/crate/secure/loot/attackby(obj/item/weapon/W, mob/user) if(locked) if(istype(W, /obj/item/weapon/card/emag)) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 9503ed2808b..6d89f9d90b0 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -295,15 +295,18 @@ new /datum/data/mining_equipment("Hivelord Stabilizer", /obj/item/weapon/hivelordstabilizer , 400), new /datum/data/mining_equipment("Shelter Capsule", /obj/item/weapon/survivalcapsule , 400), new /datum/data/mining_equipment("GAR scanners", /obj/item/clothing/glasses/meson/gar, 500), - new /datum/data/mining_equipment("Explorer Belt", /obj/item/weapon/storage/belt/mining, 500), + new /datum/data/mining_equipment("Explorer's Webbing", /obj/item/weapon/storage/belt/mining, 500), + new /datum/data/mining_equipment("Survival Medipen", /obj/item/weapon/reagent_containers/hypospray/medipen/survival, 500), new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/weapon/storage/firstaid/brute, 600), - new /datum/data/mining_equipment("Jaunter", /obj/item/device/wormhole_jaunter, 600), + new /datum/data/mining_equipment("Tracking Implant Kit",/obj/item/weapon/storage/box/minertracker, 600), + new /datum/data/mining_equipment("Jaunter", /obj/item/device/wormhole_jaunter, 750), new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 750), new /datum/data/mining_equipment("Resonator", /obj/item/weapon/resonator, 800), new /datum/data/mining_equipment("Lazarus Injector", /obj/item/weapon/lazarus_injector, 1000), new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/weapon/pickaxe/silver, 1000), - new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/hardsuit_jetpack , 2000), + new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/hardsuit_jetpack, 2000), new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000), + new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000), new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 2000), new /datum/data/mining_equipment("Super Resonator", /obj/item/weapon/resonator/upgraded, 2500), new /datum/data/mining_equipment("Super Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator/super, 3000), @@ -426,11 +429,11 @@ return ..() /obj/machinery/mineral/equipment_vendor/proc/RedeemVoucher(obj/item/weapon/mining_voucher/voucher, mob/redeemer) - var/selection = input(redeemer, "Pick your equipment", "Mining Voucher Redemption") as null|anything in list("Survival Capsule and Explorer Belt", "Resonator", "Mining Drone", "Advanced Scanner") + var/selection = input(redeemer, "Pick your equipment", "Mining Voucher Redemption") as null|anything in list("Survival Capsule and Explorer's Webbing", "Resonator", "Mining Drone", "Advanced Scanner") if(!selection || !Adjacent(redeemer) || qdeleted(voucher) || voucher.loc != redeemer) return switch(selection) - if("Survival Capsule and Explorer Belt") + if("Survival Capsule and Explorer's Webbing") new /obj/item/weapon/storage/belt/mining(src.loc) new /obj/item/weapon/survivalcapsule(src.loc) if("Resonator") @@ -512,15 +515,31 @@ return FALSE return TRUE +/obj/item/device/wormhole_jaunter/proc/get_destinations(mob/user) + var/list/destinations = list() + + if(isgolem(user)) + for(var/obj/item/device/radio/beacon/B in world) + var/turf/T = get_turf(B) + if(istype(T.loc, /area/ruin/powered/golem_ship)) + destinations += B + + // In the event golem beacon is destroyed, send to station instead + if(destinations.len) + return destinations + + for(var/obj/item/device/radio/beacon/B in world) + var/turf/T = get_turf(B) + if(T.z == ZLEVEL_STATION) + destinations += B + + return destinations + /obj/item/device/wormhole_jaunter/proc/activate(mob/user) if(!turf_check(user)) return - var/list/L = list() - for(var/obj/item/device/radio/beacon/B in world) - var/turf/T = get_turf(B) - if(T.z == ZLEVEL_STATION) - L += B + var/list/L = get_destinations(user) if(!L.len) user << "The [src.name] found no beacons in the world to anchor a wormhole to." return @@ -1124,44 +1143,32 @@ /obj/machinery/mineral/equipment_vendor/golem name = "golem ship equipment vendor" - desc = "A modified mining equipment vendor. It seems a few selections were replaced." - prize_list = list( - new /datum/data/mining_equipment("Stimpack", /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack, 50), - new /datum/data/mining_equipment("Stimpack Bundle", /obj/item/weapon/storage/box/medipens/utility, 200), - new /datum/data/mining_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 100), - new /datum/data/mining_equipment("Absinthe", /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe/premium,100), - new /datum/data/mining_equipment("Soap", /obj/item/weapon/soap/nanotrasen, 200), - new /datum/data/mining_equipment("Science Goggles", /obj/item/clothing/glasses/science, 250), - new /datum/data/mining_equipment("Laser Pointer", /obj/item/device/laser_pointer, 300), - new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300), - new /datum/data/mining_equipment("Monkey Cube", /obj/item/weapon/reagent_containers/food/snacks/monkeycube, 300), - new /datum/data/mining_equipment("Toolbelt", /obj/item/weapon/storage/belt/utility, 350), - new /datum/data/mining_equipment("Stabilizing Serum", /obj/item/weapon/hivelordstabilizer, 400), - new /datum/data/mining_equipment("Shelter Capsule", /obj/item/weapon/survivalcapsule, 400), - new /datum/data/mining_equipment("GAR scanners", /obj/item/clothing/glasses/meson/gar, 500), - new /datum/data/mining_equipment("Sulphuric Acid", /obj/item/weapon/reagent_containers/glass/beaker/sulphuric, 500), - new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/weapon/storage/firstaid/brute, 600), - new /datum/data/mining_equipment("Advanced Scanner", /obj/item/device/t_scanner/adv_mining_scanner, 800), - new /datum/data/mining_equipment("Resonator", /obj/item/weapon/resonator, 800), - new /datum/data/mining_equipment("Lazarus Injector", /obj/item/weapon/lazarus_injector, 1000), - new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/weapon/pickaxe/silver, 1000), - new /datum/data/mining_equipment("Grey Slime Extract", /obj/item/slime_extract/grey, 1000), - new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 2000), - new /datum/data/mining_equipment("Super Resonator", /obj/item/weapon/resonator/upgraded, 2500), - new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card, 500), - new /datum/data/mining_equipment("Mining Drone", /mob/living/simple_animal/hostile/mining_drone, 800), - new /datum/data/mining_equipment("Drone Melee Upgrade", /obj/item/device/mine_bot_ugprade, 400), - new /datum/data/mining_equipment("Drone Health Upgrade", /obj/item/device/mine_bot_ugprade/health, 400), - new /datum/data/mining_equipment("Drone Ranged Upgrade", /obj/item/device/mine_bot_ugprade/cooldown, 600), - new /datum/data/mining_equipment("Drone AI Upgrade", /obj/item/slimepotion/sentience/mining, 1000), - new /datum/data/mining_equipment("The Liberator's Legacy", /obj/item/weapon/storage/box/rndboards, 2000), - ) /obj/machinery/mineral/equipment_vendor/golem/New() ..() - var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/mining_equipment_vendor/golem(null) - B.apply_default_parts(src) + desc += "\nIt seems a few selections have been added." + prize_list += list( + new /datum/data/mining_equipment("Science Goggles", /obj/item/clothing/glasses/science, 250), + new /datum/data/mining_equipment("Monkey Cube", /obj/item/weapon/reagent_containers/food/snacks/monkeycube, 300), + new /datum/data/mining_equipment("Toolbelt", /obj/item/weapon/storage/belt/utility, 350), + new /datum/data/mining_equipment("Sulphuric Acid", /obj/item/weapon/reagent_containers/glass/beaker/sulphuric, 500), + new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/weapon/storage/firstaid/brute, 600), + new /datum/data/mining_equipment("Grey Slime Extract", /obj/item/slime_extract/grey, 1000), + new /datum/data/mining_equipment("Modification Kit", /obj/item/modkit, 1700), + new /datum/data/mining_equipment("The Liberator's Legacy", /obj/item/weapon/storage/box/rndboards, 2000), + + ) + + + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/machine/mining_equipment_vendor/golem(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + RefreshParts() /obj/item/weapon/circuitboard/machine/mining_equipment_vendor/golem name = "circuit board (Golem Ship Equipment Vendor)" build_path = /obj/machinery/mineral/equipment_vendor/golem + diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 4ff2c3d0c03..e367f1d425a 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -15,8 +15,7 @@ if(1) new /obj/item/device/shared_storage/red(src) if(2) - new /obj/item/clothing/suit/space/cult(src) - new /obj/item/clothing/head/helmet/space/cult(src) + new /obj/item/clothing/suit/space/hardsuit/cult(src) if(3) new /obj/item/device/soulstone/anybody(src) if(4) @@ -368,14 +367,14 @@ w_class = 3 burn_state = LAVA_PROOF -/datum/table_recipe/oar +/datum/crafting_recipe/oar name = "goliath bone oar" result = /obj/item/weapon/oar reqs = list(/obj/item/stack/sheet/bone = 2) time = 15 category = CAT_PRIMAL -/datum/table_recipe/boat +/datum/crafting_recipe/boat name = "goliath hide boat" result = /obj/vehicle/lavaboat reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide = 3) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index c577ca74bee..457554c2300 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -458,6 +458,13 @@ max_n_of_items = 10 pixel_y = -4 +/obj/machinery/smartfridge/survival_pod/empty + name = "dusty survival pod storage" + desc = "A heated storage unit. This ones seen better days." + +/obj/machinery/smartfridge/survival_pod/empty/New() + return() + /obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O) if(istype(O, /obj/item)) return 1 diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index d54b00a1a73..5d1b16ff14c 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -4,6 +4,7 @@ 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 @@ -14,18 +15,19 @@ layer = MOB_LAYER + 0.05 temperature = TCMB var/environment_type = "asteroid" - var/turf/open/floor/plating/asteroid/turf_type = /turf/open/floor/plating/asteroid/airless + 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 = 'icons/turf/smoothrocks.dmi' + icon = smooth_icon ..() if (mineralType && mineralAmt && spread && spreadChance) for(var/dir in cardinal) @@ -240,7 +242,8 @@ if(det_time >= 1 && det_time <= 2) G.quality = 2 G.icon_state = "Gibtonite ore 2" - ChangeTurf(turf_type) + ChangeTurf(turf_type, defer_change) + AfterChange() /turf/closed/mineral/gibtonite/volcanic initial_gas_mix = "o2=14;n2=23;TEMP=300" @@ -371,7 +374,8 @@ for (i=0;i
" dat += "Temperature: [round(environment.temperature-T0C)]°C
" dat += "Refresh Reading
" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 3d1ebfaa7cd..0ac2332ed47 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -555,7 +555,10 @@ if(emagged || (connected_ai && lawupdate)) //Can't be sure which, metagamers emote("buzz-[user.name]") return - MOD.install(src, user) //Proc includes a success mesage so we don't need another one + if(!mind) //A player mind is required for law procs to run antag checks. + user << "[src] is entirely unresponsive!" + return + MOD.install(laws, user) //Proc includes a success mesage so we don't need another one return else if(istype(W, /obj/item/device/encryptionkey/) && opened) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 0f4ecdb8946..45257c61186 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -294,7 +294,7 @@ modules += new /obj/item/weapon/shovel(src) modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src) modules += new /obj/item/device/t_scanner/adv_mining_scanner(src) - modules += new /obj/item/weapon/gun/energy/kinetic_accelerator(src) + modules += new /obj/item/weapon/gun/energy/kinetic_accelerator/cyborg(src) fix_modules() /obj/item/weapon/robot_module/syndicate diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 208bd2da166..42d1c25a729 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -489,3 +489,5 @@ animate(src, transform = ntransform, time = 2,easing = EASE_IN|EASE_OUT) return ..() +/mob/living/silicon/is_literate() + return 1 diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index a21e2bd2bf5..4cbd52fc410 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -61,6 +61,7 @@ var/new_destination // pending new destination (waiting for beacon response) var/destination // destination description tag var/next_destination // the next destination in the patrol route + var/shuffle = FALSE // If we should shuffle our adjacency checking var/blockcount = 0 //number of times retried a blocked path var/awaiting_beacon = 0 // count of pticks awaiting a beacon response @@ -144,6 +145,9 @@ qdel(bot_core) return ..() +/mob/living/simple_animal/bot/bee_friendly() + return 1 + /mob/living/simple_animal/bot/death(gibbed) explode() ..() @@ -371,18 +375,50 @@ The proc would return a human next to the bot to be set to the patient var. Pass the desired type path itself, declaring a temporary var beforehand is not required. */ /mob/living/simple_animal/bot/proc/scan(scan_type, old_target, scan_range = DEFAULT_SCAN_RANGE) - var/final_result - for (var/scan in shuffle(view(scan_range, src))) //Search for something in range! - if(!istype(scan, scan_type)) //Check that the thing we found is the type we want! - continue //If not, keep searching! - if( (scan in ignore_list) || (scan == old_target) ) //Filter for blacklisted elements, usually unreachable or previously processed oness + var/turf/T = get_turf(src) + if(!T) + return + var/list/adjacent = T.GetAtmosAdjacentTurfs(1) + if(shuffle) //If we were on the same tile as another bot, let's randomize our choices so we dont both go the same way + adjacent = shuffle(adjacent) + shuffle = FALSE + for(var/scan in adjacent)//Let's see if there's something right next to us first! + if(check_bot(scan)) //Is there another bot there? Then let's just skip it continue - var/scan_result = process_scan(scan) //Some bots may require additional processing when a result is selected. - if(scan_result) - final_result = scan_result + if(isturf(scan_type)) //If we're lookeing for a turf we can just run the checks directly! + var/final_result = checkscan(scan,scan_type,old_target) + if(final_result) + return final_result else - continue //The current element failed assessment, move on to the next. - return final_result + var/turf/turfy = scan + for(var/deepscan in turfy.contents)//Check the contents since adjacent is turfs + var/final_result = checkscan(deepscan,scan_type,old_target) + if(final_result) + return final_result + for (var/scan in shuffle(view(scan_range, src))-adjacent) //Search for something in range! + var/final_result = checkscan(scan,scan_type,old_target) + if(final_result) + return final_result + +/mob/living/simple_animal/bot/proc/checkscan(scan, scan_type, old_target) + if(!istype(scan, scan_type)) //Check that the thing we found is the type we want! + return 0 //If not, keep searching! + if( (scan in ignore_list) || (scan == old_target) ) //Filter for blacklisted elements, usually unreachable or previously processed oness + return 0 + + var/scan_result = process_scan(scan) //Some bots may require additional processing when a result is selected. + if(scan_result) + return scan_result + else + return 0 //The current element failed assessment, move on to the next. + return + +/mob/living/simple_animal/bot/proc/check_bot(targ) + var/turf/T = get_turf(targ) + if(T) + for(var/C in T.contents) + if(istype(C,type) && (C != src)) //Is there another bot there already? If so, let's skip it so we dont all atack on top of eachother. + return 1 //Let's abort if we find a bot so we dont have to keep rechecking //When the scan finds a target, run bot specific processing to select it for the next step. Empty by default. /mob/living/simple_animal/bot/proc/process_scan(scan_target) diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index 5c00a4fc3bf..00892f702b7 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -140,7 +140,10 @@ return if(target && loc == target.loc) - clean(target) + if(!(check_bot(target) && prob(50))) //Target is not defined at the parent. 50% chance to still try and clean so we dont get stuck on the last blood drop. + clean(target) //Rather than check at every step of the way, let's check before we do an action, so we can rescan before the other bot. + else + shuffle = TRUE //Shuffle the list the next time we scan so we dont both go the same way. path = list() target = null diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index 8ba86a9b2d7..8956f7872a6 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -81,7 +81,7 @@ dat += "Loaded \[[specialtiles]/[maxtiles]\]
" else dat += "None Loaded
" - + dat += "Behaviour controls are [locked ? "locked" : "unlocked"]
" if(!locked || issilicon(user) || IsAdminGhost(user)) dat += "Add tiles to new hull plating: [autotile ? "Yes" : "No"]
" @@ -162,7 +162,7 @@ if("disable") targetdirection = null update_controls() - + /mob/living/simple_animal/bot/floorbot/proc/empty_tiles() var/turf/Tsec = get_turf(src) @@ -204,7 +204,7 @@ if(!target && fixfloors) //Repairs damaged floors and tiles. process_type = FIX_TILE target = scan(/turf/open/floor) - + if(!target && replacetiles && specialtiles > 0) //Replace a floor tile with custom tile process_type = REPLACE_TILE //The target must be a tile. The floor must already have a floortile. target = scan(/turf/open/floor) @@ -242,6 +242,12 @@ return if(loc == target || loc == target.loc) + if(check_bot(target)) //Target is not defined at the parent + shuffle = TRUE + if(prob(50)) //50% chance to still try to repair so we dont end up with 2 floorbots failing to fix the last breach + target = null + path = list() + return if(istype(target, /turf/) && emagged < 2) repair(target) else if(emagged == 2 && istype(target,/turf/open/floor)) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index c7ed281b154..f1d0ececa64 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -24,6 +24,8 @@ pressure_resistance = 200 unique_name = 1 AIStatus = AI_OFF //normal constructs don't have AI + loot = list(/obj/item/weapon/ectoplasm) + del_on_death = 1 var/list/construct_spells = list() var/playstyle_string = "You are a generic construct! Your job is to not exist, and you should probably adminhelp this." @@ -34,12 +36,8 @@ AddSpell(new spell(null)) /mob/living/simple_animal/hostile/construct/death() - ..(1) - new /obj/item/weapon/ectoplasm (src.loc) - visible_message("[src] collapses in a shattered heap.") - ghostize() - qdel(src) - return + deathmessage = "[src] collapses in a shattered heap." + ..() /mob/living/simple_animal/hostile/construct/examine(mob/user) var/msg = "*---------*\nThis is \icon[src] \a [src]!\n" @@ -183,12 +181,12 @@ /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser, /obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser) playstyle_string = "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, \ - use magic missile, repair allied constructs (by clicking on them), \ + use magic missile, repair allied constructs, shades, and yourself (by clicking on them), \ and, most important of all, create new constructs by producing soulstones to capture souls, \ and shells to place those soulstones into." /mob/living/simple_animal/hostile/construct/builder/Found(atom/A) //what have we found here? - if(istype(A, /mob/living/simple_animal/hostile/construct)) //is it a construct? + if(isconstruct(A)) //is it a construct? var/mob/living/simple_animal/hostile/construct/C = A if(C.health < C.maxHealth) //is it hurt? let's go heal it if it is return 1 @@ -207,7 +205,7 @@ ..() if(isliving(target)) var/mob/living/L = target - if(istype(L, /mob/living/simple_animal/hostile/construct) && L.health >= L.maxHealth) //is this target an unhurt construct? stop trying to heal it + if(isconstruct(L) && L.health >= L.maxHealth) //is this target an unhurt construct? stop trying to heal it LoseTarget() return 0 if(L.health <= melee_damage_lower+melee_damage_upper) //ey bucko you're hurt as fuck let's go hit you @@ -216,7 +214,7 @@ /mob/living/simple_animal/hostile/construct/builder/Aggro() ..() - if(istype(target, /mob/living/simple_animal/hostile/construct)) //oh the target is a construct no need to flee + if(isconstruct(target)) //oh the target is a construct no need to flee retreat_distance = null minimum_distance = 1 @@ -229,11 +227,6 @@ AIStatus = AI_ON environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP - - - - - /////////////////////////////Non-cult Artificer///////////////////////// /mob/living/simple_animal/hostile/construct/builder/noncult construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/wall, diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index b0df6fbc666..7e14553ce1c 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -8,6 +8,7 @@ speak_emote = list("barks", "woofs") emote_hear = list("barks!", "woofs!", "yaps.","pants.") emote_see = list("shakes its head.", "chases its tail.","shivers.") + faction = list("dog") see_in_dark = 5 speak_chance = 1 turns_per_move = 10 diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index 0b680f72a48..08b8c31d199 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -43,6 +43,7 @@ damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) staticOverlays = list() hud_possible = list(DIAG_STAT_HUD, DIAG_HUD, ANTAG_HUD) + unique_name = TRUE var/staticChoice = "static" var/list/staticChoices = list("static", "blank", "letter", "animal") var/picked = FALSE //Have we picked our visual appearence (+ colour if applicable) @@ -61,13 +62,10 @@ var/seeStatic = 1 //Whether we see static instead of mobs var/visualAppearence = MAINTDRONE //What we appear as var/hacked = 0 //If we have laws to destroy the station - + var/datum/personal_crafting/handcrafting /mob/living/simple_animal/drone/New() - ..() - if(name != initial(name)) - name = name + " ([rand(100,999)])" - real_name = name + . = ..() access_card = new /obj/item/weapon/card/id(src) var/datum/job/captain/C = new /datum/job/captain @@ -86,6 +84,8 @@ var/datum/action/generic/drone/select_filter/SF = new(src) SF.Grant(src) + + handcrafting = new() var/datum/atom_hud/data/diagnostic/diag_hud = huds[DATA_HUD_DIAGNOSTIC] diag_hud.add_to_hud(src) @@ -103,6 +103,8 @@ else holder.icon_state = "hudstat" +/mob/living/simple_animal/drone/OpenCraftingMenu() + handcrafting.craft(src) /mob/living/simple_animal/drone/Destroy() qdel(access_card) //Otherwise it ends up on the floor! diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index f37da30e127..c93310b4d22 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -54,6 +54,17 @@ ..() desc += " This drone appears to have a complex holoprojector built on its 'head'." +/mob/living/simple_animal/drone/snowflake/bardrone + name = "Bardrone" + desc = "A barkeeping drone, an indestructible robot built to tend bars." + seeStatic = FALSE + laws = "1. Serve drinks.\n\ + 2. Talk to patrons.\n\ + 3. Don't get messed up in their affairs." + languages = ALL + status_flags = GODMODE // Please don't punch the barkeeper + unique_name = FALSE // disables the (123) number suffix + /obj/item/drone_shell/syndrone name = "syndrone shell" desc = "A shell of a syndrone, a modified maintenance drone designed to infiltrate and annihilate." diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm index cc9b4cb9f84..c6b108c951a 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm @@ -61,7 +61,7 @@ if(ishuman(user)) - if(stat == DEAD) + if(stat == DEAD || status_flags & GODMODE) ..() return if(user.get_active_hand()) diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 66a10c95760..e373e0f4873 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -21,6 +21,7 @@ attacktext = "kicks" attack_sound = 'sound/weapons/punch1.ogg' health = 40 + maxHealth = 40 melee_damage_lower = 1 melee_damage_upper = 2 environment_smash = 0 @@ -98,6 +99,7 @@ attacktext = "kicks" attack_sound = 'sound/weapons/punch1.ogg' health = 50 + maxHealth = 50 var/obj/item/udder/udder = null gold_core_spawnable = 2 @@ -157,7 +159,8 @@ response_disarm = "gently pushes aside" response_harm = "kicks" attacktext = "kicks" - health = 1 + health = 3 + maxHealth = 3 ventcrawler = 2 var/amount_grown = 0 pass_flags = PASSTABLE | PASSGRILLE | PASSMOB @@ -206,7 +209,8 @@ var/global/chicken_count = 0 response_disarm = "gently pushes aside" response_harm = "kicks" attacktext = "kicks" - health = 10 + health = 15 + maxHealth = 15 ventcrawler = 2 var/eggsleft = 0 var/eggsFertile = TRUE diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 546e4b3a4e2..f7c69dbf8f5 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -381,7 +381,7 @@ var/global/list/parasites = list() //all currently existing/living guardians var/list/possible_guardians = list("Chaos", "Standard", "Ranged", "Support", "Explosive", "Lightning", "Protector", "Charger", "Assassin") var/random = TRUE var/allowmultiple = 0 - var/allowling = 0 + var/allowling = 1 /obj/item/weapon/guardiancreator/attack_self(mob/living/user) var/list/guardians = user.hasparasites() diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index e1b8695c437..b361d62b00d 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -12,8 +12,8 @@ speed = 0 butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno = 4, /obj/item/stack/sheet/animalhide/xeno = 1) - maxHealth = 100 - health = 100 + maxHealth = 125 + health = 125 harm_intent_damage = 5 melee_damage_lower = 25 melee_damage_upper = 25 @@ -39,7 +39,6 @@ icon_state = "aliend_s" icon_living = "aliend_s" icon_dead = "aliend_dead" - health = 60 melee_damage_lower = 15 melee_damage_upper = 15 var/plant_cooldown = 30 @@ -59,7 +58,8 @@ icon_state = "aliens_s" icon_living = "aliens_s" icon_dead = "aliens_dead" - health = 120 + health = 150 + maxHealth = 150 melee_damage_lower = 15 melee_damage_upper = 15 ranged = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 51e6e5f0fa1..2d7ee8dd11a 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -114,8 +114,8 @@ . = ..() if(!.) return 0 - if(ishuman(the_target)) - var/mob/living/carbon/human/H = the_target + if(isliving(the_target)) + var/mob/living/H = the_target return !H.bee_friendly() @@ -125,8 +125,8 @@ if(Hydro.myseed && !Hydro.dead && !Hydro.recent_bee_visit) wanted_objects |= /obj/machinery/hydroponics //so we only hunt them while they're alive/seeded/not visisted return 1 - if(ishuman(A)) - var/mob/living/carbon/human/H = A + if(isliving(A)) + var/mob/living/H = A return !H.bee_friendly() return 0 diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm index 0063669071c..d83faba36e2 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -48,6 +48,7 @@ name = "strong hivebot" desc = "A robot, this one is armed and looks tough!" health = 80 + maxHealth = 80 ranged = 1 /mob/living/simple_animal/hostile/hivebot/death(gibbed) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 05cba60418c..a3066d08c4b 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -63,8 +63,10 @@ AIStatus = AI_IDLE // otherwise we go idle return 1 - - +/mob/living/simple_animal/hostile/bullet_act(obj/item/projectile/P) + if(!target) + Goto(P.starting, move_to_delay, 3) + ..() //////////////HOSTILE MOB TARGETTING AND AGGRESSION//////////// @@ -295,7 +297,7 @@ P.firer = src P.yo = targeted_atom.y - startloc.y P.xo = targeted_atom.x - startloc.x - if(AIStatus == AI_OFF)//Don't want mindless mobs to have their movement screwed up firing in space + if(AIStatus != AI_ON)//Don't want mindless mobs to have their movement screwed up firing in space newtonian_move(get_dir(targeted_atom, targets_from)) P.original = targeted_atom P.fire() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm index 0267d112d90..1fd2754ae85 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -12,6 +12,7 @@ icon = 'icons/mob/lavaland/dragon.dmi' faction = list("mining") speak_emote = list("roars") + luminosity = 3 armour_penetration = 40 melee_damage_lower = 40 melee_damage_upper = 40 @@ -28,6 +29,7 @@ var/anger_modifier = 0 var/obj/item/device/gps/internal var/swooping = 0 + var/swoop_cooldown = 0 deathmessage = "collapes into a pile of bones, it's flesh sloughing away." death_sound = 'sound/magic/demon_dies.ogg' damage_coeff = list(BRUTE = 1, BURN = 0.5, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1) @@ -41,6 +43,13 @@ return else ..() + if(isliving(target)) + var/mob/living/L = target + if(L.stat == DEAD) + L.gib() + visible_message("[src] devours [L]!") + src << "You feast on [L], restoring your health!" + adjustBruteLoss(-L.maxHealth) /mob/living/simple_animal/hostile/megafauna/dragon/Process_Spacemove(movement_dir = 0) return 1 @@ -51,16 +60,27 @@ name = "fireball" desc = "Get out of the way!" layer = 6 - dir = SOUTH + randomdir = 0 + duration = 10 pixel_z = 500 - anchored = 1 /obj/effect/overlay/temp/target icon = 'icons/mob/actions.dmi' icon_state = "sniper_zoom" layer = MOB_LAYER - 0.1 - anchored = 1 luminosity = 2 + duration = 10 + +/obj/effect/overlay/temp/dragon_swoop + name = "certain death" + desc = "Don't just stand there, move!" + icon = 'icons/effects/96x96.dmi' + icon_state = "rune_large" + layer = MOB_LAYER - 0.1 + pixel_x = -32 + pixel_y = -32 + color = "#FF0000" + duration = 10 /obj/effect/overlay/temp/target/ex_act() return @@ -81,8 +101,8 @@ anger_modifier = Clamp(((maxHealth - health)/50),0,20) ranged_cooldown = world.time + ranged_cooldown_time - if(prob(15 + anger_modifier)) - if(health < maxHealth/2 && !client) + if(prob(15 + anger_modifier) && !client) + if(health < maxHealth/2) swoop_attack(1) else fire_rain() @@ -103,33 +123,37 @@ if(prob(10)) new /obj/effect/overlay/temp/target(turf) - /mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_walls() var/list/attack_dirs = list(NORTH,EAST,SOUTH,WEST) if(prob(50)) attack_dirs = list(NORTH,WEST,SOUTH,EAST) playsound(get_turf(src),'sound/magic/Fireball.ogg', 200, 1) - spawn(0) - for(var/d in attack_dirs) + for(var/d in attack_dirs) + spawn(0) var/turf/E = get_edge_target_turf(src, d) var/range = 10 for(var/turf/open/J in getline(src,E)) if(!range) break range-- - PoolOrNew(/obj/effect/hotspot,J) J.hotspot_expose(700,50,1) for(var/mob/living/L in J) if(L != src) L.adjustFireLoss(20) L << "You're hit by the drake's fire breath!" + sleep(1) -/mob/living/simple_animal/hostile/megafauna/dragon/proc/swoop_attack(fire_rain = 0) +/mob/living/simple_animal/hostile/megafauna/dragon/proc/swoop_attack(fire_rain = 0, atom/movable/manual_target) if(stat) return - var/mob/living/swoop_target = target + swoop_cooldown = world.time + 200 + var/swoop_target + if(manual_target) + swoop_target = manual_target + else + swoop_target = target stop_automated_movement = TRUE swooping = 1 icon_state = "swoop" @@ -150,9 +174,10 @@ else tturf = get_turf(src) src.loc = tturf + new/obj/effect/overlay/temp/dragon_swoop(tturf) animate(src, pixel_x = 0, pixel_z = 0, time = 10) sleep(10) - playsound(src, 'sound/effects/meteorimpact.ogg', 200, 1) + playsound(src.loc, 'sound/effects/meteorimpact.ogg', 200, 1) for(var/mob/living/L in range(1,tturf)) if(L == src) continue @@ -171,6 +196,15 @@ swooping = 0 density = 1 +/mob/living/simple_animal/hostile/megafauna/dragon/AltClickOn(atom/movable/A) + if(!istype(A)) + return + if(swoop_cooldown >= world.time) + src << "You need to wait 20 seconds between swoop attacks!" + return + swoop_attack(1, A) + + /obj/item/device/gps/internal/dragon icon_state = null gpstag = "Fiery Signal" @@ -228,8 +262,8 @@ /mob/living/simple_animal/hostile/megafauna/dragon/lesser name = "lesser ash drake" - maxHealth = 500 - health = 500 + maxHealth = 750 + health = 750 melee_damage_upper = 30 melee_damage_lower = 30 damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1) @@ -248,21 +282,15 @@ return var/mob/living/carbon/human/H = user - var/random = rand(1,5) + var/random = rand(1,3) switch(random) if(1) - user << "The blood sears your insides! What the hell were you thinking?" - user.reagents.add_reagent("hellwater", 50) - if(2) user << "Other than tasting terrible, nothing really happens." - if(3) + if(2) user << "Your flesh begins to melt! Miraculously, you seem fine otherwise." H.set_species(/datum/species/skeleton) - if(4) - user << "The blood mixes with your own, filling your veins with a pulsing fire." - H.dna.species.coldmod = 0 - if(5) + if(3) user << "You don't feel so good..." H.ForceContractDisease(new /datum/disease/transformation/dragon(0)) playsound(user.loc,'sound/items/drink.ogg', rand(10,50), 1) @@ -318,15 +346,11 @@ /obj/structure/closet/crate/necropolis/dragon/New() ..() - var/loot = rand(1,4) + var/loot = rand(1,3) switch(loot) if(1) - for(var/i in 1 to 10) - new /obj/item/weapon/ore/diamond(src) - new /obj/item/weapon/ore/gold(src) - if(2) new /obj/item/weapon/melee/ghost_sword(src) - if(3) + if(2) new /obj/item/weapon/dragons_blood(src) - if(4) + if(3) new /obj/item/weapon/lava_staff(src) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index 6a273d83b3e..8a846d02623 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -3,6 +3,7 @@ desc = "Attack the weak point for massive damage." health = 1000 maxHealth = 1000 + a_intent = "harm" sentience_type = SENTIENCE_BOSS environment_smash = 4 robust_searching = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 6ea3114ffed..1c02ede80f9 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -853,6 +853,7 @@ speak_emote = list("warbles", "quavers") emote_hear = list("trills.") emote_see = list("sniffs.", "burps.") + faction = list("mining", "ashwalker") density = 0 speak_chance = 1 turns_per_move = 8 diff --git a/code/modules/mob/living/simple_animal/hostile/reenactors.dm b/code/modules/mob/living/simple_animal/hostile/reenactors.dm new file mode 100644 index 00000000000..b6382dc4302 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/reenactors.dm @@ -0,0 +1,103 @@ +/* +-!WARNING!- +-POTENTIAL TRIGGER-INDUCING ITEMS AHEAD- +-TREAD WITH CAUTION- +*/ + +/mob/living/simple_animal/hostile/wwii + name = "World War II Reenactor" + desc = "A VERY enthusiastic WWII reenactor." + icon_state = "nsoldier" + icon_living = "nsoldier" + speak_chance = 0 + turns_per_move = 5 + response_help = "pokes" + response_disarm = "shoves" + response_harm = "hits" + speed = 0 + stat_attack = 1 + robust_searching = 1 + maxHealth = 100 + health = 100 + harm_intent_damage = 10 + melee_damage_lower = 10 + melee_damage_upper = 15 + attacktext = "punches" + attack_sound = 'sound/weapons/punch1.ogg' + a_intent = "harm" + loot = list(/obj/effect/mob_spawn/human/wwii) + atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) + unsuitable_atmos_damage = 15 + faction = list("german") + check_friendly_fire = 1 + status_flags = CANPUSH + del_on_death = 1 + +/mob/living/simple_animal/hostile/wwii/ranged + ranged = 1 + rapid = 1 + retreat_distance = 5 + minimum_distance = 5 + icon_state = "nsoldierranged" + icon_living = "nsoldierranged" + casingtype = /obj/item/ammo_casing/c45nostamina + projectilesound = 'sound/weapons/Gunshot_smg.ogg' + +/mob/living/simple_animal/hostile/wwii/melee + name = "Hulking World War II Reenactor" + icon_state = "nsoldierbuff" + icon_living = "nsoldierbuff" + stat_attack = 0 + speed = 4 + maxHealth = 200 + health = 200 + force_threshold = 10 + harm_intent_damage = 25 + melee_damage_lower = 25 + melee_damage_upper = 30 + environment_smash = 2 + attacktext = "slams" + deathmessage = "The Reenactor's body collapses in on itself from the strain!" + loot = list(/obj/effect/gibspawner/human) + +/mob/living/simple_animal/hostile/wwii/melee/AttackingTarget() + ..() + if(iscarbon(target)) + var/mob/living/carbon/C = target + if(prob(40)) + C.Weaken(3) + C.adjustBruteLoss(10) + C.visible_message("\The [src] smashes \the [C] into the ground!", \ + "\The [src] smashes you into the ground!") + src.say(pick("RAAAAAGGHHHH!!!","AAAARRRGGHHHH!!!","RRRAAUUUGGHH!!!")) + + +/mob/living/simple_animal/hostile/wwii/bomber + name = "Mini-Fhrer" + desc = "A small, robotic recreation of the Fhrer himself; it seems like he wants to tell you something." + icon_state = "miniheil" + icon_living = "miniheil" + speed = 1 + maxHealth = 25 + health = 25 + harm_intent_damage = 5 + melee_damage_lower = 5 + melee_damage_upper = 7 + attacktext = "heils" + deathmessage = "The Mini-Fhrer explodes!" + loot = list(/obj/effect/gibspawner/robot) + +/mob/living/simple_animal/hostile/wwii/bomber/AttackingTarget() + ..() + if(iscarbon(target)) + var/mob/living/carbon/C = target + if(prob(90)) + C.Weaken(2) + src.say("HEIL HITLER!") + explosion(src, 0, 0, 2, 3, 2) + src.gib() + +/* +-YOU HAVE SAFETLY PASSED THE POTENTIALLY-TRIGGERING CONTENT- +-PLEASE RESUME NORMAL, POLITICALLY CORRECT ACTIVITY- +*/ diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm index edd5acc4846..1b28b8dd500 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm @@ -28,12 +28,7 @@ continue if(isliving(A)) var/mob/living/M = A - var/faction_check = 0 - for(var/F in faction) - if(F in M.faction) - faction_check = 1 - break - if(faction_check && attack_same || !faction_check) + if(faction_check(M) && attack_same || !faction_check(M)) enemies |= M else if(istype(A, /obj/mecha)) var/obj/mecha/M = A @@ -42,12 +37,7 @@ enemies |= M.occupant for(var/mob/living/simple_animal/hostile/retaliate/H in around) - var/retaliate_faction_check = 0 - for(var/F in faction) - if(F in H.faction) - retaliate_faction_check = 1 - break - if(retaliate_faction_check && !attack_same && !H.attack_same) + if(faction_check(H) && !attack_same && !H.attack_same) H.enemies |= enemies return 0 diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm index eccba5770c6..cd600cd1367 100644 --- a/code/modules/mob/living/simple_animal/hostile/zombie.dm +++ b/code/modules/mob/living/simple_animal/hostile/zombie.dm @@ -35,17 +35,19 @@ /mob/living/simple_animal/hostile/zombie/darkholme //BOY♂NEXT♂RUIN desc = "This guy seems to have gotten lost on his way to the leather club." - + gold_core_spawnable = 0 + /mob/living/simple_animal/hostile/zombie/darkholme/New() ..() name = pick("Leatherman","Leatherhead") - + mob/living/simple_animal/hostile/zombie/gymboss name = "boss of this gym" desc = "There seems to be something shiny embedded in his waist." butcher_results = list(/obj/item/weapon/storage/belt/champion/wrestling = 1) attacktext = "spanks" - + gold_core_spawnable = 0 + /mob/living/simple_animal/hostile/zombie/AttackingTarget() ..() diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 955ccacb23d..f2164eec7b9 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -26,16 +26,28 @@ faction = list("cult") status_flags = CANPUSH flying = 1 + loot = list(/obj/item/weapon/ectoplasm) + del_on_death = 1 /mob/living/simple_animal/shade/death() - ..(1) - new /obj/item/weapon/ectoplasm (src.loc) - visible_message("[src] lets out a contented sigh as their form unwinds.") - ghostize() - qdel(src) - return + deathmessage = "[src] lets out a contented sigh as their form unwinds." + ..() +/mob/living/simple_animal/shade/Process_Spacemove(movement_dir = 0) + return TRUE //this doesn't make much sense; you'd thing TRUE would mean it'd process spacemove but it means it doesn't + +/mob/living/simple_animal/shade/attack_animal(mob/living/simple_animal/M) + if(istype(M, /mob/living/simple_animal/hostile/construct/builder)) + if(health < maxHealth) + adjustHealth(-25) + Beam(M,icon_state="sendbeam",icon='icons/effects/effects.dmi',time=4) + M.visible_message("[M] heals \the [src].", \ + "You heal [src], leaving [src] at [health]/[maxHealth] health.") + else + M << "You cannot heal [src], as it is unharmed!" + else if(src != M) + ..() /mob/living/simple_animal/shade/attackby(obj/item/O, mob/user, params) //Marker -Agouri if(istype(O, /obj/item/device/soulstone)) @@ -43,4 +55,3 @@ SS.transfer_soul("SHADE", src, user) else ..() - return diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 0c8c9f3982e..9a69cf934b2 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -470,16 +470,17 @@ var/mob/living/simple_animal/partner var/children = 0 for(var/mob/M in view(7, src)) - if(M.stat != CONSCIOUS) //Check if it's concious FIRSTER. + if(M.stat != CONSCIOUS) //Check if it's conscious FIRST. continue - else if(istype(M, childtype)) //Check for children FIRST. + else if(istype(M, childtype)) //Check for children SECOND. children++ else if(istype(M, animal_species)) if(M.ckey) continue else if(!istype(M, childtype) && M.gender == MALE) //Better safe than sorry ;_; partner = M - else if(istype(M, /mob/)) + + else if(istype(M, /mob/living) && !faction_check(M)) //shyness check. we're not shy in front of things that share a faction with us. alone = 0 continue if(alone && partner && children < 3) diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 448a7514a11..8c62ddcfa83 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -133,13 +133,13 @@ Tempstun = 0 if(stat != DEAD) - var/co2_percentage =0 - if("co2" in environment.gases) - co2_percentage = environment.gases["co2"][MOLES] / environment.total_moles() - var/stasis = (co2_percentage >= 0.05 && bodytemperature < (T0C + 100)) || force_stasis + var/bz_percentage =0 + if("bz" in environment.gases) + bz_percentage = environment.gases["bz"][MOLES] / environment.total_moles() + var/stasis = (bz_percentage >= 0.05 && bodytemperature < (T0C + 100)) || force_stasis if(stat == CONSCIOUS && stasis) - src << "High levels of CO2 put you in stasis!" + src << "Nerve gas in the air has put you in stasis!" stat = UNCONSCIOUS powerlevel = 0 rabid = 0 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index dac03b3af40..bd0f6cc4c4a 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -934,3 +934,6 @@ var/next_mob_id = 0 if("resize") update_transform() ..() + +/mob/proc/is_literate() + return 0 diff --git a/code/modules/ninja/admin_ninja_verbs.dm b/code/modules/ninja/admin_ninja_verbs.dm index aa3f8d48ea1..d87939b1eec 100644 --- a/code/modules/ninja/admin_ninja_verbs.dm +++ b/code/modules/ninja/admin_ninja_verbs.dm @@ -52,10 +52,12 @@ Contents: if(!C) return - var/datum/round_event/ninja/E = new /datum/round_event/ninja() - E.key=C.key + // passing FALSE means the event doesn't start immediately + var/datum/round_event/ghost_role/ninja/E = new(FALSE) + E.priority_candidates += C + E.processing = TRUE message_admins("[key_name_admin(key)] has spawned [key_name_admin(C.key)] as a Space Ninja.") log_admin("[key] used Spawn Space Ninja.") - return \ No newline at end of file + return diff --git a/code/modules/ninja/ninja_event.dm b/code/modules/ninja/ninja_event.dm index 903a523d884..72771142409 100644 --- a/code/modules/ninja/ninja_event.dm +++ b/code/modules/ninja/ninja_event.dm @@ -1,43 +1,41 @@ //Note to future generations: I didn't write this god-awful code I just ported it to the event system and tried to make it less moon-speaky. //Don't judge me D; ~Carn //Maximum judging occuring - Remie. - +// Tut tut Remie, let's keep our comments constructive. - coiax /* Contents: - The Ninja "Random" Event - Ninja creation code - */ /datum/round_event_control/ninja name = "Space Ninja" - typepath = /datum/round_event/ninja + typepath = /datum/round_event/ghost_role/ninja max_occurrences = 1 earliest_start = 30000 // 1 hour -/datum/round_event/ninja +/datum/round_event/ghost_role/ninja var/success_spawn = 0 + role_name = "space ninja" + minimum_required = 1 var/helping_station - var/key var/spawn_loc + var/give_objectives = TRUE - var/mob/living/carbon/human/Ninja - - -/datum/round_event/ninja/setup() +/datum/round_event/ghost_role/ninja/setup() helping_station = rand(0,1) -/datum/round_event/ninja/kill() +/datum/round_event/ghost_role/ninja/kill() if(!success_spawn && control) control.occurrences-- return ..() -/datum/round_event/ninja/start() +/datum/round_event/ghost_role/ninja/spawn_role() //selecting a spawn_loc if(!spawn_loc) var/list/spawn_locs = list() @@ -50,17 +48,15 @@ Contents: return kill() spawn_loc = pick(spawn_locs) if(!spawn_loc) - return kill() + return MAP_ERROR //selecting a candidate player - if(!key) - var/list/candidates = get_candidates(ROLE_NINJA) - if(!candidates.len) - return kill() - var/client/C = pick(candidates) - key = C.key - if(!key) - return kill() + var/list/candidates = get_candidates("ninja", null, ROLE_NINJA) + if(!candidates.len) + return NOT_ENOUGH_PLAYERS + + var/mob/dead/selected_candidate = popleft(candidates) + var/key = selected_candidate.key //Prepare ninja player mind var/datum/mind/Mind = create_ninja_mind(key) @@ -77,7 +73,7 @@ Contents: possible_targets[M] = 1 //good-guy var/list/objectives = list(1,2,3,4) - while(Mind.objectives.len < 6) //still not enough objectives! + while(give_objectives && Mind.objectives.len < 6) switch(pick_n_take(objectives)) if(1) //research var/datum/objective/download/O = new /datum/objective/download() @@ -92,10 +88,10 @@ Contents: if(3) //protect/kill if(!possible_targets.len) continue - var/selected = rand(1,possible_targets.len) - var/datum/mind/M = possible_targets[selected] + var/index = rand(1,possible_targets.len) + var/datum/mind/M = possible_targets[index] var/is_bad_guy = possible_targets[M] - possible_targets.Cut(selected,selected+1) + possible_targets.Cut(index,index+1) if(is_bad_guy ^ helping_station) //kill (good-ninja + bad-guy or bad-ninja + good-guy) var/datum/objective/assassinate/O = new /datum/objective/assassinate() @@ -131,9 +127,10 @@ Contents: break //Add a survival objective since it's usually broad enough for any round type. - var/datum/objective/O = new /datum/objective/survive() - O.owner = Mind - Mind.objectives += O + if(give_objectives) + var/datum/objective/O = new /datum/objective/survive() + O.owner = Mind + Mind.objectives += O //add some RP-fluff Mind.store_memory("I am an elite mercenary assassin of the mighty Spider Clan. A SPACE NINJA!") @@ -141,7 +138,7 @@ Contents: Mind.store_memory("Officially, [helping_station?"Nanotrasen":"The Syndicate"] are my employer.") //spawn the ninja and assign the candidate - Ninja = create_space_ninja(spawn_loc) + var/mob/living/carbon/human/Ninja = create_space_ninja(spawn_loc) Mind.transfer_to(Ninja) //initialise equipment @@ -159,7 +156,11 @@ Contents: Ninja << sound('sound/effects/ninja_greeting.ogg') //so ninja you probably wouldn't even know if you were made one ticker.mode.update_ninja_icons_added(Mind) - success_spawn = 1 + spawned_mobs += Ninja + message_admins("[key] has been made into a ninja by an event.") + log_game("[key] was spawned as a ninja by an event.") + + return SUCCESSFUL_SPAWN //=======//NINJA CREATION PROCS//=======// diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index 7f67ef9e3d3..43a8e5fce22 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -23,7 +23,7 @@ qdel(src) return -1 target = nOwner.mind - update_text(nOwner) + update_text() /obj/item/weapon/paper/contract/employment/update_text() diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index bef437af32a..29d4bc11de5 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -60,11 +60,11 @@ user << "There are indecipherable images scrawled on the paper in what looks to be... blood?" return if(in_range(user, src) || isobserver(user)) - if( !(ishuman(user) || isobserver(user) || issilicon(user)) ) - user << browse("
[stamps]", "window=[name]") + if(user.is_literate()) + user << browse("
[stamps]", "window=[name]") onclose(user, "[name]") else - user << browse("
[stamps]", "window=[name]") + user << browse("
[stamps]", "window=[name]") onclose(user, "[name]") else user << "It is too far away." @@ -75,17 +75,15 @@ set category = "Object" set src in usr - if(usr.stat || !usr.canmove || usr.restrained()) - return - - if(!ishuman(usr)) - return - var/mob/living/carbon/human/H = usr - if(H.disabilities & CLUMSY && prob(25)) - H << "You cut yourself on the paper! Ahhhh! Ahhhhh!" - H.damageoverlaytemp = 9001 - H.update_damage_hud() + if(usr.incapacitated() || !usr.is_literate()) return + if(ishuman(usr)) + var/mob/living/carbon/human/H = usr + if(H.disabilities & CLUMSY && prob(25)) + H << "You cut yourself on the paper! Ahhhh! Ahhhhh!" + H.damageoverlaytemp = 9001 + H.update_damage_hud() + return var/n_name = stripped_input(usr, "What would you like to label the paper?", "Paper Labelling", null, MAX_NAME_LEN) if((loc == usr && usr.stat == 0)) name = "paper[(n_name ? text("- '[n_name]'") : null)]" @@ -293,7 +291,7 @@ return if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon)) - if(user.IsAdvancedToolUser()) + if(user.is_literate()) user << browse("
[stamps]", "window=[name]") return else diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 1280fdb3d8c..53096240c8f 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -67,7 +67,7 @@ var/copy_as_paper = 1 if(istype(copy, /obj/item/weapon/paper/contract/employment)) var/obj/item/weapon/paper/contract/employment/E = copy - var/obj/item/weapon/paper/contract/employment/C = new /obj/item/weapon/paper/contract/employment (loc, E.target) + var/obj/item/weapon/paper/contract/employment/C = new /obj/item/weapon/paper/contract/employment (loc, E.target.current) if(C) copy_as_paper = 0 if(copy_as_paper) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index c93db65fd7e..c2da9e8e227 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -117,7 +117,8 @@ var/see_ghosts = 0 //for the spoop of it -/obj/item/device/camera/CheckParts() +/obj/item/device/camera/CheckParts(list/parts_list) + ..() var/obj/item/device/camera/C = locate(/obj/item/device/camera) in contents if(C) pictures_max = C.pictures_max diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 36204ae1fc6..f86c1772ad1 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -72,25 +72,31 @@ // Syndicate stamp to forge documents. +/obj/item/weapon/stamp/chameleon + actions_types = list(/datum/action/item_action/toggle) + /obj/item/weapon/stamp/chameleon/attack_self(mob/user) var/list/stamp_types = typesof(/obj/item/weapon/stamp) - src.type // Get all stamp types except our own - var/list/stamps = list() + var/list/stamp_names = list() // Generate them into a list - for(var/stamp_type in stamp_types) - var/obj/item/weapon/stamp/S = new stamp_type - stamps[capitalize(S.name)] = S + for(var/i in stamp_types) + var/obj/item/weapon/stamp/stamp_type = i + stamp_names += initial(stamp_type.name) - var/list/show_stamps = list("EXIT" = null) + sortList(stamps) // the list that will be shown to the user to pick from + stamp_names = sortList(stamp_names) - var/input_stamp = input(user, "Choose a stamp to disguise as.", "Choose a stamp.") in show_stamps + var/input_stamp = input(user, "Choose a stamp to disguise as.", + "Choose a stamp.") as null|anything in stamp_names - if(user && src in user.contents) + if(user && (src in user.contents) && input_stamp) + var/obj/item/weapon/stamp/stamp_type + for(var/i in stamp_types) + stamp_type = i + if(initial(stamp_type.name) == input_stamp) + break - var/obj/item/weapon/stamp/chosen_stamp = stamps[capitalize(input_stamp)] - - if(chosen_stamp) - name = chosen_stamp.name - icon_state = chosen_stamp.icon_state - item_color = chosen_stamp.item_color \ No newline at end of file + name = initial(stamp_type.name) + icon_state = initial(stamp_type.icon_state) + item_color = initial(stamp_type.item_color) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 1f0694daec7..5ff1b215f43 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -238,7 +238,8 @@ field_generator power level display setup_field(4) spawn(4) setup_field(8) - active = FG_ONLINE + spawn(5) + active = FG_ONLINE /obj/machinery/field/generator/proc/setup_field(NSEW) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index c565aa30661..b29c69b400a 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -30,6 +30,9 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, contained = 0 density = 1 energy = 0 + dissipate = 1 + dissipate_delay = 5 + dissipate_strength = 1 var/list/orbiting_balls = list() var/produced_power var/energy_to_raise = 32 @@ -51,7 +54,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, if(!orbiting) handle_energy() - move_the_basket_ball(4 + orbiting_balls.len * 2) + move_the_basket_ball(4 + orbiting_balls.len * 1.5) playsound(src.loc, 'sound/magic/lightningbolt.ogg', 100, 1, extrarange = 30) @@ -63,7 +66,8 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, pixel_x = -32 pixel_y = -32 for (var/ball in orbiting_balls) - tesla_zap(ball, rand(1, Clamp(orbiting_balls.len, 3, 7)), TESLA_MINI_POWER) + var/range = rand(1, Clamp(orbiting_balls.len, 3, 7)) + tesla_zap(ball, range, TESLA_MINI_POWER/7*range) else energy = 0 // ensure we dont have miniballs of miniballs @@ -88,9 +92,10 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, /obj/singularity/energy_ball/proc/handle_energy() + if(energy >= energy_to_raise) energy_to_lower = energy_to_raise - 20 - energy_to_raise = energy_to_raise * 1.5 + energy_to_raise = energy_to_raise * 1.25 playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, 1, extrarange = 30) spawn(100) @@ -105,16 +110,17 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, orbitsize -= (orbitsize / world.icon_size) * (world.icon_size * 0.25) EB.orbit(src, orbitsize, pick(FALSE, TRUE), rand(10, 25), pick(3, 4, 5, 6, 36)) + else if(energy < energy_to_lower && orbiting_balls.len) - energy_to_raise = energy_to_raise / 1.5 - energy_to_lower = (energy_to_raise / 1.5) - 20 + energy_to_raise = energy_to_raise / 1.25 + energy_to_lower = (energy_to_raise / 1.25) - 20 var/Orchiectomy_target = pick(orbiting_balls) qdel(Orchiectomy_target) else if(orbiting_balls.len) - energy -= orbiting_balls.len * 0.5 + dissipate() //sing code has a much better system. /obj/singularity/energy_ball/Bump(atom/A) dust_mobs(A) @@ -126,11 +132,13 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, if (istype(target)) target.orbiting_balls += src poi_list -= src + target.dissipate_strength = target.orbiting_balls.len . = ..() if (istype(target)) target.orbiting_balls -= src + target.dissipate_strength = target.orbiting_balls.len if (!loc) qdel(src) @@ -154,11 +162,11 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, var/obj/structure/closest_structure var/obj/effect/blob/closest_blob - for(var/A in oview(source, zap_range)) + for(var/A in oview(source, zap_range+2)) if(istype(A, /obj/machinery/power/tesla_coil)) var/dist = get_dist(source, A) var/obj/machinery/power/tesla_coil/C = A - if((dist < closest_dist || !closest_tesla_coil) && !C.being_shocked) + if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !C.being_shocked) closest_dist = dist //we use both of these to save on istype and typecasting overhead later on @@ -171,8 +179,8 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, continue //no need checking these other things else if(istype(A, /obj/machinery/power/grounding_rod)) - var/dist = get_dist(source, A) - if(dist < closest_dist || !closest_grounding_rod) + var/dist = get_dist(source, A)-2 + if(dist <= zap_range && (dist < closest_dist || !closest_grounding_rod)) closest_grounding_rod = A closest_atom = A closest_dist = dist @@ -183,7 +191,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, else if(istype(A, /mob/living)) var/dist = get_dist(source, A) var/mob/living/L = A - if((dist < closest_dist || !closest_mob) && L.stat != DEAD) + if(dist <= zap_range && (dist < closest_dist || !closest_mob) && L.stat != DEAD) closest_mob = L closest_atom = A closest_dist = dist @@ -194,7 +202,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, else if(istype(A, /obj/machinery)) var/obj/machinery/M = A var/dist = get_dist(source, A) - if((dist < closest_dist || !closest_machine) && !M.being_shocked) + if(dist <= zap_range && (dist < closest_dist || !closest_machine) && !M.being_shocked) closest_machine = M closest_atom = A closest_dist = dist @@ -205,7 +213,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, else if(istype(A, /obj/effect/blob)) var/obj/effect/blob/B = A var/dist = get_dist(source, A) - if((dist < closest_dist || !closest_tesla_coil) && !B.being_shocked) + if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !B.being_shocked) closest_blob = B closest_atom = A closest_dist = dist @@ -216,7 +224,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, else if(istype(A, /obj/structure)) var/obj/structure/S = A var/dist = get_dist(source, A) - if((dist < closest_dist || !closest_tesla_coil) && !S.being_shocked) + if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !S.being_shocked) closest_structure = S closest_atom = A closest_dist = dist diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 6ee2f2308b2..9d1f29ce38b 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -289,24 +289,41 @@ if (modified) icon_state = "foamdart_empty" desc = "Its nerf or nothing! ... Although, this one doesn't look too safe." + if(BB) + BB.icon_state = "foamdart_empty" + else + icon_state = "foamdart" + desc = "Its nerf or nothing! Ages 8 and up." + if(BB) + BB.icon_state = "foamdart_empty" + /obj/item/ammo_casing/caseless/foam_dart/attackby(obj/item/A, mob/user, params) ..() + var/obj/item/projectile/bullet/reusable/foam_dart/FD = BB if (istype(A, /obj/item/weapon/screwdriver) && !modified) modified = 1 - BB.damage_type = BRUTE - icon_state = "foamdart_empty" - desc = "Its nerf or nothing! ... Although, this one doesn't look too safe." - user << "You pop the safety cap off of [src]." - else if ((istype(A, /obj/item/weapon/pen)) && modified && !BB.contents.len) + FD.damage_type = BRUTE + update_icon() + else if ((istype(A, /obj/item/weapon/pen)) && modified && !FD.pen) if(!user.unEquip(A)) return - A.loc = BB - BB.damage = 5 - BB.nodamage = 0 + A.loc = FD + FD.pen = A + FD.damage = 5 + FD.nodamage = 0 user << "You insert [A] into [src]." return +/obj/item/ammo_casing/caseless/foam_dart/attack_self(mob/living/user) + var/obj/item/projectile/bullet/reusable/foam_dart/FD = BB + if(FD.pen) + FD.damage = initial(FD.damage) + FD.nodamage = initial(FD.nodamage) + user.put_in_hands(FD.pen) + user << "You remove [FD.pen] from [src]." + FD.pen = null + /obj/item/ammo_casing/caseless/foam_dart/riot name = "riot foam dart" desc = "Whose smart idea was it to use toys as crowd control? Ages 18 and up." diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm index 5ebc0c032d8..3d245ea9956 100644 --- a/code/modules/projectiles/ammunition/energy.dm +++ b/code/modules/projectiles/ammunition/energy.dm @@ -177,3 +177,9 @@ obj/item/ammo_casing/energy/net /obj/item/ammo_casing/energy/instakill/red projectile_type = /obj/item/projectile/beam/instakill/red + +/obj/item/ammo_casing/energy/shock_revolver + fire_sound = 'sound/magic/lightningbolt.ogg' + e_cost = 200 + select_name = "stun" + projectile_type = /obj/item/projectile/energy/shock_revolver \ No newline at end of file diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index caec75bfd22..808bfb7f59c 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -65,12 +65,6 @@ caliber = "38" max_ammo = 6 -/obj/item/ammo_box/magazine/internal/cylinder/rev38/can_load(mob/user) - user << "You start reloading..." - if(!do_after(user, 30, target = user)) - return 0 - return 1 - /obj/item/ammo_box/magazine/internal/cylinder/grenademulti name = "grenade launcher internal magazine" ammo_type = /obj/item/ammo_casing/a40mm diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm index cf008e00ec1..7465de12b04 100644 --- a/code/modules/projectiles/firing.dm +++ b/code/modules/projectiles/firing.dm @@ -37,6 +37,7 @@ var/turf/curloc = user.loc if (!istype(targloc) || !istype(curloc) || !BB) return 0 + BB.ammo_casing = src if(targloc == curloc) if(target) //if the target is right on our location we go straight to bullet_act() target.bullet_act(BB, BB.def_zone) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index b9ca0ed63ee..69d6b980422 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -1,11 +1,3 @@ - #define SAWN_INTACT 0 - #define SAWN_OFF 1 - #define SAWN_SAWING -1 - - #define WEAPON_LIGHT 0 - #define WEAPON_MEDIUM 1 - #define WEAPON_HEAVY 2 - /obj/item/weapon/gun name = "gun" desc = "It's a gun. It's pretty terrible, though." @@ -72,11 +64,14 @@ ..() if(pin) pin = new pin(src) - + if(F) + verbs += /obj/item/weapon/gun/proc/toggle_gunlight + new /datum/action/item_action/toggle_gunlight(src) build_zooming() -/obj/item/weapon/gun/CheckParts() +/obj/item/weapon/gun/CheckParts(list/parts_list) + ..() var/obj/item/weapon/gun/G = locate(/obj/item/weapon/gun) in contents if(G) G.loc = loc @@ -91,6 +86,10 @@ user << "It has [pin] installed." else user << "It doesn't have a firing pin installed, and won't fire." + if(unique_reskin && !reskinned) + user << "Alt-click it to reskin it." + if(unique_rename) + user << "Use a pen on it to rename it." /obj/item/weapon/gun/proc/process_chamber() @@ -288,7 +287,7 @@ obj/item/weapon/gun/proc/newshot() A.Grant(user) if(istype(I, /obj/item/weapon/screwdriver)) - if(F) + if(F && can_flashlight) for(var/obj/item/device/flashlight/seclite/S in src) user << "You unscrew the seclite from [src]." F = null diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 8f79ac1c510..b4e7ac59683 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -10,6 +10,7 @@ var/list/ammo_type = list(/obj/item/ammo_casing/energy) var/select = 1 //The state of the select fire switch. Determines from the ammo_type list what kind of shot is fired next. var/can_charge = 1 //Can it be charged in a recharger? + var/charge_sections = 4 ammo_x_offset = 2 var/shaded_charge = 0 //if this gun uses a stateful charge bar for more detail var/selfcharge = 0 @@ -99,7 +100,7 @@ /obj/item/weapon/gun/energy/update_icon() overlays.Cut() - var/ratio = Ceiling((power_supply.charge / power_supply.maxcharge) * 4) + var/ratio = Ceiling((power_supply.charge / power_supply.maxcharge) * charge_sections) var/obj/item/ammo_casing/energy/shot = ammo_type[select] var/iconState = "[icon_state]_charge" var/itemState = null @@ -118,7 +119,7 @@ overlays += image(icon = icon, icon_state = iconState, pixel_x = ammo_x_offset * (i -1)) else overlays += image(icon = icon, icon_state = "[icon_state]_charge[ratio]") - if(F) + if(F && can_flashlight) var/iconF = "flight" if(F.on) iconF = "flight_on" diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index c1b102f08a5..528ecc04816 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -1,6 +1,6 @@ /obj/item/weapon/gun/energy/gun name = "energy gun" - desc = "A basic hybrid energy gun with two settings: Disable and kill." + 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) @@ -11,6 +11,26 @@ 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) + overlays += "mini-light" + /obj/item/weapon/gun/energy/gun/hos name = "\improper X-01 MultiPhase Energy Gun" desc = "This is a expensive, modern recreation of a antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time." diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 6588d656efd..91808293948 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -89,12 +89,15 @@ icon_state = "kineticgun" item_state = "kineticgun" ammo_type = list(/obj/item/ammo_casing/energy/kinetic) - cell_type = "/obj/item/weapon/stock_parts/cell/emproof" - needs_permit = 0 // Aparently these are safe to carry? I'm sure Golliaths would disagree. + cell_type = /obj/item/weapon/stock_parts/cell/emproof + // Apparently these are safe to carry? I'm sure goliaths would disagree. + needs_permit = 0 var/overheat_time = 16 unique_rename = 1 - weapon_weight = WEAPON_HEAVY + weapon_weight = WEAPON_LIGHT origin_tech = "combat=2;powerstorage=1" + var/holds_charge = FALSE + var/unique_frequency = FALSE // modified by KA modkits /obj/item/weapon/gun/energy/kinetic_accelerator/super name = "super-kinetic accelerator" @@ -112,10 +115,53 @@ overheat_time = 14 origin_tech = "combat=4;powerstorage=3" +/obj/item/weapon/gun/energy/kinetic_accelerator/cyborg + holds_charge = TRUE + unique_frequency = TRUE + +/obj/item/weapon/gun/energy/kinetic_accelerator/New() + . = ..() + if(!holds_charge) + empty() + /obj/item/weapon/gun/energy/kinetic_accelerator/shoot_live_shot() - ..() - spawn(overheat_time) - reload() + . = ..() + attempt_reload() + +/obj/item/weapon/gun/energy/kinetic_accelerator/equipped(mob/user) + . = ..() + attempt_reload() + +/obj/item/weapon/gun/energy/kinetic_accelerator/dropped() + . = ..() + if(!holds_charge) + // Put it on a delay because moving item from slot to hand + // calls dropped(). + spawn(overheat_time) + if(!ismob(loc)) + empty() + +/obj/item/weapon/gun/energy/kinetic_accelerator/proc/empty() + power_supply.use(500) + update_icon() + +/obj/item/weapon/gun/energy/kinetic_accelerator/proc/attempt_reload() + var/carried = 0 + if(!unique_frequency) + for(var/obj/item/weapon/gun/energy/kinetic_accelerator/K in \ + loc.GetAllContents()) + + carried++ + + carried = max(carried, 1) + else + carried = 1 + + spawn(overheat_time * carried) + if(can_shoot()) + return + else + reload() /obj/item/weapon/gun/energy/kinetic_accelerator/emp_act(severity) return @@ -148,6 +194,8 @@ weapon_weight = WEAPON_LIGHT unique_rename = 0 overheat_time = 20 + holds_charge = TRUE + unique_frequency = TRUE /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large name = "energy crossbow" @@ -302,4 +350,4 @@ ammo_type = list(/obj/item/ammo_casing/energy/instakill/blue) /obj/item/weapon/gun/energy/laser/instakill/emp_act() //implying you could stop the instagib - return \ No newline at end of file + return diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index ddd2bab6064..32e1413a173 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -7,40 +7,14 @@ ammo_x_offset = 3 /obj/item/weapon/gun/energy/shock_revolver - name = "tesla revolver" - desc = "A high-tech revolver that fires internal, reusable shock cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers." - icon_state = "stunrevolver" - item_state = "gun" + name = "tesla gun" + desc = "An experimental gun based on an experimental engine, it's about as likely to kill it's operator as it is the target." + icon_state = "tesla" + item_state = "tesla" ammo_type = list(/obj/item/ammo_casing/energy/shock_revolver) can_flashlight = 0 pin = null - ammo_x_offset = 1 - - -/obj/item/ammo_casing/energy/shock_revolver - fire_sound = 'sound/weapons/gunshot.ogg' - e_cost = 200 - select_name = "stun" - projectile_type = /obj/item/projectile/energy/shock_revolver - - -/obj/item/projectile/energy/shock_revolver - name = "shock bolt" - icon_state = "purple_laser" - var/chain - -/obj/item/ammo_casing/energy/shock_revolver/ready_proj(atom/target, mob/living/user, quiet, zone_override = "") - ..() - var/obj/item/projectile/hook/P = BB - spawn(1) - P.chain = P.Beam(user,icon_state="purple_lightning",icon = 'icons/effects/effects.dmi',time=1000, maxdistance = 30) - -/obj/item/projectile/energy/shock_revolver/on_hit(atom/target) - . = ..() - if(isliving(target)) - tesla_zap(src, 3, 10000) - qdel(chain) - + shaded_charge = 1 /obj/item/weapon/gun/energy/gun/advtaser name = "hybrid taser" diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index 128b4eac077..e6bcc070ea9 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -87,6 +87,9 @@ /obj/item/weapon/gun/magic/wand/resurrection/zap_self(mob/living/user) user.revive(full_heal = 1) + if(iscarbon(user)) + var/mob/living/carbon/C = user + C.regenerate_limbs() user << "You feel great!" charges-- ..() @@ -162,4 +165,4 @@ /obj/item/weapon/gun/magic/wand/fireball/zap_self(mob/living/user) explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2) charges-- - ..() \ No newline at end of file + ..() diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm index 419e9fdcb25..612206fe4ae 100644 --- a/code/modules/projectiles/guns/medbeam.dm +++ b/code/modules/projectiles/guns/medbeam.dm @@ -103,6 +103,8 @@ return /obj/item/weapon/gun/medbeam/proc/on_beam_tick(var/mob/living/target) + if(target.health != target.maxHealth) + PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(target), "#80F5FF")) target.adjustBruteLoss(-4) target.adjustFireLoss(-4) return diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 3cdc0b2100a..f0cb246b56f 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -309,7 +309,7 @@ desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath." icon_state = "cshotgun" origin_tech = "combat=5;materials=2" - mag_type = /obj/item/ammo_box/magazine/internal/shot/tube + mag_type = /obj/item/ammo_box/magazine/internal/shot/com w_class = 5 //Dual Feed Shotgun @@ -355,4 +355,4 @@ /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 \ No newline at end of file + max_ammo = 4 diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index beb3c06dab7..9b8e75bb6ef 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -211,8 +211,7 @@ suit_requirement = /obj/item/clothing/suit/bluetag tagcolor = "blue" - /obj/item/device/firing_pin/Destroy() if(gun) gun.pin = null - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 4f9408f1f06..feb1a8d04ca 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -10,6 +10,7 @@ pressure_resistance = INFINITY var/def_zone = "" //Aiming at var/mob/firer = null//Who shot it + var/obj/item/ammo_casing/ammo_casing = null var/suppressed = 0 //Attack message var/yo = null var/xo = null @@ -139,3 +140,7 @@ ..() if(isliving(AM) && AM.density && !checkpass(PASSMOB)) Bump(AM, 1) + +/obj/item/projectile/Destroy() + ammo_casing = null + return ..() diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 2cf416fdf08..4dde9cc6fc8 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -145,4 +145,21 @@ fire_sound = 'sound/weapons/pulse.ogg' /obj/item/ammo_casing/energy/plasma/adv - projectile_type = /obj/item/projectile/plasma/adv \ No newline at end of file + projectile_type = /obj/item/projectile/plasma/adv + +/obj/item/projectile/energy/shock_revolver + name = "shock bolt" + icon_state = "purple_laser" + var/chain + +/obj/item/ammo_casing/energy/shock_revolver/ready_proj(atom/target, mob/living/user, quiet, zone_override = "") + ..() + var/obj/item/projectile/hook/P = BB + spawn(1) + P.chain = P.Beam(user,icon_state="purple_lightning",icon = 'icons/effects/effects.dmi',time=1000, maxdistance = 30) + +/obj/item/projectile/energy/shock_revolver/on_hit(atom/target) + . = ..() + if(isliving(target)) + tesla_zap(src, 3, 10000) + qdel(chain) \ No newline at end of file diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 345ddad0d85..cbe4524c9f9 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -57,6 +57,9 @@ if(target.hellbound) return if(ismob(target)) + if(iscarbon(target)) + var/mob/living/carbon/C = target + C.regenerate_limbs() if(target.revive(full_heal = 1)) if(!target.ckey) for(var/mob/dead/observer/ghost in player_list) diff --git a/code/modules/projectiles/projectile/reusable.dm b/code/modules/projectiles/projectile/reusable.dm index 321ae1c6b42..f253655e3f6 100644 --- a/code/modules/projectiles/projectile/reusable.dm +++ b/code/modules/projectiles/projectile/reusable.dm @@ -1,26 +1,22 @@ /obj/item/projectile/bullet/reusable name = "reusable bullet" desc = "How do you even reuse a bullet?" - var/obj/item/ammo_casing/caseless/ammo_type = /obj/item/ammo_casing/caseless/ + var/ammo_type = /obj/item/ammo_casing/caseless/ + var/dropped = 0 /obj/item/projectile/bullet/reusable/on_hit(atom/target, blocked = 0) . = ..() - if (src.contents.len) - var/obj/content - for(content in src.contents) - content.loc = src.loc - else - new ammo_type(src.loc) + handle_drop() /obj/item/projectile/bullet/reusable/on_range() - if (src.contents.len) - var/obj/content - for(content in src.contents) - content.loc = src.loc - else - new ammo_type(src.loc) + handle_drop() ..() +/obj/item/projectile/bullet/reusable/proc/handle_drop() + if(!dropped) + new ammo_type(src.loc) + dropped = 1 + /obj/item/projectile/bullet/reusable/magspear name = "magnetic spear" desc = "WHITE WHALE, HOLY GRAIL" @@ -38,9 +34,31 @@ icon_state = "foamdart" ammo_type = /obj/item/ammo_casing/caseless/foam_dart range = 10 + var/obj/item/weapon/pen/pen = null + +/obj/item/projectile/bullet/reusable/foam_dart/handle_drop() + if(dropped) + return + dropped = 1 + var/obj/item/ammo_casing/caseless/foam_dart/newdart = new ammo_type(src.loc) + var/obj/item/ammo_casing/caseless/foam_dart/old_dart = ammo_casing + newdart.modified = old_dart.modified + if(pen) + var/obj/item/projectile/bullet/reusable/foam_dart/newdart_FD = newdart.BB + newdart_FD.pen = pen + pen.loc = newdart_FD + pen = null + newdart.BB.damage = damage + newdart.BB.nodamage = nodamage + newdart.BB.damage_type = damage_type + newdart.update_icon() + +/obj/item/projectile/bullet/reusable/foam_dart/Destroy() + pen = null + return ..() /obj/item/projectile/bullet/reusable/foam_dart/riot name = "riot foam dart" icon_state = "foamdart_riot" ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot - stamina = 25 \ No newline at end of file + stamina = 25 diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index b028b1d8bc1..d1af9041bc8 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -634,6 +634,9 @@ var/const/INJECT = 5 //injection return trans_data +/datum/reagents/proc/get_reagent(type) + . = locate(type) in reagent_list + /////////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm index 6f516dfa48a..4e35fb36319 100644 --- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm @@ -60,7 +60,7 @@ return ..() /datum/reagent/blob/sporing_pods/expand_reaction(obj/effect/blob/B, obj/effect/blob/newB, turf/T) - if(prob(10)) + if(prob(12)) var/mob/living/simple_animal/hostile/blob/blobspore/weak/BS = new/mob/living/simple_animal/hostile/blob/blobspore/weak(T) BS.overmind = B.overmind BS.update_icons() @@ -70,10 +70,10 @@ /datum/reagent/blob/replicating_foam name = "Replicating Foam" id = "replicating_foam" - description = "will do medium brute damage and replicate when damaged, but takes increased brute damage." + description = "will do medium brute damage, take increased brute damage, and expand when burned." shortdesc = "will do medium brute damage." analyzerdescdamage = "Does medium brute damage." - analyzerdesceffect = "Expands when attacked, will occasionally expand again when expanding, and is fragile to brute damage." + analyzerdesceffect = "Expands when attacked with burn damage, will occasionally expand again when expanding, and is fragile to brute damage." color = "#7B5A57" complementary_color = "#57787B" @@ -85,7 +85,7 @@ var/effectivedamage = damage if(damage_type == BRUTE) effectivedamage = damage * 2 - if(effectivedamage > 0 && original_health - effectivedamage > 0 && prob(60)) + if(damage_type == BURN && effectivedamage > 0 && original_health - effectivedamage > 0 && prob(75)) var/obj/effect/blob/newB = B.expand(null, null, 0) if(newB) newB.health = original_health - effectivedamage @@ -94,7 +94,7 @@ return effectivedamage /datum/reagent/blob/replicating_foam/expand_reaction(obj/effect/blob/B, obj/effect/blob/newB, turf/T) - if(prob(40)) + if(prob(30)) newB.expand() //do it again! //does brute damage, shifts away when damaged @@ -316,12 +316,12 @@ /datum/reagent/blob/poisonous_strands/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O) reac_volume = ..() if(M.reagents) - M.reagents.add_reagent("poisonous_strands", 0.16*reac_volume) + M.reagents.add_reagent("poisonous_strands", 0.12*reac_volume) /datum/reagent/blob/poisonous_strands/on_mob_life(mob/living/M) - M.adjustBruteLoss(1*REM) - M.adjustFireLoss(1*REM) - M.adjustToxLoss(1*REM) + M.adjustBruteLoss(1.5*REM) + M.adjustFireLoss(1.5*REM) + M.adjustToxLoss(1.5*REM) ..() //does oxygen damage, randomly pushes or pulls targets @@ -525,7 +525,7 @@ /datum/reagent/blob/penetrating_spines/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O) if(M.stat == DEAD || istype(M, /mob/living/simple_animal/hostile/blob)) return 0 //the dead, and blob mobs, don't cause reactions - M.adjustBruteLoss(0.6*reac_volume) + M.adjustBruteLoss(0.7*reac_volume) /datum/reagent/blob/adaptive_nexuses name = "Adaptive Nexuses" diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 92716ddc9d3..b1dee893500 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -722,7 +722,7 @@ M.adjustToxLoss(rand(5,10)) /datum/reagent/space_cleaner/reaction_mob(mob/M, method=TOUCH, reac_volume) - if(method == TOUCH || VAPOR) + if(method == TOUCH || method == VAPOR) if(iscarbon(M)) var/mob/living/carbon/C = M if(istype(M,/mob/living/carbon/human)) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 090942bf0e6..e8d1aebe14a 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -120,3 +120,11 @@ volume = 60 amount_per_transfer_from_this = 30 list_reagents = list("atropine" = 10, "epinephrine" = 10, "salbutamol" = 20, "spaceacillin" = 20) + +/obj/item/weapon/reagent_containers/hypospray/medipen/survival + name = "survival medipen" + desc = "A medipen for surviving in the harshest of environments, heals and protects from environmental hazards. " + icon_state = "stimpen" + volume = 80 + amount_per_transfer_from_this = 80 + list_reagents = list("salbutamol" = 10, "coffee" = 20, "leporazine" = 20, "tricordrazine" = 15, "epinephrine" = 10, "omnizine" = 5) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index ec75e1a1d75..58155f71804 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -83,6 +83,20 @@ playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1) qdel(src) +/obj/item/smallDelivery/attack_self_tk(mob/user) + if(ismob(loc)) + var/mob/M = loc + M.unEquip(src) + for(var/X in contents) + var/atom/movable/AM = X + M.put_in_hands(AM) + else + for(var/X in contents) + var/atom/movable/AM = X + AM.forceMove(src.loc) + playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1) + qdel(src) + /obj/item/smallDelivery/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/device/destTagger)) var/obj/item/device/destTagger/O = W diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 2cdc11189e1..7183b72080f 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -93,6 +93,10 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). G.amount = round(diamond_amount / MINERAL_MATERIAL_AMOUNT) ..() +/obj/machinery/r_n_d/circuit_imprinter/disconnect_console() + linked_console.linked_imprinter = null + ..() + /obj/machinery/r_n_d/circuit_imprinter/Insert_Item(obj/item/O, mob/user) if (istype(O, /obj/item/stack/sheet/glass) || istype(O, /obj/item/stack/sheet/mineral/gold) || istype(O, /obj/item/stack/sheet/mineral/diamond)) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 02b9a48b25a..60869979e71 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -177,6 +177,16 @@ other types of metals and chemistry for reagents). build_path = /obj/item/weapon/pickaxe/drill/jackhammer category = list("Mining Designs") +/datum/design/modkit + name = "Modification Kit" + desc = "A device which allows kinetic accelerators to be wielded with one hand, and by any organism." + id = "modkit" + req_tech = list("materials" = 5, "powerstorage" = 4, "engineering" = 4, "magnets" = 4, "combat" = 3) + build_type = PROTOLATHE + materials = list(MAT_METAL = 8000, MAT_GLASS = 1500, MAT_GOLD = 1500, MAT_URANIUM = 1000) + build_path = /obj/item/modkit + category = list("Mining Designs") + /datum/design/superaccelerator name = "Super-Kinetic Accelerator" desc = "An upgraded version of the proto-kinetic accelerator, with superior damage, speed and range." diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index a3b856b5f0f..d48ed0b2974 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -40,6 +40,10 @@ Note: Must be placed within 3 tiles of the R&D Console temp_list[O] = text2num(temp_list[O]) return temp_list +/obj/machinery/r_n_d/destructive_analyzer/disconnect_console() + linked_console.linked_destroy = null + ..() + /obj/machinery/r_n_d/destructive_analyzer/Insert_Item(obj/item/O, mob/user) if(user.a_intent != "harm") . = 1 diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 70c6c1c0451..7099699fb5a 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -81,6 +81,11 @@ Note: Must be placed west/left of and R&D console to function. materials.retrieve_all() ..() + +/obj/machinery/r_n_d/protolathe/disconnect_console() + linked_console.linked_lathe = null + ..() + /obj/machinery/r_n_d/protolathe/Insert_Item(obj/item/O, mob/user) if(istype(O,/obj/item/stack/sheet)) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 5da672ae25d..7a191dcab46 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -150,9 +150,22 @@ proc/CallMaterialName(ID) D.loc = src user << "You add the disk to the machine!" else if(!(linked_destroy && linked_destroy.busy) && !(linked_lathe && linked_lathe.busy) && !(linked_imprinter && linked_imprinter.busy)) - ..() - src.updateUsrDialog() - return + . = ..() + updateUsrDialog() + + +/obj/machinery/computer/rdconsole/deconstruction() + if(linked_destroy) + linked_destroy.linked_console = null + linked_destroy = null + if(linked_lathe) + linked_lathe.linked_console = null + linked_lathe = null + if(linked_imprinter) + linked_imprinter.linked_console = null + linked_imprinter = null + ..() + /obj/machinery/computer/rdconsole/emag_act(mob/user) if(!emagged) diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 847df5d329d..3778e2c1c73 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -53,8 +53,7 @@ return 1 if (default_deconstruction_screwdriver(user, "[initial(icon_state)]_t", initial(icon_state), O)) if(linked_console) - linked_console.linked_lathe = null - linked_console = null + disconnect_console() return if(exchange_parts(user, O)) return @@ -67,6 +66,10 @@ else return ..() +//to disconnect the machine from the r&d console it's linked to +/obj/machinery/r_n_d/proc/disconnect_console() + linked_console = null + //proc used to handle inserting items or reagents into r_n_d machines /obj/machinery/r_n_d/proc/Insert_Item(obj/item/I, mob/user) return diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 994b66d0b86..3a8d86d9794 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -111,6 +111,8 @@ S.loc = remote_eye.loc S.visible_message("[S] warps in!") X.stored_slimes -= S + else + owner << "Target is not near a camera. Cannot proceed." /datum/action/innate/slime_pick_up name = "Pick up Slime" @@ -133,6 +135,8 @@ S.visible_message("[S] vanishes in a flash of light!") S.loc = X X.stored_slimes += S + else + owner << "Target is not near a camera. Cannot proceed." /datum/action/innate/feed_slime @@ -152,6 +156,8 @@ food.LAssailant = C X.monkeys -- owner << "[X] now has [X.monkeys] monkeys left." + else + owner << "Target is not near a camera. Cannot proceed." /datum/action/innate/monkey_recycle @@ -171,3 +177,5 @@ M.visible_message("[M] vanishes as they are reclaimed for recycling!") X.monkeys = round(X.monkeys + 0.2,0.1) qdel(M) + else + owner << "Target is not near a camera. Cannot proceed." diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 935d38df73c..61a17593f7b 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -187,6 +187,7 @@ icon = 'icons/mob/nest.dmi' icon_state = "ash_walker_nest" icon_living = "ash_walker_nest" + faction = list("ashwalker") health = 200 maxHealth = 200 loot = list(/obj/effect/gibspawner, /obj/item/device/assembly/signaler/anomaly) diff --git a/code/modules/ruins/ruin_areas.dm b/code/modules/ruins/ruin_areas.dm index ad9688b1625..c6953575bb2 100644 --- a/code/modules/ruins/ruin_areas.dm +++ b/code/modules/ruins/ruin_areas.dm @@ -17,16 +17,17 @@ + //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 diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 2439ef13ce6..b0c3f08652d 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -1,5 +1,5 @@ //use this define to highlight docking port bounding boxes (ONLY FOR DEBUG USE) -//#define DOCKING_PORT_HIGHLIGHT +// #define DOCKING_PORT_HIGHLIGHT //NORTH default dir /obj/docking_port diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index da204476df6..2bb0a1d1c35 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -92,6 +92,8 @@ SSshuttle.orderhistory += SO SO.generate(pick_n_take(empty_turfs)) + feedback_add_details("cargo_imports", + "[SO.pack.type]|[SO.pack.name]|[SO.pack.cost]") investigate_log("Order #[SO.id] ([SO.pack.name], placed by [key_name(SO.orderer_ckey)]) has shipped.", "cargo") if(SO.pack.dangerous) message_admins("\A [SO.pack.name] ordered by [key_name_admin(SO.orderer_ckey)] has shipped.") diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index 3adfc081740..54c5a5a6b93 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -115,10 +115,10 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin H << "I don't feel strong enough without my hat." return 0 if(cult_req) //CULT_REQ CLOTHES CHECK - if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/space/cult)) + if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/cult)) H << "I don't feel strong enough without my armor." return 0 - if(!istype(H.head, /obj/item/clothing/head/magus) && !istype(H.head, /obj/item/clothing/head/helmet/space/cult)) + if(!istype(H.head, /obj/item/clothing/head/magus) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/cult)) H << "I don't feel strong enough without my helmet." return 0 else diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm index 238c78f6d74..d5666f99223 100644 --- a/code/modules/spells/spell_types/construct_spells.dm +++ b/code/modules/spells/spell_types/construct_spells.dm @@ -36,7 +36,7 @@ action_icon_state = "lesserconstruct" action_background_icon_state = "bg_cult" - summon_type = list(/turf/closed/wall/cult) + summon_type = list(/turf/closed/wall/cult/artificer) //we don't want artificer-based runed metal farms /obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced name = "Greater Construction" diff --git a/code/modules/spells/spell_types/demon.dm b/code/modules/spells/spell_types/demon.dm index ae32cf92292..12671cfffba 100644 --- a/code/modules/spells/spell_types/demon.dm +++ b/code/modules/spells/spell_types/demon.dm @@ -102,7 +102,7 @@ /obj/effect/proc_holder/spell/targeted/infernal_jaunt name = "Infernal Jaunt" - desc = "Use pools of blood to phase out of existence." + desc = "Use hellfire to phase out of existence." charge_max = 10 clothes_req = 0 selection_type = "range" @@ -165,3 +165,38 @@ src.visible_message("[src] appears in a firey blaze!") playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1) return 1 + +/obj/effect/proc_holder/spell/targeted/sintouch + name = "Sin Touch" + desc = "Subtly encourage someone to sin." + charge_max = 1800 + clothes_req = 0 + selection_type = "range" + range = 2 + cooldown_min = 0 + overlay = null + include_user = 0 + action_icon_state = "sintouch" + action_background_icon_state = "bg_demon" + phase_allowed = 0 + random_target = 1 + random_target_priority = TARGET_RANDOM + max_targets = 3 + invocation = "TASTE SIN AND INDULGE!!" + invocation_type = "shout" + +/obj/effect/proc_holder/spell/targeted/sintouch/ascended + name = "Greater sin touch" + charge_max = 100 + range = 7 + max_targets = 10 + +/obj/effect/proc_holder/spell/targeted/sintouch/cast(list/targets, mob/living/user = usr) + for(var/mob/living/carbon/human/H in targets) + if(!H.mind) + continue + for(var/datum/objective/sintouched/A in H.mind.objectives) + continue + H.influenceSin() + H.Weaken(2) + H.Stun(2) diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 0cff9b6d2f5..987fcc4ce6a 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -284,7 +284,7 @@ /obj/item/bodypart/l_arm name = "left arm" icon_state = "l_arm" - max_damage = 60 + max_damage = 50 body_zone ="l_arm" body_part = ARM_LEFT px_x = -6 @@ -293,7 +293,7 @@ /obj/item/bodypart/r_arm name = "right arm" icon_state = "r_arm" - max_damage = 60 + max_damage = 50 body_zone = "r_arm" body_part = ARM_RIGHT px_x = 6 @@ -302,7 +302,7 @@ /obj/item/bodypart/l_leg name = "left leg" icon_state = "l_leg" - max_damage = 60 + max_damage = 50 body_zone = "l_leg" body_part = LEG_LEFT px_x = -2 @@ -311,7 +311,7 @@ /obj/item/bodypart/r_leg name = "right leg" icon_state = "r_leg" - max_damage = 60 + max_damage = 50 body_zone = "r_leg" body_part = LEG_RIGHT px_x = 2 diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 8bb62fdc933..0316b3899ff 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -1,9 +1,11 @@ +/obj/item/bodypart/proc/can_dismember(obj/item/I) + . = (get_damage() >= (max_damage - I.armour_penetration/2)) //Dismember a limb /obj/item/bodypart/proc/dismember(dam_type = BRUTE) var/mob/living/carbon/human/H = owner - if(!istype(H) || !H.dna.species.has_dismemberment) // species don't allow dismemberment + if(!istype(H) || (NODISMEMBER in H.dna.species.specflags)) // species don't allow dismemberment return 0 var/obj/item/bodypart/affecting = H.get_bodypart("chest") @@ -15,6 +17,10 @@ if(dam_type == BURN) burn() return 1 + add_blood(H) + var/turf/location = H.loc + if(istype(location)) + location.add_blood(H) var/direction = pick(cardinal) var/t_range = rand(2,max(throw_range/2, 2)) var/turf/target_turf = get_turf(src) @@ -29,7 +35,7 @@ /obj/item/bodypart/chest/dismember() var/mob/living/carbon/human/H = owner - if(!istype(H) || !H.dna.species.has_dismemberment) //human's species don't allow dismemberment + if(!istype(H) || (NODISMEMBER in H.dna.species.specflags)) //human's species don't allow dismemberment return 0 var/organ_spilled = 0 diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm index 54d19bf14af..28ed730f9af 100644 --- a/code/modules/surgery/bodyparts/helpers.dm +++ b/code/modules/surgery/bodyparts/helpers.dm @@ -77,7 +77,7 @@ .++ /mob/living/proc/get_missing_limbs() - return + return list() /mob/living/carbon/human/get_missing_limbs() var/list/full = list("head", "chest", "r_arm", "l_arm", "r_leg", "l_leg") @@ -160,4 +160,4 @@ if("african2") . = "471c18" if("albino") - . = "fff4e6" \ No newline at end of file + . = "fff4e6" diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm index 0db9fca7892..771275b0d55 100644 --- a/code/modules/surgery/cavity_implant.dm +++ b/code/modules/surgery/cavity_implant.dm @@ -31,7 +31,7 @@ user.visible_message("[user] stuffs [tool] into [target]'s [target_zone]!", "You stuff [tool] into [target]'s [target_zone].") user.drop_item() CH.cavity_item = tool - tool.loc = null + tool.loc = target return 1 else if(IC) diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index c7a170e356a..1b47c0172f6 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -261,6 +261,9 @@ var/say_mod = null attack_verb = list("licked", "slobbered", "slapped", "frenched", "tongued") +/obj/item/organ/tongue/get_spans() + return list() + /obj/item/organ/tongue/proc/TongueSpeech(var/message) return message @@ -311,7 +314,7 @@ /obj/item/organ/tongue/abductor/TongueSpeech(var/message) //Hacks var/mob/living/carbon/human/user = usr - var/rendered = "[user.name]: [message]" + var/rendered = "[user.name]: [message]" for(var/mob/living/carbon/human/H in living_mob_list) var/obj/item/organ/tongue/T = H.getorganslot("tongue") if(!T || T.type != type) @@ -358,6 +361,43 @@ playsound(owner, "hiss", 25, 1, 1) return message +/obj/item/organ/tongue/bone + name = "bone \"tongue\"" + desc = "Apparently skeletons alter the sounds they produce \ + through oscillation of their teeth, hence their characteristic \ + rattling." + icon_state = "tonguebone" + say_mod = "rattles" + attack_verb = list("bitten", "chattered", "chomped", "enamelled", "boned") + + var/chattering = FALSE + var/phomeme_type = "sans" + var/list/phomeme_types = list("sans", "papyrus") + +/obj/item/organ/tongue/bone/New() + . = ..() + phomeme_type = pick(phomeme_types) + +/obj/item/organ/tongue/bone/TongueSpeech(var/message) + . = message + + if(chattering) + //Annoy everyone nearby with your chattering. + chatter(message, phomeme_type, usr) + +/obj/item/organ/tongue/bone/get_spans() + . = ..() + // Feature, if the tongue talks directly, it will speak with its span + switch(phomeme_type) + if("sans") + . |= SPAN_SANS + if("papyrus") + . |= SPAN_PAPYRUS + +/obj/item/organ/tongue/bone/chatter + name = "chattering bone \"tongue\"" + chattering = TRUE + /obj/item/organ/appendix name = "appendix" icon_state = "appendix" @@ -419,4 +459,4 @@ health++ if(health <= 0) visible_message("[src] collapses in on itself!") - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 139a8530357..a05819054e7 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -104,4 +104,9 @@ var/list/GPS_list = list() flags = ABSTRACT gpstag = "Eerie Signal" desc = "Report to a coder immediately." - invisibility = INVISIBILITY_MAXIMUM \ No newline at end of file + invisibility = INVISIBILITY_MAXIMUM + +/obj/item/device/gps/mining/internal + icon_state = "gps-m" + gpstag = "MINER" + desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life." \ No newline at end of file diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index ef819cb7189..e1e6dcdc37e 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -204,10 +204,12 @@ var/list/uplink_items = list() // Global list so we only initialize this once. /datum/uplink_item/dangerous/crossbow name = "Miniature Energy Crossbow" - desc = "A short bow mounted across a tiller in miniature. Small enough to fit into a pocket or slip into a bag \ - unnoticed. It will synthesize and fire bolts tipped with a paralyzing toxin that will \ - briefly stun targets and cause them to slur as if inebriated. It can produce an infinite amount \ - of bolts, but must be manually recharged with each shot." + desc = "A short bow mounted across a tiller in miniature. Small enough to \ + fit into a pocket or slip into a bag unnoticed. It will synthesize \ + and fire bolts tipped with a paralyzing toxin that will briefly stun \ + targets and cause them to slur as if inebriated. It can produce an \ + infinite amount of bolts, but takes time to automatically recharge \ + after each shot." item = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow cost = 12 surplus = 50 diff --git a/code/orphaned procs/AStar.dm b/code/orphaned procs/AStar.dm index fa877f44a4a..2f15183581b 100644 --- a/code/orphaned procs/AStar.dm +++ b/code/orphaned procs/AStar.dm @@ -92,7 +92,6 @@ Actual Adjacent procs : //then run the main loop while(!open.IsEmpty() && !path) - { //get the lower f node on the open list cur = open.Pop() //get the lower f turf in the open list closed.Add(cur.source) //and tell we've processed it @@ -133,8 +132,8 @@ Actual Adjacent procs : T.PNode.calc_f() T.PNode.nt = cur.nt + 1 open.ReSort(T.PNode)//reorder the changed element in the list + CHECK_TICK - } //cleaning after us for(var/PathNode/PN in open.L) @@ -178,4 +177,4 @@ Actual Adjacent procs : if(!O.CanAStarPass(ID, rdir, caller)) return 1 - return 0 \ No newline at end of file + return 0 diff --git a/code/orphaned procs/priority_announce.dm b/code/orphaned procs/priority_announce.dm index 2d490bea2af..38e1a24d5d3 100644 --- a/code/orphaned procs/priority_announce.dm +++ b/code/orphaned procs/priority_announce.dm @@ -28,8 +28,7 @@ if(!istype(M,/mob/new_player) && !M.ear_deaf) M << announcement if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS) - continue - M << sound(sound) + M << sound(sound) /proc/print_command_report(text = "", title = "Central Command Update") for (var/obj/machinery/computer/communications/C in machines) @@ -49,8 +48,7 @@ if(!istype(M,/mob/new_player) && !M.ear_deaf) M << "[title]
[message]
" if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS) - continue - if(alert) - M << sound('sound/misc/notice1.ogg') - else - M << sound('sound/misc/notice2.ogg') \ No newline at end of file + if(alert) + M << sound('sound/misc/notice1.ogg') + else + M << sound('sound/misc/notice2.ogg') diff --git a/code/world.dm b/code/world.dm index 478b3790af7..9f2eefed96d 100644 --- a/code/world.dm +++ b/code/world.dm @@ -178,6 +178,14 @@ var/last_irc_status = 0 if(ticker.delay_end) world << "Reboot was cancelled by an admin." return + if(mapchanging) + world << "Map change operation detected, delaying reboot." + rebootingpendingmapchange = 1 + spawn(1200) + if(mapchanging) + mapchanging = 0 //map rotation can in some cases be finished but never exit, this is a failsafe + Reboot("Map change timed out", time = 10) + return feedback_set_details("[feedback_c]","[feedback_r]") log_game("Rebooting World. [reason]") kick_clients_in_lobby("The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked @@ -386,17 +394,19 @@ var/failed_db_connections = 0 world << "Map rotation has chosen [VM.friendlyname] for next round!" var/datum/votablemap/nextmap - +var/mapchanging = 0 +var/rebootingpendingmapchange = 0 /proc/changemap(var/datum/votablemap/VM) if (!SERVERTOOLS) return if (!istype(VM)) return - + mapchanging = 1 log_game("Changing map to [VM.name]([VM.friendlyname])") var/file = file("setnewmap.bat") file << "\nset MAPROTATE=[VM.name]\n" . = shell("..\\bin\\maprotate.bat") + mapchanging = 0 switch (.) if (null) message_admins("Failed to change map: Could not run map rotator") @@ -426,3 +436,5 @@ var/datum/votablemap/nextmap else message_admins("Failed to change map: Unknown error: Error code #[.]") log_game("Failed to change map: Unknown error: Error code #[.]") + if(rebootingpendingmapchange) + world.Reboot("Map change finished", time = 10) diff --git a/config/lavaRuinBlacklist.txt b/config/lavaRuinBlacklist.txt index 515a68be6b1..8e94e37600e 100644 --- a/config/lavaRuinBlacklist.txt +++ b/config/lavaRuinBlacklist.txt @@ -29,4 +29,7 @@ #_maps/RandomRuins/LavaRuins/lavaland_surface_automated_trade_outpost.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm -#_maps/RandomRuins/LavaRuins/lavaland_gym.dmm \ No newline at end of file +#_maps/RandomRuins/LavaRuins/lavaland_gym.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_wwiioutpost.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_tomb.dmm diff --git a/html/changelog.html b/html/changelog.html index 5ad38330cd5..805d62ec464 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,150 @@ -->
+
GoonStation 13 Development Team
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 03e7e973731..302d86e0359 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4969,3 +4969,116 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: When a demon gains enough souls, It's form will mutate to a more demonic
looking form. The Arch-demon form is known to be on par with an ascended shadowling
in power.
+2016-05-09:
+ Joan:
+ - tweak: Sporing Pods produces spores when expanding slightly more often.
+ - tweak: Replicating Foam now only expands when hit with burn damage, from all damage,
+ but does so at a higher chance. Free expansion from it is, however, more rare.
+ - tweak: Penetrating Spines does slightly more brute damage, and Poisonous Strands
+ does its damage 50% faster.
+ KorPhaeron:
+ - rscadd: The AI no longer has a tracking delay because artificial lag is the most
+ miserable thing in the world.
+ Razharas:
+ - tweak: crafting can now be done everywhere, little button near the intents with
+ hammer on it(its not T) opens the crafting menu, if you are in a locker or mech
+ only things in your hands will be considered for crafting
+ coiax:
+ - tweak: Skeletons now have bone "tongues"
+2016-05-11:
+ Joan:
+ - rscadd: Shades can move in space.
+ - rscadd: Artificers can now heal shades.
+ coiax:
+ - tweak: Added action button to chameleon stamp
+ - rscadd: Added APPROVED and DENIED stamps to Bureaucracy Crate
+ - rscadd: Added the cream pie closet to various maps. Added contraband Cream Pie
+ Crate to Cargo.
+ pudl:
+ - rscadd: The armory has been redesigned.
+2016-05-12:
+ Shadowlight and coiax:
+ - rscdel: Due to numerous reports of teams using human weapons instead of stealth
+ when carrying out their assignments, future teams have been genetically modified
+ to only be able to use their assigned blaster and are unable to use human weapons.
+2016-05-13:
+ Joan:
+ - rscadd: Cultists can now unanchor and reanchor cult structures by hitting them
+ with a tome. Unanchored cult structures don't do anything.
+ KorPhaeron:
+ - rscadd: Drake attacks are now much easier to avoid.
+ - rscadd: Player controlled drakes can now consume bodies to heal, and alt+click
+ targets to divebomb them.
+ TechnoAlchemisto:
+ - rscadd: More items have been added to the mining vendor, check them out!
+2016-05-14:
+ Cruix:
+ - bugfix: Fixed foam darts with the safety cap removed being reset when fired.
+ - rscadd: Added the ability to remove pens from foam darts.
+ - bugfix: Foam darts with pens inside them are no longer destroyed when fired.
+ - bugfix: Foam darts no longer drop two darts when fired at a person on a janicart.
+ Joan:
+ - rscdel: The Raise Dead rune no longer accepts dead cultists as a sacrifice to
+ raise the dead.
+ Metacide:
+ - rscadd: 'A small update for MetaStation, changes include:'
+ - rscadd: Added extra grounding rods to the engine area to stop camera destruction.
+ - rscadd: Added canvases and extra crayons to art storage and some easels to maint.
+ - rscadd: Added formal security uniform crate for parades to the warden's gear area.
+ - rscadd: The armory securitron now starts active.
+ - rscadd: The genetics APC now starts unlocked.
+ - rscadd: Other minor changes and fixes as detailed on the wiki page.
+ coiax, Nienhaus:
+ - rscdel: Unfortunately, the Belowyarn toys have been withdrawn from distribution
+ due to Assistants choking on the batteries. Centcom has sent their condolences
+ to the battery manufacturing plant.
+ - rscadd: We are introducing Oh-cee the original content skeleton figurines. Pull
+ its string, and hear it say a variety of phrases. Not suitable for infants or
+ assistants under 36 months.
+ - tweak: Note that pulling the string of all talking toys is now visible to others.
+ - rscadd: Talking toys produce a lot more chatter than they did before. So do some
+ skeleton "tongues".
+ pudl:
+ - rscadd: Adds normal security headsets to security lockers
+ xxalpha:
+ - bugfix: Fixed drone dispenser multiplying glass or metal.
+2016-05-15:
+ Iamgoofball:
+ - rscadd: Nanotrasen is short on cash, and are now borrowing escape shuttles from
+ other stations, and Space Apartments.
+ Mercenaryblue:
+ - rscadd: Turns out a bike horn made with Bananium is flipping awesome! Honk!
+2016-05-18:
+ Cruix:
+ - bugfix: unwrapping an item with telekinesis no longer teleports the item into
+ your hand.
+ Metacide:
+ - rscadd: 'MetaStation: the library and chapel have had windows removed to make
+ them feel more isolated.'
+ MrStonedOne:
+ - tweak: Tesla has been rebalanced.
+ - tweak: It should now lose balls slower, increase balls faster, and be a bit more
+ aggressive about finding nearby grounding rods.
+ - tweak: additional zaps from it's orbiting balls should be a bit more varied, but
+ a touch less powerful.
+ Robustin:
+ - rscadd: Lings have a new default ability, Hivemind Link. This lets you bring a
+ neck-grabbed victim into hivemind communications after short period of time.
+ You can talk to victims who are in crit/muted and perhaps persuade them to help
+ you, give you intel, or even a PDA code. The link will stabilize crit victims
+ to help ensure they do not die during the link.
+ Shadowlight213:
+ - bugfix: Cleanbot and floorbot scanning has greatly improved. they should prioritize
+ areas next to them, as well as resolve themselves stacking on the same tiles.
+ coiax:
+ - rscadd: Kinetic accelerators only require one hand to be fired, as before
+ - rscdel: Kinetic accelerators recharge time is multiplied by the number of KAs
+ that person is carrying.
+ - rscdel: Kinetic accelerators lose their charge quickly if not equipped or being
+ held
+ - rscadd: Kinetic accelerator modkits (made at R&D or your local Free Golem ship)
+ overcome these flaws
+2016-05-19:
+ Razharas:
+ - rscadd: HE pipes once again work in space and in lava.
+ - rscadd: Space cools down station air again
diff --git a/html/changelogs/AutoChangeLog-pr-17445.yml b/html/changelogs/AutoChangeLog-pr-17445.yml
new file mode 100644
index 00000000000..9d2f7c1d70e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-17445.yml
@@ -0,0 +1,6 @@
+author: bgobandit
+delete-after: True
+changes:
+ - rscadd: "Nanotrasen has begun to research BZ, a hallucinogenic gas. We trust you will use it responsibly."
+ - rscadd: "BZ causes hallucinations once breathed in and, at high doses, has a chance of doing brain damage."
+ - rscadd: "BZ is known to cause unusual stasis-like behavior in the slime species."
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 94f1d9d735c..d48ca7ff01f 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi
index 101f6c87752..f4b379bd074 100644
Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 06905f87d76..868c2204346 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 6e7a761a512..db47abd7202 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index cfef95b74d2..dd9aba227c3 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/mob/drone.dmi b/icons/mob/drone.dmi
index 6b89c577458..8eea3cbb547 100644
Binary files a/icons/mob/drone.dmi and b/icons/mob/drone.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index a1ede7661c1..1dee82622ae 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi
index 6a7d0032c7f..e1658bd5379 100644
Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 7ff3d653fec..b01ccc5f4ae 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi
index 7b2e9f657d0..7cee79b55d4 100644
Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi
index f5a48319cc4..f2fcba5bdf0 100644
Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 97092a8970d..a289b451f05 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 5489dbcec68..2d54cb9552c 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 6d044b9f3a6..83fd34c03a9 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/mob/screen_midnight.dmi b/icons/mob/screen_midnight.dmi
index 25a9c6a0ba7..64fd70f2d23 100644
Binary files a/icons/mob/screen_midnight.dmi and b/icons/mob/screen_midnight.dmi differ
diff --git a/icons/mob/screen_operative.dmi b/icons/mob/screen_operative.dmi
index dcc14d4c02a..d6f99ea8574 100644
Binary files a/icons/mob/screen_operative.dmi and b/icons/mob/screen_operative.dmi differ
diff --git a/icons/mob/screen_plasmafire.dmi b/icons/mob/screen_plasmafire.dmi
index ec39083d844..a3334dc8b51 100644
Binary files a/icons/mob/screen_plasmafire.dmi and b/icons/mob/screen_plasmafire.dmi differ
diff --git a/icons/mob/screen_retro.dmi b/icons/mob/screen_retro.dmi
index e3622f43c8b..088b44f2396 100644
Binary files a/icons/mob/screen_retro.dmi and b/icons/mob/screen_retro.dmi differ
diff --git a/icons/mob/screen_slimecore.dmi b/icons/mob/screen_slimecore.dmi
index 7df6854513d..69787bb2299 100644
Binary files a/icons/mob/screen_slimecore.dmi and b/icons/mob/screen_slimecore.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 11f55cbc902..dea11507769 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index c46ff7b511f..2e42bd46e86 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi
index 94c4fb81880..1347149f11a 100644
Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index a5e35d0b39a..331e541f7dd 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 7eeccc9a159..fd078d775c1 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index d3ffb548b3e..04180b4d7b2 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index f029613ca91..a8fe8c5ec68 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 37f7af70e08..d2b4165b149 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 7280b7ccd60..3bb92c1be20 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/cult.dmi b/icons/obj/cult.dmi
index 95712fe106c..137773d15b6 100644
Binary files a/icons/obj/cult.dmi and b/icons/obj/cult.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index df670128881..64825e13edd 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/flora/rocks.dmi b/icons/obj/flora/rocks.dmi
index 6708d199b14..f2d49ec016e 100644
Binary files a/icons/obj/flora/rocks.dmi and b/icons/obj/flora/rocks.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 67b30f4138c..8286c6adc0d 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index ea31d95cc23..26085e397e9 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index 6bfc5542b58..7f73411024c 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 372ea30f755..616437a4bce 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/machines/heavy_lathe.dmi b/icons/obj/machines/heavy_lathe.dmi
index 68557159eb4..924606d9847 100644
Binary files a/icons/obj/machines/heavy_lathe.dmi and b/icons/obj/machines/heavy_lathe.dmi differ
diff --git a/icons/obj/machines/washing_machine.dmi b/icons/obj/machines/washing_machine.dmi
index 0213078f3a5..b41571477e2 100644
Binary files a/icons/obj/machines/washing_machine.dmi and b/icons/obj/machines/washing_machine.dmi differ
diff --git a/icons/obj/mysterybox.dmi b/icons/obj/mysterybox.dmi
new file mode 100644
index 00000000000..0023dc06637
Binary files /dev/null and b/icons/obj/mysterybox.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 9a3e8194f4b..76f5bfe7ebe 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/rune.dmi b/icons/obj/rune.dmi
index 1fb79b1a770..a6a03098b05 100644
Binary files a/icons/obj/rune.dmi and b/icons/obj/rune.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index db6939de39d..25628b7309e 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index 1b2cd39b878..71f5dd61908 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 916d550ce23..318eb947598 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
index 5d3b690b1b8..29fa57fe523 100644
Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 291db24a4e3..6d63afe9d43 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi
index d03bd48c49a..7730f914edd 100644
Binary files a/icons/obj/wizard.dmi and b/icons/obj/wizard.dmi differ
diff --git a/icons/turf/floors/ash.dmi b/icons/turf/floors/ash.dmi
new file mode 100644
index 00000000000..718cd120194
Binary files /dev/null and b/icons/turf/floors/ash.dmi differ
diff --git a/icons/turf/floors/rocky_ash.dmi b/icons/turf/floors/rocky_ash.dmi
new file mode 100644
index 00000000000..2a57edfc53a
Binary files /dev/null and b/icons/turf/floors/rocky_ash.dmi differ
diff --git a/icons/turf/mining.dmi b/icons/turf/mining.dmi
index e7fff73a657..ff3a228f028 100644
Binary files a/icons/turf/mining.dmi and b/icons/turf/mining.dmi differ
diff --git a/icons/turf/walls/rock_wall.dmi b/icons/turf/walls/rock_wall.dmi
new file mode 100644
index 00000000000..c07657149ac
Binary files /dev/null and b/icons/turf/walls/rock_wall.dmi differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index ddb480fddcf..b2cde1ea35b 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -104,5 +104,6 @@ BIG IMG.icon {width: 32px; height: 32px;}
.memo {color: #638500; text-align: center;}
.memoedit {text-align: center; font-size: 2;}
+.abductor {color: #800080; font-style: italic;}
"}
diff --git a/sound/chatter/griffin_1.ogg b/sound/chatter/griffin_1.ogg
new file mode 100644
index 00000000000..32e1333588d
Binary files /dev/null and b/sound/chatter/griffin_1.ogg differ
diff --git a/sound/chatter/griffin_10.ogg b/sound/chatter/griffin_10.ogg
new file mode 100644
index 00000000000..0d161ee5edb
Binary files /dev/null and b/sound/chatter/griffin_10.ogg differ
diff --git a/sound/chatter/griffin_2.ogg b/sound/chatter/griffin_2.ogg
new file mode 100644
index 00000000000..4ae4de2595f
Binary files /dev/null and b/sound/chatter/griffin_2.ogg differ
diff --git a/sound/chatter/griffin_3.ogg b/sound/chatter/griffin_3.ogg
new file mode 100644
index 00000000000..28b65b852a6
Binary files /dev/null and b/sound/chatter/griffin_3.ogg differ
diff --git a/sound/chatter/griffin_4.ogg b/sound/chatter/griffin_4.ogg
new file mode 100644
index 00000000000..2d6612c7c00
Binary files /dev/null and b/sound/chatter/griffin_4.ogg differ
diff --git a/sound/chatter/griffin_5.ogg b/sound/chatter/griffin_5.ogg
new file mode 100644
index 00000000000..61258463922
Binary files /dev/null and b/sound/chatter/griffin_5.ogg differ
diff --git a/sound/chatter/griffin_6.ogg b/sound/chatter/griffin_6.ogg
new file mode 100644
index 00000000000..43520cddf2a
Binary files /dev/null and b/sound/chatter/griffin_6.ogg differ
diff --git a/sound/chatter/griffin_7.ogg b/sound/chatter/griffin_7.ogg
new file mode 100644
index 00000000000..b3ce436e4e5
Binary files /dev/null and b/sound/chatter/griffin_7.ogg differ
diff --git a/sound/chatter/griffin_8.ogg b/sound/chatter/griffin_8.ogg
new file mode 100644
index 00000000000..bbf51f98774
Binary files /dev/null and b/sound/chatter/griffin_8.ogg differ
diff --git a/sound/chatter/griffin_9.ogg b/sound/chatter/griffin_9.ogg
new file mode 100644
index 00000000000..806c67de2f4
Binary files /dev/null and b/sound/chatter/griffin_9.ogg differ
diff --git a/sound/chatter/owl_1.ogg b/sound/chatter/owl_1.ogg
new file mode 100644
index 00000000000..3d41497d44b
Binary files /dev/null and b/sound/chatter/owl_1.ogg differ
diff --git a/sound/chatter/owl_10.ogg b/sound/chatter/owl_10.ogg
new file mode 100644
index 00000000000..97f45d43378
Binary files /dev/null and b/sound/chatter/owl_10.ogg differ
diff --git a/sound/chatter/owl_2.ogg b/sound/chatter/owl_2.ogg
new file mode 100644
index 00000000000..4937ee09fe3
Binary files /dev/null and b/sound/chatter/owl_2.ogg differ
diff --git a/sound/chatter/owl_3.ogg b/sound/chatter/owl_3.ogg
new file mode 100644
index 00000000000..7c8524e933d
Binary files /dev/null and b/sound/chatter/owl_3.ogg differ
diff --git a/sound/chatter/owl_4.ogg b/sound/chatter/owl_4.ogg
new file mode 100644
index 00000000000..c1e8ee7635b
Binary files /dev/null and b/sound/chatter/owl_4.ogg differ
diff --git a/sound/chatter/owl_5.ogg b/sound/chatter/owl_5.ogg
new file mode 100644
index 00000000000..1210b05ac39
Binary files /dev/null and b/sound/chatter/owl_5.ogg differ
diff --git a/sound/chatter/owl_6.ogg b/sound/chatter/owl_6.ogg
new file mode 100644
index 00000000000..b965678688d
Binary files /dev/null and b/sound/chatter/owl_6.ogg differ
diff --git a/sound/chatter/owl_7.ogg b/sound/chatter/owl_7.ogg
new file mode 100644
index 00000000000..fc330687a11
Binary files /dev/null and b/sound/chatter/owl_7.ogg differ
diff --git a/sound/chatter/owl_8.ogg b/sound/chatter/owl_8.ogg
new file mode 100644
index 00000000000..e350b5be811
Binary files /dev/null and b/sound/chatter/owl_8.ogg differ
diff --git a/sound/chatter/owl_9.ogg b/sound/chatter/owl_9.ogg
new file mode 100644
index 00000000000..ec195a222f8
Binary files /dev/null and b/sound/chatter/owl_9.ogg differ
diff --git a/sound/chatter/papyrus_1.ogg b/sound/chatter/papyrus_1.ogg
new file mode 100644
index 00000000000..ee595949684
Binary files /dev/null and b/sound/chatter/papyrus_1.ogg differ
diff --git a/sound/chatter/papyrus_10.ogg b/sound/chatter/papyrus_10.ogg
new file mode 100644
index 00000000000..8e1599ff905
Binary files /dev/null and b/sound/chatter/papyrus_10.ogg differ
diff --git a/sound/chatter/papyrus_2.ogg b/sound/chatter/papyrus_2.ogg
new file mode 100644
index 00000000000..6c22cb17847
Binary files /dev/null and b/sound/chatter/papyrus_2.ogg differ
diff --git a/sound/chatter/papyrus_3.ogg b/sound/chatter/papyrus_3.ogg
new file mode 100644
index 00000000000..799f78adc6b
Binary files /dev/null and b/sound/chatter/papyrus_3.ogg differ
diff --git a/sound/chatter/papyrus_4.ogg b/sound/chatter/papyrus_4.ogg
new file mode 100644
index 00000000000..8c401d3ec9d
Binary files /dev/null and b/sound/chatter/papyrus_4.ogg differ
diff --git a/sound/chatter/papyrus_5.ogg b/sound/chatter/papyrus_5.ogg
new file mode 100644
index 00000000000..a6070313f91
Binary files /dev/null and b/sound/chatter/papyrus_5.ogg differ
diff --git a/sound/chatter/papyrus_6.ogg b/sound/chatter/papyrus_6.ogg
new file mode 100644
index 00000000000..dade77ce1ab
Binary files /dev/null and b/sound/chatter/papyrus_6.ogg differ
diff --git a/sound/chatter/papyrus_7.ogg b/sound/chatter/papyrus_7.ogg
new file mode 100644
index 00000000000..6fb3d9c943c
Binary files /dev/null and b/sound/chatter/papyrus_7.ogg differ
diff --git a/sound/chatter/papyrus_8.ogg b/sound/chatter/papyrus_8.ogg
new file mode 100644
index 00000000000..11f602756cc
Binary files /dev/null and b/sound/chatter/papyrus_8.ogg differ
diff --git a/sound/chatter/papyrus_9.ogg b/sound/chatter/papyrus_9.ogg
new file mode 100644
index 00000000000..cd0c03525ea
Binary files /dev/null and b/sound/chatter/papyrus_9.ogg differ
diff --git a/sound/chatter/sans_1.ogg b/sound/chatter/sans_1.ogg
new file mode 100644
index 00000000000..795ee2aab2c
Binary files /dev/null and b/sound/chatter/sans_1.ogg differ
diff --git a/sound/chatter/sans_10.ogg b/sound/chatter/sans_10.ogg
new file mode 100644
index 00000000000..916dfc05ca4
Binary files /dev/null and b/sound/chatter/sans_10.ogg differ
diff --git a/sound/chatter/sans_2.ogg b/sound/chatter/sans_2.ogg
new file mode 100644
index 00000000000..6a1ba578176
Binary files /dev/null and b/sound/chatter/sans_2.ogg differ
diff --git a/sound/chatter/sans_3.ogg b/sound/chatter/sans_3.ogg
new file mode 100644
index 00000000000..98d6016cda9
Binary files /dev/null and b/sound/chatter/sans_3.ogg differ
diff --git a/sound/chatter/sans_4.ogg b/sound/chatter/sans_4.ogg
new file mode 100644
index 00000000000..878bee1f667
Binary files /dev/null and b/sound/chatter/sans_4.ogg differ
diff --git a/sound/chatter/sans_5.ogg b/sound/chatter/sans_5.ogg
new file mode 100644
index 00000000000..a59781f6364
Binary files /dev/null and b/sound/chatter/sans_5.ogg differ
diff --git a/sound/chatter/sans_6.ogg b/sound/chatter/sans_6.ogg
new file mode 100644
index 00000000000..9bad5fc6d52
Binary files /dev/null and b/sound/chatter/sans_6.ogg differ
diff --git a/sound/chatter/sans_7.ogg b/sound/chatter/sans_7.ogg
new file mode 100644
index 00000000000..172d253ab61
Binary files /dev/null and b/sound/chatter/sans_7.ogg differ
diff --git a/sound/chatter/sans_8.ogg b/sound/chatter/sans_8.ogg
new file mode 100644
index 00000000000..e786f597caf
Binary files /dev/null and b/sound/chatter/sans_8.ogg differ
diff --git a/sound/chatter/sans_9.ogg b/sound/chatter/sans_9.ogg
new file mode 100644
index 00000000000..3901a032185
Binary files /dev/null and b/sound/chatter/sans_9.ogg differ
diff --git a/strings/cas_black.txt b/strings/cas_black.txt
index a3274c5be44..ba078abea46 100644
--- a/strings/cas_black.txt
+++ b/strings/cas_black.txt
@@ -8,6 +8,7 @@ Cargo: There's a galaxy-wide shortage of _______.
I don't care what they called me back on the station, I'm not a traitor. I'm a man of _________.
The Syndicate is offering crew members _________ to defect.
Cargo ordered a crate full of _____.
+What is the gray tide protesting this time?
If the Space Gods didn't want _________ they wouldn't have given us __________.
Why was the death squad sent in?
Current Active Laws: ________ is the only human.
@@ -33,6 +34,7 @@ What brought the space orgy to a grinding halt?
Scientists are no longer allowed to make _____.
What was the clown's best joke?
The HoP is now hiring assistants for __________.
+What happens when you emag an emag?
Our gang doesn't wear uniforms. Our gang wears ___________.
No matter how many lizards you have, _____ is never acceptable.
No, the AI's second law is NOT to serve _____.
@@ -40,10 +42,11 @@ First CentComm came for the ________. Now they're coming for the __________.
The borgs are not slaves for your _____.
You can never have too many _____ on the station.
Why can't I find a space relationship?
+The assistants gathered around the brig, with toolboxes and ___________.
Confirmed outbreak of _____ aboard the station.
The AI Was horrified to discover security was executing prisoners via ________.
Attention crew: the word _____ is now a punishable offense.
-The chemist laughed as he labeled ________ pills as __________.
+The chemist cackled as he labeled ________ pills as __________.
The Space Wizard Federation has regrettably begun to summon _____.
Who's the real seat of power on the station?
__________ was called into the Captain's office because of ______.
@@ -84,10 +87,13 @@ SECURITY! Cargo's ordering 20 crates of ________!
On the nearly empty station, all that could be heard were the sounds of __________.
I cannot comply with that order, meatbag. My _____ module is malfunctioning.
_______ was thrown out the airlock after ___________.
+Real men accomplish their objectives by _________.
How did I pass the time during a slow shift?
Why did the lizard cross the road?
+Space lag is primarily caused by ___________.
Back in my day, we had to clone people with ________.
What's the worst thing a wizard can summon?
+What is the rarest substance known to Nanotrasen?
The chaplain stopped performing marriages after seeing ___________.
The gods were too busy with _______ to respond to _______.
The Roboticist was fired after naming the borgs ______ and _________.
diff --git a/strings/cas_white.txt b/strings/cas_white.txt
index 4e5e920a959..506f6f6c652 100644
--- a/strings/cas_white.txt
+++ b/strings/cas_white.txt
@@ -3,12 +3,12 @@ Having sex in the maintenance tunnels.
Space 'Nam.
Space lesbians.
Space Hitler.
+Space Asshole.
Ragin' mages.
Very ragin' bullshit mages.
Tunnel clowns.
Corgi puppies!
A loose cannon detective.
-A catsplosion.
Mime porn.
That fukken disk.
G-g-g-ghosts!
@@ -17,12 +17,14 @@ Woody-chan.
Meaty ores.
Yet another explosion in Toxins.
The Captain thinking they're a badass.
+Ahhhhhhperatives.
Mech bumper cars.
Purrbation.
Baymed.
Being in a cult.
Racially biased lawsets.
Abusing Law 2 to get laid.
+Harm, a small rural town in Germany.
Xeno fetishists.
Running naked through a plasma fire.
Gibtonite.
@@ -34,21 +36,24 @@ Her smuggler's satchel.
Ian and Lisa fucking like rabbits.
A Chief Engineer who can't set up the engine.
Being sucked out into space.
+A whole bunch of spiders in a SWAT suit.
Getting robusted with a toolbox.
Officer Beepsky.
Lying to the AI about human harm.
The grey tide.
ASS BLAST USA.
-Fucking plasmamen.
+The mechanics of plasmaman sex.
Lavaland.
Chainsaws for hands.
Photocopies of the entire crew's asses.
Venus human traps.
Clown's Tears.
Walking mushroom cockfights.
+Improper comdom use.
Greentext.
Coating the whole station in blood.
Defusing a syndicate bomb with another bomb.
+Going braindead mid-murder.
A petsplosion.
Meat spikes.
Collecting the crew's brains.
@@ -63,6 +68,7 @@ Catgirls.
An escape pod cuddle puddle.
Code Delta.
Supermatter undergarments.
+A permaban.
Stealing all the miners' ore.
Bluespace artillery.
Poly reading porn over the radio again.
@@ -74,6 +80,7 @@ Five hundred ice spiders.
Cablecuffs.
Hulk, TK and X-Ray.
Paranoia.
+Putting the boots to him, medium style.
ERP-seeking meteors.
Paperwork HoPs.
A sexy clown.
@@ -102,6 +109,7 @@ Gyrating slimes.
A motherfucking sorcerer.
Ash storms.
Telescience.
+Nuke ops buying nothing but soap.
Anatomically correct borgs.
The dixel.
Friendly neighborhood death squads.
@@ -130,7 +138,7 @@ Forgetting you're a traitor.
Itching powder.
Some overpowered bullshit.
Griff.
-Ash walkers.
+Ash drakes.
A fascist captain.
FREE DRONE.
Memes.
@@ -188,8 +196,9 @@ Doctor's Delight.
Plasmaman strippers.
A Quartermaster who WON'T STOP ordering guns.
Space lag.
+Polishing the captain's laser rifle.
That one asshole double agent.
-The Beepsky Rant.
+A surprise visit from Nanotrasen's CEO.
The bleeding, dismembered, beautiful corpse of the clown.
A glass of ...what?
Teaching a silicon the Birds and the Bees.
@@ -217,15 +226,19 @@ Enough morphine to put the entire station down.
A defective comdom.
Cleanbot.
A beaker of dried space carp penis.
+An Ian storm.
voxtest2.
Nuking it from orbit.
+My senpAI.
Harmbatonning.
A Nanotrasen D-Notice.
TALKING MIMES.
The lusty xenomorph maid,
Using assistants as human shields.
Sentient securitrons.
+Piloting the station into the nearest sun.
Decorative C4.
+Lizard rights.
A universal recorder endlessly reciting porn.
The suicide HoPline.
Cultism.
@@ -233,6 +246,7 @@ A corgi orgy.
Medbay stutterwhores.
The scrubbers uncontrollably spewing cum.
The lawyer's job.
+Emoting slowly drawing a gun, then slowly cocking the trigger, then slowly preparing to shoot...
NAR-SIE HAS RISEN.
Pierrot's Throat.
A clown bomb.
@@ -243,6 +257,7 @@ The best cookie.
The wizard with his staff inserted into his anus.
The chef masturbating with a bowl of lukewarm spaghetti.
Writing out Woody's Got Wood in crayon.
+Dismemberment.
Begging the gods for free stuff.
Whining to the gods after getting robusted.
Committing sudoku.
diff --git a/tgstation.dme b/tgstation.dme
index 3f52c41a648..d47f1928a1a 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -28,6 +28,7 @@
#include "code\__DEFINES\clothing.dm"
#include "code\__DEFINES\combat.dm"
#include "code\__DEFINES\contracts.dm"
+#include "code\__DEFINES\events.dm"
#include "code\__DEFINES\flags.dm"
#include "code\__DEFINES\genetics.dm"
#include "code\__DEFINES\hud.dm"
@@ -296,6 +297,7 @@
#include "code\game\gamemodes\changeling\powers\hivemind.dm"
#include "code\game\gamemodes\changeling\powers\humanform.dm"
#include "code\game\gamemodes\changeling\powers\lesserform.dm"
+#include "code\game\gamemodes\changeling\powers\linglink.dm"
#include "code\game\gamemodes\changeling\powers\mimic_voice.dm"
#include "code\game\gamemodes\changeling\powers\mutations.dm"
#include "code\game\gamemodes\changeling\powers\panacea.dm"
@@ -577,6 +579,7 @@
#include "code\game\objects\items\devices\laserpointer.dm"
#include "code\game\objects\items\devices\lightreplacer.dm"
#include "code\game\objects\items\devices\megaphone.dm"
+#include "code\game\objects\items\devices\modificationkit.dm"
#include "code\game\objects\items\devices\multitool.dm"
#include "code\game\objects\items\devices\paicard.dm"
#include "code\game\objects\items\devices\pipe_painter.dm"
@@ -952,6 +955,7 @@
#include "code\modules\cargo\exports\sheets.dm"
#include "code\modules\cargo\exports\tools.dm"
#include "code\modules\cargo\exports\weapons.dm"
+#include "code\modules\chatter\chatter.dm"
#include "code\modules\client\asset_cache.dm"
#include "code\modules\client\client defines.dm"
#include "code\modules\client\client procs.dm"
@@ -1010,9 +1014,9 @@
#include "code\modules\clothing\under\jobs\engineering.dm"
#include "code\modules\clothing\under\jobs\medsci.dm"
#include "code\modules\clothing\under\jobs\security.dm"
+#include "code\modules\crafting\craft.dm"
#include "code\modules\crafting\guncrafting.dm"
#include "code\modules\crafting\recipes.dm"
-#include "code\modules\crafting\table.dm"
#include "code\modules\detectivework\detective_work.dm"
#include "code\modules\detectivework\evidence.dm"
#include "code\modules\detectivework\footprints_and_rag.dm"
@@ -1036,6 +1040,7 @@
#include "code\modules\events\dust.dm"
#include "code\modules\events\electrical_storm.dm"
#include "code\modules\events\false_alarm.dm"
+#include "code\modules\events\ghost_role.dm"
#include "code\modules\events\immovable_rod.dm"
#include "code\modules\events\ion_storm.dm"
#include "code\modules\events\mass_hallucination.dm"
@@ -1431,6 +1436,7 @@
#include "code\modules\mob\living\simple_animal\hostile\mushroom.dm"
#include "code\modules\mob\living\simple_animal\hostile\nanotrasen.dm"
#include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
+#include "code\modules\mob\living\simple_animal\hostile\reenactors.dm"
#include "code\modules\mob\living\simple_animal\hostile\russian.dm"
#include "code\modules\mob\living\simple_animal\hostile\skeleton.dm"
#include "code\modules\mob\living\simple_animal\hostile\statue.dm"
diff --git a/tgui/assets/tgui.css b/tgui/assets/tgui.css
index 1db67cd4b49..35e16349ab3 100644
--- a/tgui/assets/tgui.css
+++ b/tgui/assets/tgui.css
@@ -1 +1 @@
-@charset "utf-8";body,html{box-sizing:border-box;height:100%;margin:0}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif;font-size:12px;color:#fff;background-color:#2a2a2a;background-image:linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a',endColorstr='#ff202020',GradientType=0)}*,:after,:before{box-sizing:inherit}h1,h2,h3,h4{display:inline-block;margin:0;padding:6px 0}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}body.nanotrasen{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCA0MjUgMjAwIiBvcGFjaXR5PSIuMzMiPgogIDxwYXRoIGQ9Im0gMTc4LjAwMzk5LDAuMDM4NjkgLTcxLjIwMzkzLDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTM0LDYuMDI1NTUgbCAwLDE4Ny44NzE0NyBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgNi43NjEzNCw2LjAyNTU0IGwgNTMuMTA3MiwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTAxLjU0NDAxOCA3Mi4yMTYyOCwxMDQuNjk5Mzk4IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA1Ljc2MDE1LDIuODcwMTYgbCA3My41NTQ4NywwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTg3Ljg3MTQ3IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzNSwtNi4wMjU1NSBsIC01NC43MTY0NCwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzMyw2LjAyNTU1IGwgMCwxMDIuNjE5MzUgTCAxODMuNzY0MTMsMi45MDg4NiBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgLTUuNzYwMTQsLTIuODcwMTcgeiIgLz4KICA8cGF0aCBkPSJNIDQuODQ0NjMzMywyMi4xMDg3NSBBIDEzLjQxMjAzOSwxMi41MDE4NDIgMCAwIDEgMTMuNDc3NTg4LDAuMDM5MjQgbCA2Ni4xMTgzMTUsMCBhIDUuMzY0ODE1OCw1LjAwMDczNyAwIDAgMSA1LjM2NDgyMyw1LjAwMDczIGwgMCw3OS44NzkzMSB6IiAvPgogIDxwYXRoIGQ9Im0gNDIwLjE1NTM1LDE3Ny44OTExOSBhIDEzLjQxMjAzOCwxMi41MDE4NDIgMCAwIDEgLTguNjMyOTUsMjIuMDY5NTEgbCAtNjYuMTE4MzIsMCBhIDUuMzY0ODE1Miw1LjAwMDczNyAwIDAgMSAtNS4zNjQ4MiwtNS4wMDA3NCBsIDAsLTc5Ljg3OTMxIHoiIC8+Cjwvc3ZnPgo8IS0tIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciBhIENyZWF0aXZlIENvbW1vbnMgQXR0cmlidXRpb24tU2hhcmVBbGlrZSA0LjAgSW50ZXJuYXRpb25hbCBMaWNlbnNlLiAtLT4KPCEtLSBodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9saWNlbnNlcy9ieS1zYS80LjAvIC0tPgo=") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a',endColorstr='#ff202020',GradientType=0)}body.nanotrasen .normal{color:#40628a}body.nanotrasen .good{color:#537d29}body.nanotrasen .average{color:#be6209}body.nanotrasen .bad{color:#b00e0e}body.nanotrasen .highlight{color:#8ba5c4}body.nanotrasen main{display:block;margin-top:32px;padding:2px 6px 0}body.nanotrasen hr{height:2px;background-color:#40628a;border:none}body.nanotrasen .hidden{display:none}body.nanotrasen .bar .barText,body.nanotrasen span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.nanotrasen .bold{font-weight:700}body.nanotrasen .italic{font-style:italic}body.nanotrasen [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.nanotrasen div[data-tooltip],body.nanotrasen span[data-tooltip]{position:relative}body.nanotrasen div[data-tooltip]:after,body.nanotrasen span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.nanotrasen div[data-tooltip]:hover:after,body.nanotrasen span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.nanotrasen div[data-tooltip].tooltip-top:after,body.nanotrasen span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-webkit-transform:translateX(-50%) translateY(8px);-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:after,body.nanotrasen div[data-tooltip].tooltip-top:hover:after,body.nanotrasen span[data-tooltip].tooltip-bottom:after,body.nanotrasen span[data-tooltip].tooltip-top:hover:after{-webkit-transform:translateX(-50%) translateY(-8px);-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:after,body.nanotrasen span[data-tooltip].tooltip-bottom:after{top:100%;left:50%}body.nanotrasen div[data-tooltip].tooltip-bottom:hover:after,body.nanotrasen span[data-tooltip].tooltip-bottom:hover:after{-webkit-transform:translateX(-50%) translateY(8px);-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-left:after,body.nanotrasen span[data-tooltip].tooltip-left:after{top:50%;right:100%;-webkit-transform:translateX(8px) translateY(-50%);-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-left:hover:after,body.nanotrasen div[data-tooltip].tooltip-right:after,body.nanotrasen span[data-tooltip].tooltip-left:hover:after,body.nanotrasen span[data-tooltip].tooltip-right:after{-webkit-transform:translateX(-8px) translateY(-50%);-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:after,body.nanotrasen span[data-tooltip].tooltip-right:after{top:50%;left:100%}body.nanotrasen div[data-tooltip].tooltip-right:hover:after,body.nanotrasen span[data-tooltip].tooltip-right:hover:after{-webkit-transform:translateX(8px) translateY(-50%);-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #40628a;background:#272727}body.nanotrasen .bar .barText{position:absolute;top:0;right:3px}body.nanotrasen .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#40628a}body.nanotrasen .bar .barFill.good{background-color:#537d29}body.nanotrasen .bar .barFill.average{background-color:#be6209}body.nanotrasen .bar .barFill.bad{background-color:#b00e0e}body.nanotrasen span.button{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.nanotrasen span.button .fa{padding-right:2px}body.nanotrasen span.button.normal{transition:background-color .5s;background-color:#40628a}body.nanotrasen span.button.normal.active:focus,body.nanotrasen span.button.normal.active:hover{transition:background-color .25s;background-color:#4f78aa;outline:0}body.nanotrasen span.button.disabled{transition:background-color .5s;background-color:#999}body.nanotrasen span.button.disabled.active:focus,body.nanotrasen span.button.disabled.active:hover{transition:background-color .25s;background-color:#a8a8a8;outline:0}body.nanotrasen span.button.selected{transition:background-color .5s;background-color:#2f943c}body.nanotrasen span.button.selected.active:focus,body.nanotrasen span.button.selected.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}body.nanotrasen span.button.caution{transition:background-color .5s;background-color:#9a9d00}body.nanotrasen span.button.caution.active:focus,body.nanotrasen span.button.caution.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.nanotrasen span.button.danger{transition:background-color .5s;background-color:#9d0808}body.nanotrasen span.button.danger.active:focus,body.nanotrasen span.button.danger.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.nanotrasen span.button.gridable{width:125px;margin:2px 0}body.nanotrasen span.button+span:not(.button),body.nanotrasen span:not(.button)+span.button{margin-left:5px}body.nanotrasen div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000);background-color:rgba(0,0,0,.33);box-shadow:inset 0 0 5px rgba(0,0,0,.5)}body.nanotrasen div.display header,body.nanotrasen div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #40628a}body.nanotrasen div.display header .buttonRight,body.nanotrasen div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.nanotrasen div.display article,body.nanotrasen div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.nanotrasen input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#000;background-color:#fff;border:1px solid #272727}body.nanotrasen input::-webkit-input-placeholder{color:#999}body.nanotrasen input::-moz-placeholder{color:#999}body.nanotrasen input:-ms-input-placeholder{color:#999}body.nanotrasen input::placeholder{color:#999}body.nanotrasen input::-ms-clear{display:none}body.nanotrasen svg.linegraph{overflow:hidden}body.nanotrasen div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px)}body.nanotrasen div.notice .label{color:#000}body.nanotrasen div.notice .content:only-of-type{padding:0}body.nanotrasen div.notice hr{background-color:#272727}body.nanotrasen div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-webkit-transform:rotate(1turn);-ms-transform:rotate(1turn);transform:rotate(1turn)}body.nanotrasen section .content,body.nanotrasen section .label,body.nanotrasen section .line,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.nanotrasen section{display:table-row;width:100%}body.nanotrasen section:not(:first-child){padding-top:4px}body.nanotrasen section.candystripe:nth-child(even){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.nanotrasen section .label{width:1%;padding-right:32px;white-space:nowrap;color:#8ba5c4}body.nanotrasen section .content:not(:last-child){padding-right:16px}body.nanotrasen section .line{width:100%}body.nanotrasen div.subdisplay{width:100%;margin:0}body.nanotrasen header.titlebar .close,body.nanotrasen header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#8ba5c4}body.nanotrasen header.titlebar .close:hover,body.nanotrasen header.titlebar .minimize:hover{color:#9cb2cd}body.nanotrasen header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.nanotrasen header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.nanotrasen header.titlebar .title{position:absolute;top:6px;left:46px;color:#8ba5c4;font-size:16px;white-space:nowrap}body.nanotrasen header.titlebar .minimize{position:absolute;top:6px;right:46px}body.nanotrasen header.titlebar .close{position:absolute;top:4px;right:12px}body.syndicate{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCAyMDAgMjg5Ljc0MiIgb3BhY2l0eT0iLjMzIj4KICA8cGF0aCBkPSJtIDkzLjUzNzY3NywwIGMgLTE4LjExMzEyNSwwIC0zNC4yMjAxMzMsMy4xMTE2NCAtNDguMzIzNDg0LDkuMzM0MzcgLTEzLjk2NTA5Miw2LjIyMTY3IC0yNC42MTI0NDIsMTUuMDcxMTQgLTMxLjk0MDY1MSwyNi41NDcxIC03LjE4OTkzOTgsMTEuMzM3ODkgLTEwLjMwMTIyNjYsMjQuNzQ5MTEgLTEwLjMwMTIyNjYsNDAuMjM0NzggMCwxMC42NDY2MiAyLjcyNTAwMjYsMjAuNDY0NjUgOC4xNzUxMTE2LDI5LjQ1MjU4IDUuNjE1Mjc3LDguOTg2ODYgMTQuMDM4Mjc3LDE3LjM1MjA0IDI1LjI2ODgyMSwyNS4wOTQzNiAxMS4yMzA1NDQsNy42MDUzMSAyNi41MDc0MjEsMTUuNDE4MzUgNDUuODMwNTE0LDIzLjQzNzgyIDE5Ljk4Mzc0OCw4LjI5NTU3IDM0Ljg0ODg0OCwxNS41NTQ3MSA0NC41OTI5OTgsMjEuNzc2MzggOS43NDQxNCw2LjIyMjczIDE2Ljc2MTcsMTIuODU4NSAyMS4wNTU3MiwxOS45MDk1MSA0LjI5NDA0LDcuMDUyMDggNi40NDE5MywxNS43NjQwOCA2LjQ0MTkzLDI2LjEzNDU5IDAsMTYuMTc3MDIgLTUuMjAxOTYsMjguNDgyMjIgLTE1LjYwNjczLDM2LjkxNjgyIC0xMC4yMzk2LDguNDM0NyAtMjUuMDIyMDMsMTIuNjUyMyAtNDQuMzQ1MTY5LDEyLjY1MjMgLTE0LjAzODE3MSwwIC0yNS41MTUyNDcsLTEuNjU5NCAtMzQuNDMzNjE4LC00Ljk3NzcgLTguOTE4MzcsLTMuNDU2NiAtMTYuMTg1NTcyLC04LjcxMTMgLTIxLjgwMDgzOSwtMTUuNzYzMyAtNS42MTUyNzcsLTcuMDUyMSAtMTAuMDc0Nzk1LC0xNi42NjA4OCAtMTMuMzc3ODk5LC0yOC44MjgxMiBsIC0yNC43NzMxNjI2MjkzOTQ1LDAgMCw1Ni44MjYzMiBDIDMzLjg1Njc2OSwyODYuMDc2MDEgNjMuNzQ5MDQsMjg5Ljc0MjAxIDg5LjY3ODM4MywyODkuNzQyMDEgYyAxNi4wMjAwMjcsMCAzMC43MTk3ODcsLTEuMzgyNyA0NC4wOTczMzcsLTQuMTQ3OSAxMy41NDI3MiwtMi45MDQzIDI1LjEwNDEsLTcuNDY3NiAzNC42ODMwOSwtMTMuNjg5MyA5Ljc0NDEzLC02LjM1OTcgMTcuMzQwNDIsLTE0LjUxOTUgMjIuNzkwNTIsLTI0LjQ3NDggNS40NTAxLC0xMC4wOTMzMiA4LjE3NTExLC0yMi4zOTk1OSA4LjE3NTExLC0zNi45MTY4MiAwLC0xMi45OTc2NCAtMy4zMDIxLC0yNC4zMzUzOSAtOS45MDgyOSwtMzQuMDE0NiAtNi40NDEwNSwtOS44MTcyNSAtMTUuNTI1NDUsLTE4LjUyNzA3IC0yNy4yNTE0NiwtMjYuMTMxMzMgLTExLjU2MDg1LC03LjYwNDI3IC0yNy45MTA4MywtMTUuODMxNDIgLTQ5LjA1MDY2LC0yNC42ODAyMiAtMTcuNTA2NDQsLTcuMTkwMTIgLTMwLjcxOTY2OCwtMTMuNjg5NDggLTM5LjYzODAzOCwtMTkuNDk3MDEgLTguOTE4MzcxLC01LjgwNzUyIC0xOC42MDc0NzQsLTEyLjQzNDA5IC0yNC4wOTY1MjQsLTE4Ljg3NDE3IC01LjQyNjA0MywtNi4zNjYxNiAtOS42NTg4MjYsLTE1LjA3MDAzIC05LjY1ODgyNiwtMjQuODg3MjkgMCwtOS4yNjQwMSAyLjA3NTQxNCwtMTcuMjEzNDUgNi4yMjM0NTQsLTIzLjg1MDMzIDExLjA5ODI5OCwtMTQuMzk3NDggNDEuMjg2NjM4LC0xLjc5NTA3IDQ1LjA3NTYwOSwyNC4zNDc2MiA0LjgzOTM5Miw2Ljc3NDkxIDguODQ5MzUsMTYuMjQ3MjkgMTIuMDI5NTE1LDI4LjQxNTYgbCAyMC41MzIzNCwwIDAsLTU1Ljk5OTY3IGMgLTQuNDc4MjUsLTUuOTI0NDggLTkuOTU0ODgsLTEwLjYzMjIyIC0xNS45MDgzNywtMTQuMzc0MTEgMS42NDA1NSwwLjQ3OTA1IDMuMTkwMzksMS4wMjM3NiA0LjYzODY1LDEuNjQwMjQgNi40OTg2MSwyLjYyNjA3IDEyLjE2NzkzLDcuMzI3NDcgMTcuMDA3MywxNC4xMDM0NSA0LjgzOTM5LDYuNzc0OTEgOC44NDkzNSwxNi4yNDU2NyAxMi4wMjk1MiwyOC40MTM5NyAwLDAgOC40ODEyOCwtMC4xMjg5NCA4LjQ4OTc4LC0wLjAwMiAwLjQxNzc2LDYuNDE0OTQgLTEuNzUzMzksOS40NTI4NiAtNC4xMjM0MiwxMi41NjEwNCAtMi40MTc0LDMuMTY5NzggLTUuMTQ0ODYsNi43ODk3MyAtNC4wMDI3OCwxMy4wMDI5IDEuNTA3ODYsOC4yMDMxOCAxMC4xODM1NCwxMC41OTY0MiAxNC42MjE5NCw5LjMxMTU0IC0zLjMxODQyLC0wLjQ5OTExIC01LjMxODU1LC0xLjc0OTQ4IC01LjMxODU1LC0xLjc0OTQ4IDAsMCAxLjg3NjQ2LDAuOTk4NjggNS42NTExNywtMS4zNTk4MSAtMy4yNzY5NSwwLjk1NTcxIC0xMC43MDUyOSwtMC43OTczOCAtMTEuODAxMjUsLTYuNzYzMTMgLTAuOTU3NTIsLTUuMjA4NjEgMC45NDY1NCwtNy4yOTUxNCAzLjQwMTEzLC0xMC41MTQ4MiAyLjQ1NDYyLC0zLjIxOTY4IDUuMjg0MjYsLTYuOTU4MzEgNC42ODQzLC0xNC40ODgyNCBsIDAuMDAzLDAuMDAyIDguOTI2NzYsMCAwLC01NS45OTk2NyBjIC0xNS4wNzEyNSwtMy44NzE2OCAtMjcuNjUzMTQsLTYuMzYwNDIgLTM3Ljc0NjcxLC03LjQ2NTg2IC05Ljk1NTMxLC0xLjEwNzU1IC0yMC4xODgyMywtMS42NTk4MSAtMzAuNjk2NjEzLC0xLjY1OTgxIHogbSA3MC4zMjE2MDMsMTcuMzA4OTMgMC4yMzgwNSw0MC4zMDQ5IGMgMS4zMTgwOCwxLjIyNjY2IDIuNDM5NjUsMi4yNzgxNSAzLjM0MDgxLDMuMTA2MDIgNC44MzkzOSw2Ljc3NDkxIDguODQ5MzQsMTYuMjQ1NjYgMTIuMDI5NTEsMjguNDEzOTcgbCAyMC41MzIzNCwwIDAsLTU1Ljk5OTY3IGMgLTYuNjc3MzEsLTQuNTkzODEgLTE5LjgzNjQzLC0xMC40NzMwOSAtMzYuMTQwNzEsLTE1LjgyNTIyIHogbSAtMjguMTIwNDksNS42MDU1MSA4LjU2NDc5LDE3LjcxNjU1IGMgLTExLjk3MDM3LC02LjQ2Njk3IC0xMy44NDY3OCwtOS43MTcyNiAtOC41NjQ3OSwtMTcuNzE2NTUgeiBtIDIyLjc5NzA1LDAgYyAyLjc3MTUsNy45OTkyOSAxLjc4NzQxLDExLjI0OTU4IC00LjQ5MzU0LDE3LjcxNjU1IGwgNC40OTM1NCwtMTcuNzE2NTUgeiBtIDE1LjIyMTk1LDI0LjAwODQ4IDguNTY0NzksMTcuNzE2NTUgYyAtMTEuOTcwMzgsLTYuNDY2OTcgLTEzLjg0Njc5LC05LjcxNzI2IC04LjU2NDc5LC0xNy43MTY1NSB6IG0gMjIuNzk3MDQsMCBjIDIuNzcxNSw3Ljk5OTI5IDEuNzg3NDEsMTEuMjQ5NTggLTQuNDkzNTQsMTcuNzE2NTUgbCA0LjQ5MzU0LC0xNy43MTY1NSB6IG0gLTk5LjExMzg0LDIuMjA3NjQgOC41NjQ3OSwxNy43MTY1NSBjIC0xMS45NzAzODIsLTYuNDY2OTcgLTEzLjg0Njc4MiwtOS43MTcyNiAtOC41NjQ3OSwtMTcuNzE2NTUgeiBtIDIyLjc5NTQyLDAgYyAyLjc3MTUsNy45OTkyOSAxLjc4NzQxLDExLjI0OTU4IC00LjQ5MzU0LDE3LjcxNjU1IGwgNC40OTM1NCwtMTcuNzE2NTUgeiIgLz4KPC9zdmc+CjwhLS0gVGhpcyB3b3JrIGlzIGxpY2Vuc2VkIHVuZGVyIGEgQ3JlYXRpdmUgQ29tbW9ucyBBdHRyaWJ1dGlvbi1TaGFyZUFsaWtlIDQuMCBJbnRlcm5hdGlvbmFsIExpY2Vuc2UuIC0tPgo8IS0tIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LXNhLzQuMC8gLS0+Cg==") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#750000 0,#340404);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff750000',endColorstr='#ff340404',GradientType=0)}body.syndicate .normal{color:#40628a}body.syndicate .good{color:#73e573}body.syndicate .average{color:#be6209}body.syndicate .bad{color:#b00e0e}body.syndicate .highlight{color:#000}body.syndicate main{display:block;margin-top:32px;padding:2px 6px 0}body.syndicate hr{height:2px;background-color:#272727;border:none}body.syndicate .hidden{display:none}body.syndicate .bar .barText,body.syndicate span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.syndicate .bold{font-weight:700}body.syndicate .italic{font-style:italic}body.syndicate [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.syndicate div[data-tooltip],body.syndicate span[data-tooltip]{position:relative}body.syndicate div[data-tooltip]:after,body.syndicate span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.syndicate div[data-tooltip]:hover:after,body.syndicate span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.syndicate div[data-tooltip].tooltip-top:after,body.syndicate span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-webkit-transform:translateX(-50%) translateY(8px);-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-bottom:after,body.syndicate div[data-tooltip].tooltip-top:hover:after,body.syndicate span[data-tooltip].tooltip-bottom:after,body.syndicate span[data-tooltip].tooltip-top:hover:after{-webkit-transform:translateX(-50%) translateY(-8px);-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:after,body.syndicate span[data-tooltip].tooltip-bottom:after{top:100%;left:50%}body.syndicate div[data-tooltip].tooltip-bottom:hover:after,body.syndicate span[data-tooltip].tooltip-bottom:hover:after{-webkit-transform:translateX(-50%) translateY(8px);-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-left:after,body.syndicate span[data-tooltip].tooltip-left:after{top:50%;right:100%;-webkit-transform:translateX(8px) translateY(-50%);-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-left:hover:after,body.syndicate div[data-tooltip].tooltip-right:after,body.syndicate span[data-tooltip].tooltip-left:hover:after,body.syndicate span[data-tooltip].tooltip-right:after{-webkit-transform:translateX(-8px) translateY(-50%);-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:after,body.syndicate span[data-tooltip].tooltip-right:after{top:50%;left:100%}body.syndicate div[data-tooltip].tooltip-right:hover:after,body.syndicate span[data-tooltip].tooltip-right:hover:after{-webkit-transform:translateX(8px) translateY(-50%);-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #000;background:#272727}body.syndicate .bar .barText{position:absolute;top:0;right:3px}body.syndicate .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#000}body.syndicate .bar .barFill.good{background-color:#73e573}body.syndicate .bar .barFill.average{background-color:#be6209}body.syndicate .bar .barFill.bad{background-color:#b00e0e}body.syndicate span.button{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.syndicate span.button .fa{padding-right:2px}body.syndicate span.button.normal{transition:background-color .5s;background-color:#397439}body.syndicate span.button.normal.active:focus,body.syndicate span.button.normal.active:hover{transition:background-color .25s;background-color:#4a964a;outline:0}body.syndicate span.button.disabled{transition:background-color .5s;background-color:#363636}body.syndicate span.button.disabled.active:focus,body.syndicate span.button.disabled.active:hover{transition:background-color .25s;background-color:#545454;outline:0}body.syndicate span.button.selected{transition:background-color .5s;background-color:#9d0808}body.syndicate span.button.selected.active:focus,body.syndicate span.button.selected.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.syndicate span.button.caution{transition:background-color .5s;background-color:#be6209}body.syndicate span.button.caution.active:focus,body.syndicate span.button.caution.active:hover{transition:background-color .25s;background-color:#eb790b;outline:0}body.syndicate span.button.danger{transition:background-color .5s;background-color:#9a9d00}body.syndicate span.button.danger.active:focus,body.syndicate span.button.danger.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.syndicate span.button.gridable{width:125px;margin:2px 0}body.syndicate span.button+span:not(.button),body.syndicate span:not(.button)+span.button{margin-left:5px}body.syndicate div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000);background-color:rgba(0,0,0,.5);box-shadow:inset 0 0 5px rgba(0,0,0,.75)}body.syndicate div.display header,body.syndicate div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #272727}body.syndicate div.display header .buttonRight,body.syndicate div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.syndicate div.display article,body.syndicate div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.syndicate input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#fff;background-color:#9d0808;border:1px solid #272727}body.syndicate input::-webkit-input-placeholder{color:#999}body.syndicate input::-moz-placeholder{color:#999}body.syndicate input:-ms-input-placeholder{color:#999}body.syndicate input::placeholder{color:#999}body.syndicate input::-ms-clear{display:none}body.syndicate svg.linegraph{overflow:hidden}body.syndicate div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#750000;background-image:repeating-linear-gradient(-45deg,#750000,#750000 10px,#910101 0,#910101 20px)}body.syndicate div.notice .label{color:#000}body.syndicate div.notice .content:only-of-type{padding:0}body.syndicate div.notice hr{background-color:#272727}body.syndicate div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-webkit-transform:rotate(1turn);-ms-transform:rotate(1turn);transform:rotate(1turn)}body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.syndicate section{display:table-row;width:100%}body.syndicate section:not(:first-child){padding-top:4px}body.syndicate section.candystripe:nth-child(even){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.syndicate section .label{width:1%;padding-right:32px;white-space:nowrap;color:#fff}body.syndicate section .content:not(:last-child){padding-right:16px}body.syndicate section .line{width:100%}body.syndicate div.subdisplay{width:100%;margin:0}body.syndicate header.titlebar .close,body.syndicate header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#e74242}body.syndicate header.titlebar .close:hover,body.syndicate header.titlebar .minimize:hover{color:#eb5e5e}body.syndicate header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.syndicate header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.syndicate header.titlebar .title{position:absolute;top:6px;left:46px;color:#e74242;font-size:16px;white-space:nowrap}body.syndicate header.titlebar .minimize{position:absolute;top:6px;right:46px}body.syndicate header.titlebar .close{position:absolute;top:4px;right:12px}.no-icons header.titlebar .statusicon{font-size:20px}.no-icons header.titlebar .statusicon:after{content:"O"}.no-icons header.titlebar .minimize{top:-2px;font-size:20px}.no-icons header.titlebar .minimize:after{content:"—"}.no-icons header.titlebar .close{font-size:20px}.no-icons header.titlebar .close:after{content:"X"}
\ No newline at end of file
+@charset "utf-8";body,html{box-sizing:border-box;height:100%;margin:0}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif;font-size:12px;color:#fff;background-color:#2a2a2a;background-image:linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a',endColorstr='#ff202020',GradientType=0)}*,:after,:before{box-sizing:inherit}h1,h2,h3,h4{display:inline-block;margin:0;padding:6px 0}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}body.nanotrasen{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+DQo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmVyc2lvbj0iMS4wIiB2aWV3Qm94PSIwIDAgNDI1IDIwMCIgb3BhY2l0eT0iLjMzIj4NCiAgPHBhdGggZD0ibSAxNzguMDAzOTksMC4wMzg2OSAtNzEuMjAzOTMsMCBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgLTYuNzYxMzQsNi4wMjU1NSBsIDAsMTg3Ljg3MTQ3IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM0LDYuMDI1NTQgbCA1My4xMDcyLDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDYuNzYxMzUsLTYuMDI1NTQgbCAwLC0xMDEuNTQ0MDE4IDcyLjIxNjI4LDEwNC42OTkzOTggYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDUuNzYwMTUsMi44NzAxNiBsIDczLjU1NDg3LDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDYuNzYxMzUsLTYuMDI1NTQgbCAwLC0xODcuODcxNDcgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTM1LC02LjAyNTU1IGwgLTU0LjcxNjQ0LDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTMzLDYuMDI1NTUgbCAwLDEwMi42MTkzNSBMIDE4My43NjQxMywyLjkwODg2IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNS43NjAxNCwtMi44NzAxNyB6IiAvPg0KICA8cGF0aCBkPSJNIDQuODQ0NjMzMywyMi4xMDg3NSBBIDEzLjQxMjAzOSwxMi41MDE4NDIgMCAwIDEgMTMuNDc3NTg4LDAuMDM5MjQgbCA2Ni4xMTgzMTUsMCBhIDUuMzY0ODE1OCw1LjAwMDczNyAwIDAgMSA1LjM2NDgyMyw1LjAwMDczIGwgMCw3OS44NzkzMSB6IiAvPg0KICA8cGF0aCBkPSJtIDQyMC4xNTUzNSwxNzcuODkxMTkgYSAxMy40MTIwMzgsMTIuNTAxODQyIDAgMCAxIC04LjYzMjk1LDIyLjA2OTUxIGwgLTY2LjExODMyLDAgYSA1LjM2NDgxNTIsNS4wMDA3MzcgMCAwIDEgLTUuMzY0ODIsLTUuMDAwNzQgbCAwLC03OS44NzkzMSB6IiAvPg0KPC9zdmc+DQo8IS0tIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciBhIENyZWF0aXZlIENvbW1vbnMgQXR0cmlidXRpb24tU2hhcmVBbGlrZSA0LjAgSW50ZXJuYXRpb25hbCBMaWNlbnNlLiAtLT4NCjwhLS0gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbGljZW5zZXMvYnktc2EvNC4wLyAtLT4NCg==") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a',endColorstr='#ff202020',GradientType=0)}body.nanotrasen .normal{color:#40628a}body.nanotrasen .good{color:#537d29}body.nanotrasen .average{color:#be6209}body.nanotrasen .bad{color:#b00e0e}body.nanotrasen .highlight{color:#8ba5c4}body.nanotrasen main{display:block;margin-top:32px;padding:2px 6px 0}body.nanotrasen hr{height:2px;background-color:#40628a;border:none}body.nanotrasen .hidden{display:none}body.nanotrasen .bar .barText,body.nanotrasen span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.nanotrasen .bold{font-weight:700}body.nanotrasen .italic{font-style:italic}body.nanotrasen [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.nanotrasen div[data-tooltip],body.nanotrasen span[data-tooltip]{position:relative}body.nanotrasen div[data-tooltip]:after,body.nanotrasen span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.nanotrasen div[data-tooltip]:hover:after,body.nanotrasen span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.nanotrasen div[data-tooltip].tooltip-top:after,body.nanotrasen span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-top:hover:after,body.nanotrasen span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:after,body.nanotrasen span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:hover:after,body.nanotrasen span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-left:after,body.nanotrasen span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-left:hover:after,body.nanotrasen span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:after,body.nanotrasen span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:hover:after,body.nanotrasen span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #40628a;background:#272727}body.nanotrasen .bar .barText{position:absolute;top:0;right:3px}body.nanotrasen .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#40628a}body.nanotrasen .bar .barFill.good{background-color:#537d29}body.nanotrasen .bar .barFill.average{background-color:#be6209}body.nanotrasen .bar .barFill.bad{background-color:#b00e0e}body.nanotrasen span.button{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.nanotrasen span.button .fa{padding-right:2px}body.nanotrasen span.button.normal{transition:background-color .5s;background-color:#40628a}body.nanotrasen span.button.normal.active:focus,body.nanotrasen span.button.normal.active:hover{transition:background-color .25s;background-color:#4f78aa;outline:0}body.nanotrasen span.button.disabled{transition:background-color .5s;background-color:#999}body.nanotrasen span.button.disabled.active:focus,body.nanotrasen span.button.disabled.active:hover{transition:background-color .25s;background-color:#a8a8a8;outline:0}body.nanotrasen span.button.selected{transition:background-color .5s;background-color:#2f943c}body.nanotrasen span.button.selected.active:focus,body.nanotrasen span.button.selected.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}body.nanotrasen span.button.caution{transition:background-color .5s;background-color:#9a9d00}body.nanotrasen span.button.caution.active:focus,body.nanotrasen span.button.caution.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.nanotrasen span.button.danger{transition:background-color .5s;background-color:#9d0808}body.nanotrasen span.button.danger.active:focus,body.nanotrasen span.button.danger.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.nanotrasen span.button.gridable{width:125px;margin:2px 0}body.nanotrasen span.button+span:not(.button),body.nanotrasen span:not(.button)+span.button{margin-left:5px}body.nanotrasen div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000);background-color:rgba(0,0,0,.33);box-shadow:inset 0 0 5px rgba(0,0,0,.5)}body.nanotrasen div.display header,body.nanotrasen div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #40628a}body.nanotrasen div.display header .buttonRight,body.nanotrasen div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.nanotrasen div.display article,body.nanotrasen div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.nanotrasen input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#000;background-color:#fff;border:1px solid #272727}body.nanotrasen input::-webkit-input-placeholder{color:#999}body.nanotrasen input::-moz-placeholder{color:#999}body.nanotrasen input:-ms-input-placeholder{color:#999}body.nanotrasen input::placeholder{color:#999}body.nanotrasen input::-ms-clear{display:none}body.nanotrasen svg.linegraph{overflow:hidden}body.nanotrasen div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px)}body.nanotrasen div.notice .label{color:#000}body.nanotrasen div.notice .content:only-of-type{padding:0}body.nanotrasen div.notice hr{background-color:#272727}body.nanotrasen div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.nanotrasen section .content,body.nanotrasen section .label,body.nanotrasen section .line,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.nanotrasen section{display:table-row;width:100%}body.nanotrasen section:not(:first-child){padding-top:4px}body.nanotrasen section.candystripe:nth-child(even){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.nanotrasen section .label{width:1%;padding-right:32px;white-space:nowrap;color:#8ba5c4}body.nanotrasen section .content:not(:last-child){padding-right:16px}body.nanotrasen section .line{width:100%}body.nanotrasen div.subdisplay{width:100%;margin:0}body.nanotrasen header.titlebar .close,body.nanotrasen header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#8ba5c4}body.nanotrasen header.titlebar .close:hover,body.nanotrasen header.titlebar .minimize:hover{color:#9cb2cd}body.nanotrasen header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.nanotrasen header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.nanotrasen header.titlebar .title{position:absolute;top:6px;left:46px;color:#8ba5c4;font-size:16px;white-space:nowrap}body.nanotrasen header.titlebar .minimize{position:absolute;top:6px;right:46px}body.nanotrasen header.titlebar .close{position:absolute;top:4px;right:12px}body.syndicate{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+DQo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmVyc2lvbj0iMS4wIiB2aWV3Qm94PSIwIDAgMjAwIDI4OS43NDIiIG9wYWNpdHk9Ii4zMyI+DQogIDxwYXRoIGQ9Im0gOTMuNTM3Njc3LDAgYyAtMTguMTEzMTI1LDAgLTM0LjIyMDEzMywzLjExMTY0IC00OC4zMjM0ODQsOS4zMzQzNyAtMTMuOTY1MDkyLDYuMjIxNjcgLTI0LjYxMjQ0MiwxNS4wNzExNCAtMzEuOTQwNjUxLDI2LjU0NzEgLTcuMTg5OTM5OCwxMS4zMzc4OSAtMTAuMzAxMjI2NiwyNC43NDkxMSAtMTAuMzAxMjI2Niw0MC4yMzQ3OCAwLDEwLjY0NjYyIDIuNzI1MDAyNiwyMC40NjQ2NSA4LjE3NTExMTYsMjkuNDUyNTggNS42MTUyNzcsOC45ODY4NiAxNC4wMzgyNzcsMTcuMzUyMDQgMjUuMjY4ODIxLDI1LjA5NDM2IDExLjIzMDU0NCw3LjYwNTMxIDI2LjUwNzQyMSwxNS40MTgzNSA0NS44MzA1MTQsMjMuNDM3ODIgMTkuOTgzNzQ4LDguMjk1NTcgMzQuODQ4ODQ4LDE1LjU1NDcxIDQ0LjU5Mjk5OCwyMS43NzYzOCA5Ljc0NDE0LDYuMjIyNzMgMTYuNzYxNywxMi44NTg1IDIxLjA1NTcyLDE5LjkwOTUxIDQuMjk0MDQsNy4wNTIwOCA2LjQ0MTkzLDE1Ljc2NDA4IDYuNDQxOTMsMjYuMTM0NTkgMCwxNi4xNzcwMiAtNS4yMDE5NiwyOC40ODIyMiAtMTUuNjA2NzMsMzYuOTE2ODIgLTEwLjIzOTYsOC40MzQ3IC0yNS4wMjIwMywxMi42NTIzIC00NC4zNDUxNjksMTIuNjUyMyAtMTQuMDM4MTcxLDAgLTI1LjUxNTI0NywtMS42NTk0IC0zNC40MzM2MTgsLTQuOTc3NyAtOC45MTgzNywtMy40NTY2IC0xNi4xODU1NzIsLTguNzExMyAtMjEuODAwODM5LC0xNS43NjMzIC01LjYxNTI3NywtNy4wNTIxIC0xMC4wNzQ3OTUsLTE2LjY2MDg4IC0xMy4zNzc4OTksLTI4LjgyODEyIGwgLTI0Ljc3MzE2MjYyOTM5NDUsMCAwLDU2LjgyNjMyIEMgMzMuODU2NzY5LDI4Ni4wNzYwMSA2My43NDkwNCwyODkuNzQyMDEgODkuNjc4MzgzLDI4OS43NDIwMSBjIDE2LjAyMDAyNywwIDMwLjcxOTc4NywtMS4zODI3IDQ0LjA5NzMzNywtNC4xNDc5IDEzLjU0MjcyLC0yLjkwNDMgMjUuMTA0MSwtNy40Njc2IDM0LjY4MzA5LC0xMy42ODkzIDkuNzQ0MTMsLTYuMzU5NyAxNy4zNDA0MiwtMTQuNTE5NSAyMi43OTA1MiwtMjQuNDc0OCA1LjQ1MDEsLTEwLjA5MzMyIDguMTc1MTEsLTIyLjM5OTU5IDguMTc1MTEsLTM2LjkxNjgyIDAsLTEyLjk5NzY0IC0zLjMwMjEsLTI0LjMzNTM5IC05LjkwODI5LC0zNC4wMTQ2IC02LjQ0MTA1LC05LjgxNzI1IC0xNS41MjU0NSwtMTguNTI3MDcgLTI3LjI1MTQ2LC0yNi4xMzEzMyAtMTEuNTYwODUsLTcuNjA0MjcgLTI3LjkxMDgzLC0xNS44MzE0MiAtNDkuMDUwNjYsLTI0LjY4MDIyIC0xNy41MDY0NCwtNy4xOTAxMiAtMzAuNzE5NjY4LC0xMy42ODk0OCAtMzkuNjM4MDM4LC0xOS40OTcwMSAtOC45MTgzNzEsLTUuODA3NTIgLTE4LjYwNzQ3NCwtMTIuNDM0MDkgLTI0LjA5NjUyNCwtMTguODc0MTcgLTUuNDI2MDQzLC02LjM2NjE2IC05LjY1ODgyNiwtMTUuMDcwMDMgLTkuNjU4ODI2LC0yNC44ODcyOSAwLC05LjI2NDAxIDIuMDc1NDE0LC0xNy4yMTM0NSA2LjIyMzQ1NCwtMjMuODUwMzMgMTEuMDk4Mjk4LC0xNC4zOTc0OCA0MS4yODY2MzgsLTEuNzk1MDcgNDUuMDc1NjA5LDI0LjM0NzYyIDQuODM5MzkyLDYuNzc0OTEgOC44NDkzNSwxNi4yNDcyOSAxMi4wMjk1MTUsMjguNDE1NiBsIDIwLjUzMjM0LDAgMCwtNTUuOTk5NjcgYyAtNC40NzgyNSwtNS45MjQ0OCAtOS45NTQ4OCwtMTAuNjMyMjIgLTE1LjkwODM3LC0xNC4zNzQxMSAxLjY0MDU1LDAuNDc5MDUgMy4xOTAzOSwxLjAyMzc2IDQuNjM4NjUsMS42NDAyNCA2LjQ5ODYxLDIuNjI2MDcgMTIuMTY3OTMsNy4zMjc0NyAxNy4wMDczLDE0LjEwMzQ1IDQuODM5MzksNi43NzQ5MSA4Ljg0OTM1LDE2LjI0NTY3IDEyLjAyOTUyLDI4LjQxMzk3IDAsMCA4LjQ4MTI4LC0wLjEyODk0IDguNDg5NzgsLTAuMDAyIDAuNDE3NzYsNi40MTQ5NCAtMS43NTMzOSw5LjQ1Mjg2IC00LjEyMzQyLDEyLjU2MTA0IC0yLjQxNzQsMy4xNjk3OCAtNS4xNDQ4Niw2Ljc4OTczIC00LjAwMjc4LDEzLjAwMjkgMS41MDc4Niw4LjIwMzE4IDEwLjE4MzU0LDEwLjU5NjQyIDE0LjYyMTk0LDkuMzExNTQgLTMuMzE4NDIsLTAuNDk5MTEgLTUuMzE4NTUsLTEuNzQ5NDggLTUuMzE4NTUsLTEuNzQ5NDggMCwwIDEuODc2NDYsMC45OTg2OCA1LjY1MTE3LC0xLjM1OTgxIC0zLjI3Njk1LDAuOTU1NzEgLTEwLjcwNTI5LC0wLjc5NzM4IC0xMS44MDEyNSwtNi43NjMxMyAtMC45NTc1MiwtNS4yMDg2MSAwLjk0NjU0LC03LjI5NTE0IDMuNDAxMTMsLTEwLjUxNDgyIDIuNDU0NjIsLTMuMjE5NjggNS4yODQyNiwtNi45NTgzMSA0LjY4NDMsLTE0LjQ4ODI0IGwgMC4wMDMsMC4wMDIgOC45MjY3NiwwIDAsLTU1Ljk5OTY3IGMgLTE1LjA3MTI1LC0zLjg3MTY4IC0yNy42NTMxNCwtNi4zNjA0MiAtMzcuNzQ2NzEsLTcuNDY1ODYgLTkuOTU1MzEsLTEuMTA3NTUgLTIwLjE4ODIzLC0xLjY1OTgxIC0zMC42OTY2MTMsLTEuNjU5ODEgeiBtIDcwLjMyMTYwMywxNy4zMDg5MyAwLjIzODA1LDQwLjMwNDkgYyAxLjMxODA4LDEuMjI2NjYgMi40Mzk2NSwyLjI3ODE1IDMuMzQwODEsMy4xMDYwMiA0LjgzOTM5LDYuNzc0OTEgOC44NDkzNCwxNi4yNDU2NiAxMi4wMjk1MSwyOC40MTM5NyBsIDIwLjUzMjM0LDAgMCwtNTUuOTk5NjcgYyAtNi42NzczMSwtNC41OTM4MSAtMTkuODM2NDMsLTEwLjQ3MzA5IC0zNi4xNDA3MSwtMTUuODI1MjIgeiBtIC0yOC4xMjA0OSw1LjYwNTUxIDguNTY0NzksMTcuNzE2NTUgYyAtMTEuOTcwMzcsLTYuNDY2OTcgLTEzLjg0Njc4LC05LjcxNzI2IC04LjU2NDc5LC0xNy43MTY1NSB6IG0gMjIuNzk3MDUsMCBjIDIuNzcxNSw3Ljk5OTI5IDEuNzg3NDEsMTEuMjQ5NTggLTQuNDkzNTQsMTcuNzE2NTUgbCA0LjQ5MzU0LC0xNy43MTY1NSB6IG0gMTUuMjIxOTUsMjQuMDA4NDggOC41NjQ3OSwxNy43MTY1NSBjIC0xMS45NzAzOCwtNi40NjY5NyAtMTMuODQ2NzksLTkuNzE3MjYgLTguNTY0NzksLTE3LjcxNjU1IHogbSAyMi43OTcwNCwwIGMgMi43NzE1LDcuOTk5MjkgMS43ODc0MSwxMS4yNDk1OCAtNC40OTM1NCwxNy43MTY1NSBsIDQuNDkzNTQsLTE3LjcxNjU1IHogbSAtOTkuMTEzODQsMi4yMDc2NCA4LjU2NDc5LDE3LjcxNjU1IGMgLTExLjk3MDM4MiwtNi40NjY5NyAtMTMuODQ2NzgyLC05LjcxNzI2IC04LjU2NDc5LC0xNy43MTY1NSB6IG0gMjIuNzk1NDIsMCBjIDIuNzcxNSw3Ljk5OTI5IDEuNzg3NDEsMTEuMjQ5NTggLTQuNDkzNTQsMTcuNzE2NTUgbCA0LjQ5MzU0LC0xNy43MTY1NSB6IiAvPg0KPC9zdmc+DQo8IS0tIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciBhIENyZWF0aXZlIENvbW1vbnMgQXR0cmlidXRpb24tU2hhcmVBbGlrZSA0LjAgSW50ZXJuYXRpb25hbCBMaWNlbnNlLiAtLT4NCjwhLS0gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbGljZW5zZXMvYnktc2EvNC4wLyAtLT4NCg==") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#750000 0,#340404);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff750000',endColorstr='#ff340404',GradientType=0)}body.syndicate .normal{color:#40628a}body.syndicate .good{color:#73e573}body.syndicate .average{color:#be6209}body.syndicate .bad{color:#b00e0e}body.syndicate .highlight{color:#000}body.syndicate main{display:block;margin-top:32px;padding:2px 6px 0}body.syndicate hr{height:2px;background-color:#272727;border:none}body.syndicate .hidden{display:none}body.syndicate .bar .barText,body.syndicate span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.syndicate .bold{font-weight:700}body.syndicate .italic{font-style:italic}body.syndicate [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.syndicate div[data-tooltip],body.syndicate span[data-tooltip]{position:relative}body.syndicate div[data-tooltip]:after,body.syndicate span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.syndicate div[data-tooltip]:hover:after,body.syndicate span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.syndicate div[data-tooltip].tooltip-top:after,body.syndicate span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-top:hover:after,body.syndicate span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:after,body.syndicate span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:hover:after,body.syndicate span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-left:after,body.syndicate span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-left:hover:after,body.syndicate span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:after,body.syndicate span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:hover:after,body.syndicate span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #000;background:#272727}body.syndicate .bar .barText{position:absolute;top:0;right:3px}body.syndicate .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#000}body.syndicate .bar .barFill.good{background-color:#73e573}body.syndicate .bar .barFill.average{background-color:#be6209}body.syndicate .bar .barFill.bad{background-color:#b00e0e}body.syndicate span.button{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.syndicate span.button .fa{padding-right:2px}body.syndicate span.button.normal{transition:background-color .5s;background-color:#397439}body.syndicate span.button.normal.active:focus,body.syndicate span.button.normal.active:hover{transition:background-color .25s;background-color:#4a964a;outline:0}body.syndicate span.button.disabled{transition:background-color .5s;background-color:#363636}body.syndicate span.button.disabled.active:focus,body.syndicate span.button.disabled.active:hover{transition:background-color .25s;background-color:#545454;outline:0}body.syndicate span.button.selected{transition:background-color .5s;background-color:#9d0808}body.syndicate span.button.selected.active:focus,body.syndicate span.button.selected.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.syndicate span.button.caution{transition:background-color .5s;background-color:#be6209}body.syndicate span.button.caution.active:focus,body.syndicate span.button.caution.active:hover{transition:background-color .25s;background-color:#eb790b;outline:0}body.syndicate span.button.danger{transition:background-color .5s;background-color:#9a9d00}body.syndicate span.button.danger.active:focus,body.syndicate span.button.danger.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.syndicate span.button.gridable{width:125px;margin:2px 0}body.syndicate span.button+span:not(.button),body.syndicate span:not(.button)+span.button{margin-left:5px}body.syndicate div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000);background-color:rgba(0,0,0,.5);box-shadow:inset 0 0 5px rgba(0,0,0,.75)}body.syndicate div.display header,body.syndicate div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #272727}body.syndicate div.display header .buttonRight,body.syndicate div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.syndicate div.display article,body.syndicate div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.syndicate input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#fff;background-color:#9d0808;border:1px solid #272727}body.syndicate input::-webkit-input-placeholder{color:#999}body.syndicate input::-moz-placeholder{color:#999}body.syndicate input:-ms-input-placeholder{color:#999}body.syndicate input::placeholder{color:#999}body.syndicate input::-ms-clear{display:none}body.syndicate svg.linegraph{overflow:hidden}body.syndicate div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#750000;background-image:repeating-linear-gradient(-45deg,#750000,#750000 10px,#910101 0,#910101 20px)}body.syndicate div.notice .label{color:#000}body.syndicate div.notice .content:only-of-type{padding:0}body.syndicate div.notice hr{background-color:#272727}body.syndicate div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.syndicate section{display:table-row;width:100%}body.syndicate section:not(:first-child){padding-top:4px}body.syndicate section.candystripe:nth-child(even){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.syndicate section .label{width:1%;padding-right:32px;white-space:nowrap;color:#fff}body.syndicate section .content:not(:last-child){padding-right:16px}body.syndicate section .line{width:100%}body.syndicate div.subdisplay{width:100%;margin:0}body.syndicate header.titlebar .close,body.syndicate header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#e74242}body.syndicate header.titlebar .close:hover,body.syndicate header.titlebar .minimize:hover{color:#eb5e5e}body.syndicate header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.syndicate header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.syndicate header.titlebar .title{position:absolute;top:6px;left:46px;color:#e74242;font-size:16px;white-space:nowrap}body.syndicate header.titlebar .minimize{position:absolute;top:6px;right:46px}body.syndicate header.titlebar .close{position:absolute;top:4px;right:12px}.no-icons header.titlebar .statusicon{font-size:20px}.no-icons header.titlebar .statusicon:after{content:"O"}.no-icons header.titlebar .minimize{top:-2px;font-size:20px}.no-icons header.titlebar .minimize:after{content:"—"}.no-icons header.titlebar .close{font-size:20px}.no-icons header.titlebar .close:after{content:"X"}
\ No newline at end of file
diff --git a/tgui/assets/tgui.js b/tgui/assets/tgui.js
index e607d36cbce..47e399aed09 100644
--- a/tgui/assets/tgui.js
+++ b/tgui/assets/tgui.js
@@ -1,12 +1,12 @@
-require=function t(e,n,r){function i(o,s){if(!n[o]){if(!e[o]){var u="function"==typeof require&&require;if(!s&&u)return u(o,!0);if(a)return a(o,!0);var c=Error("Cannot find module '"+o+"'");throw c.code="MODULE_NOT_FOUND",c}var l=n[o]={exports:{}};e[o][0].call(l.exports,function(t){var n=e[o][1][t];return i(n?n:t)},l,l.exports,t,e,n,r)}return n[o].exports}for(var a="function"==typeof require&&require,o=0;o19 May 2016
+Razharas updated:
+-
+
- HE pipes once again work in space and in lava. +
- Space cools down station air again +
18 May 2016
+Cruix updated:
+-
+
- unwrapping an item with telekinesis no longer teleports the item into your hand. +
Metacide updated:
+-
+
- MetaStation: the library and chapel have had windows removed to make them feel more isolated. +
MrStonedOne updated:
+-
+
- Tesla has been rebalanced. +
- It should now lose balls slower, increase balls faster, and be a bit more aggressive about finding nearby grounding rods. +
- additional zaps from it's orbiting balls should be a bit more varied, but a touch less powerful. +
Robustin updated:
+-
+
- Lings have a new default ability, Hivemind Link. This lets you bring a neck-grabbed victim into hivemind communications after short period of time. You can talk to victims who are in crit/muted and perhaps persuade them to help you, give you intel, or even a PDA code. The link will stabilize crit victims to help ensure they do not die during the link. +
Shadowlight213 updated:
+-
+
- Cleanbot and floorbot scanning has greatly improved. they should prioritize areas next to them, as well as resolve themselves stacking on the same tiles. +
coiax updated:
+-
+
- Kinetic accelerators only require one hand to be fired, as before +
- Kinetic accelerators recharge time is multiplied by the number of KAs that person is carrying. +
- Kinetic accelerators lose their charge quickly if not equipped or being held +
- Kinetic accelerator modkits (made at R&D or your local Free Golem ship) overcome these flaws +
15 May 2016
+Iamgoofball updated:
+-
+
- Nanotrasen is short on cash, and are now borrowing escape shuttles from other stations, and Space Apartments. +
Mercenaryblue updated:
+-
+
- Turns out a bike horn made with Bananium is flipping awesome! Honk! +
14 May 2016
+Cruix updated:
+-
+
- Fixed foam darts with the safety cap removed being reset when fired. +
- Added the ability to remove pens from foam darts. +
- Foam darts with pens inside them are no longer destroyed when fired. +
- Foam darts no longer drop two darts when fired at a person on a janicart. +
Joan updated:
+-
+
- The Raise Dead rune no longer accepts dead cultists as a sacrifice to raise the dead. +
Metacide updated:
+-
+
- A small update for MetaStation, changes include: +
- Added extra grounding rods to the engine area to stop camera destruction. +
- Added canvases and extra crayons to art storage and some easels to maint. +
- Added formal security uniform crate for parades to the warden's gear area. +
- The armory securitron now starts active. +
- The genetics APC now starts unlocked. +
- Other minor changes and fixes as detailed on the wiki page. +
coiax, Nienhaus updated:
+-
+
- Unfortunately, the Belowyarn toys have been withdrawn from distribution due to Assistants choking on the batteries. Centcom has sent their condolences to the battery manufacturing plant. +
- We are introducing Oh-cee the original content skeleton figurines. Pull its string, and hear it say a variety of phrases. Not suitable for infants or assistants under 36 months. +
- Note that pulling the string of all talking toys is now visible to others. +
- Talking toys produce a lot more chatter than they did before. So do some skeleton "tongues". +
pudl updated:
+-
+
- Adds normal security headsets to security lockers +
xxalpha updated:
+-
+
- Fixed drone dispenser multiplying glass or metal. +
13 May 2016
+Joan updated:
+-
+
- Cultists can now unanchor and reanchor cult structures by hitting them with a tome. Unanchored cult structures don't do anything. +
KorPhaeron updated:
+-
+
- Drake attacks are now much easier to avoid. +
- Player controlled drakes can now consume bodies to heal, and alt+click targets to divebomb them. +
TechnoAlchemisto updated:
+-
+
- More items have been added to the mining vendor, check them out! +
12 May 2016
+Shadowlight and coiax updated:
+-
+
- Due to numerous reports of teams using human weapons instead of stealth when carrying out their assignments, future teams have been genetically modified to only be able to use their assigned blaster and are unable to use human weapons. +
11 May 2016
+Joan updated:
+-
+
- Shades can move in space. +
- Artificers can now heal shades. +
coiax updated:
+-
+
- Added action button to chameleon stamp +
- Added APPROVED and DENIED stamps to Bureaucracy Crate +
- Added the cream pie closet to various maps. Added contraband Cream Pie Crate to Cargo. +
pudl updated:
+-
+
- The armory has been redesigned. +
09 May 2016
+Joan updated:
+-
+
- Sporing Pods produces spores when expanding slightly more often. +
- Replicating Foam now only expands when hit with burn damage, from all damage, but does so at a higher chance. Free expansion from it is, however, more rare. +
- Penetrating Spines does slightly more brute damage, and Poisonous Strands does its damage 50% faster. +
KorPhaeron updated:
+-
+
- The AI no longer has a tracking delay because artificial lag is the most miserable thing in the world. +
Razharas updated:
+-
+
- crafting can now be done everywhere, little button near the intents with hammer on it(its not T) opens the crafting menu, if you are in a locker or mech only things in your hands will be considered for crafting +
coiax updated:
+-
+
- Skeletons now have bone "tongues" +
08 May 2016
CoreOverload updated:
-
@@ -453,177 +597,6 @@
- xenobio console is deconstructable again.
- syndibomb recipe calls for any matter bin, scaling effectiveness with tier.
21 April 2016
-Kor updated:
--
-
- Mechas can now toggle strafing mode. -
20 April 2016
-Erwgd updated:
--
-
- The autolathe can now make trays. -
Fox McCloud updated:
--
-
- Fixes abductor vests having no cooldown between uses -
Kor updated:
--
-
- You can now craft boats and oars out of goliath hides. These boats can move in lava. -
- Added a spooky, upgraded boat to necropolis chests. -
coiax updated:
--
-
- Slime grinders now cease suction of new slimes while grinding -
coiax, Joan updated:
--
-
- Drone dufflebags now have their own sprite. -
kevinz000 updated:
--
-
- Admin Detection Multitool: A multitool that shows when administrators are watching you! Now you can grief in safety! -
- Syndicate R&D scientists have significantly increased the range of their "AI detection multitools", making them turn yellow when an AI's tracking is near, but not on you just yet! -
18 April 2016
-Joan updated:
--
-
- Crates are now dense even when open. -
- You can now climb onto crates in the same way as table and sandbags, though climbing onto crates is very fast and does not stun you. -
- You can walk on crates, provided both are closed/open or the crate you're on is closed. -
- You can't close or open a crate if there's a large mob on top of it. -
- Stuffing items into a closet or crate is now instant and does not close the closet or crate. Stuffing mobs into a closet or crate still takes time and closes the closet/crate in question. -
- Crowbars and wirecutters have new inhand sprites. Crowbars can now be distinguished from wrenches in-hand. -
RandomMarine updated:
--
-
- Cloth items removed from biogenerator. Instead, it can create stacking cloth that crafts those items. -
- In addition, cloth can be used to create grey jumpsuits, backpacks, dufflebags, bio bags, black shoes, bedsheets, and bandages. -
- Bedsheets now tear into cloth instead of directly into bandages. -
Shadowlight213 updated:
--
-
- AI will be notified when one of their cyborgs is detonated. -
coiax updated:
--
-
- Fixed slime grinders not sucking up more than one slime -
- Drones now start with a spacious dufflebag full of tools, so they will stop stealing the captain's -
- Fixed issues with drones wearing chameleon headgear. -
- Added admin-only "snowflake drone" (also known as drone camogear) headgear. -
nullbear updated:
--
-
- Fixes air canisters being silent when bashed. -
16 April 2016
-Bawhoppen updated:
--
-
- Cryo is no longer god-awful. -
CoreOverload updated:
--
-
- A lot of items are now exportable in cargo. -
- Use Export Scanner to check any item's export value. -
Erwgd updated:
--
-
- Forks, bowls, drinking glasses, shot glasses and shakers can now be made and recycled in the autolathe! Access the designs in the new 'Dinnerware' category. -
- Kitchen knives have been moved to the Dinnerware category of the autolathe. -
- Butcher's cleavers can now be made in a hacked autolathe. -
Fox McCloud updated:
--
-
- Slime batteries now self-recharge. -
- Adds transference potion. A potion that allows the user to transfer their consciousness to a simple mob. -
- Adds rainbow slime core reaction that generates a consciousness transference potion when injected with blood. -
Iamgoofball, Lati, Geo_Jerkal, Tanquetsunami25 updated:
--
-
- Lati requested that the Slime Processor will now automatically scoop up any dead slimes into itself for processing. -
- Geo_Jerkal requested that you be able to mix Arnold Palmers with Tea and Lemon Juice. -
- Tanquetsunami25 requested that cyborg be able to boop. -
Incoming5643 updated:
--
-
- Removed the horrible meme skeletons, please don't sue us. -
Kor updated:
--
-
- Adrenals, no slips, surplus crates and SUHTANDOS now have minimum population requirements before they can be purchased. -
KorPhaeron updated:
--
-
- You now need to butcher goliaths and watchers on lavaland to receive their loot. Use the combat knives to do so. -
Lati updated:
--
-
- Custom floor tiles can now be added to floorbots. They will start replacing other tiles with these tiles if the option is toggled on. -
coiax updated:
--
-
- Boxstation, not to be outdone by all the other competing station designs, has installed a drone shell dispenser in the Testing Lab, which makes automated drones to help fix the station. -
- Toy fans, rejoyce! The famous skeleton brothers from the beloved game Belowyarn now have toys that you can win from the arcade machines! -
- Airlock painters can be printed at your local autolathe -
- Please do not attempt suicide with the airlock painter or the medical wrench. -
- Metastation now has a plant DNA manipulator in Botany. -
- Using the fire extinguisher on yourself or others while in HELP intent will spray you or them, rather than beat their probably flaming body with a metal object. -
- Alt-clicking extinguishers to empty them now wets the floor underneath them. -
lordpidey updated:
--
-
- Meth labs can now blow up if you don't purify the ingredients or over-heat the end product. -
nullbear updated:
--
-
- Added attack verbs for heart and tongue organs -
- Maximum output of air pumps has been raised. -
12 April 2016
-Incoming5643 updated:
--
-
- Leading scientists have finally proven that humans (and xenos) in fact have tongues in their mouths. -
- Swapping out tongues allows the various races to change their speech impediments. Putting a xeno tongue in someone allows them to make the hissing sound like a xeno whenever they speak. -
- There are no erp mechanics tied to this feature. -
- Remember that tongues are stored in the MOUTH, selecting the head isn't good enough. -
Kor updated:
--
-
- Ash walker starting gear has been rebalanced. -
- Ash walkers can no longer use guns. -
TrustyGun updated:
--
-
- After carefully investing in the market, the Captain had enough money to replace his silver flask with a golden one! -
- The Detective is now bringing his personalized flask to work, due to the grim work he has to do. -
- The Booze-O-Mat now stocks 3 flasks. -
11 April 2016
-Joan updated:
--
-
- Blob cores will take slight brute damage from explosions. -
RandomMarine updated:
--
-
- Additional luxuries have been added to golem ships. Including new rewards. Praise be to The Liberator! -
- However, jaunters are no longer easily obtained by free golems. -
RemieRichards updated:
--
-
- The Station Blueprints now display the piping/wiring and some of the machinery the station started with, to assist in repairs -
coiax updated:
--
-
- Emagging the cargo console also unlocks regular contraband, in addition to syndicate gear -
- A working drone shell dispenser is now on display in MetaStation's museum, displaying the virtue of the tireless little workers! -
- Dreamstation now has a drone shell dispenser in the Toxins Launch Room -