coward!\""
+ icon_state = "arcade"
+ circuit = /obj/item/circuitboard/computer/arcade/amputation
+
+/obj/machinery/computer/arcade/amputation/attack_hand(mob/user)
+ if(!iscarbon(user))
+ return
+ var/mob/living/carbon/c_user = user
+ if(!c_user.get_bodypart(BODY_ZONE_L_ARM) && !c_user.get_bodypart(BODY_ZONE_R_ARM))
+ return
+ to_chat(c_user, "You move your hand towards the machine, and begin to hesitate as a bloodied guillotine emerges from inside of it...")
+ if(do_after(c_user, 50, target = src))
+ to_chat(c_user, "The guillotine drops on your arm, and the machine sucks it in!")
+ playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+ var/which_hand = BODY_ZONE_L_ARM
+ if(!(c_user.active_hand_index % 2))
+ which_hand = BODY_ZONE_R_ARM
+ var/obj/item/bodypart/chopchop = c_user.get_bodypart(which_hand)
+ chopchop.dismember()
+ qdel(chopchop)
+ playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff = 10)
+ for(var/i=1; i<=rand(3,5); i++)
+ prizevend(user)
+ else
+ to_chat(c_user, "You (wisely) decide against putting your hand in the machine.")
\ No newline at end of file
diff --git a/code/game/machinery/computer/arcade/orion_trail.dm b/code/game/machinery/computer/arcade/orion_trail.dm
new file mode 100644
index 0000000000..12941dea35
--- /dev/null
+++ b/code/game/machinery/computer/arcade/orion_trail.dm
@@ -0,0 +1,809 @@
+
+
+// *** THE ORION TRAIL ** //
+
+#define ORION_TRAIL_WINTURN 9
+
+//Orion Trail Events
+#define ORION_TRAIL_RAIDERS "Raiders"
+#define ORION_TRAIL_FLUX "Interstellar Flux"
+#define ORION_TRAIL_ILLNESS "Illness"
+#define ORION_TRAIL_BREAKDOWN "Breakdown"
+#define ORION_TRAIL_LING "Changelings?"
+#define ORION_TRAIL_LING_ATTACK "Changeling Ambush"
+#define ORION_TRAIL_MALFUNCTION "Malfunction"
+#define ORION_TRAIL_COLLISION "Collision"
+#define ORION_TRAIL_SPACEPORT "Spaceport"
+#define ORION_TRAIL_BLACKHOLE "BlackHole"
+
+#define ORION_STATUS_START 1
+#define ORION_STATUS_NORMAL 2
+#define ORION_STATUS_GAMEOVER 3
+#define ORION_STATUS_MARKET 4
+
+/obj/machinery/computer/arcade/orion_trail
+ name = "The Orion Trail"
+ desc = "Learn how our ancestors got to Orion, and have fun in the process!"
+ icon_state = "arcade"
+ circuit = /obj/item/circuitboard/computer/arcade/orion_trail
+ var/busy = FALSE //prevent clickspam that allowed people to ~speedrun~ the game.
+ var/engine = 0
+ var/hull = 0
+ var/electronics = 0
+ var/food = 80
+ var/fuel = 60
+ var/turns = 4
+ var/alive = 4
+ var/eventdat = null
+ var/event = null
+ var/list/settlers = list("Harry","Larry","Bob")
+ var/list/events = list(ORION_TRAIL_RAIDERS = 3,
+ ORION_TRAIL_FLUX = 1,
+ ORION_TRAIL_ILLNESS = 3,
+ ORION_TRAIL_BREAKDOWN = 2,
+ ORION_TRAIL_LING = 3,
+ ORION_TRAIL_MALFUNCTION = 2,
+ ORION_TRAIL_COLLISION = 1,
+ ORION_TRAIL_SPACEPORT = 2
+ )
+ var/list/stops = list()
+ var/list/stopblurbs = list()
+ var/lings_aboard = 0
+ var/spaceport_raided = 0
+ var/spaceport_freebie = 0
+ var/last_spaceport_action = ""
+ var/gameStatus = ORION_STATUS_START
+ var/canContinueEvent = 0
+
+/obj/machinery/computer/arcade/orion_trail/kobayashi
+ name = "Kobayashi Maru control computer"
+ desc = "A test for cadets"
+ icon = 'icons/obj/machines/particle_accelerator.dmi'
+ icon_state = "control_boxp"
+ events = list("Raiders" = 3, "Interstellar Flux" = 1, "Illness" = 3, "Breakdown" = 2, "Malfunction" = 2, "Collision" = 1, "Spaceport" = 2)
+ prizes = list(/obj/item/paper/fluff/holodeck/trek_diploma = 1)
+ settlers = list("Kirk","Worf","Gene")
+
+/obj/machinery/computer/arcade/orion_trail/Reset()
+ // Sets up the main trail
+ stops = list("Pluto","Asteroid Belt","Proxima Centauri","Dead Space","Rigel Prime","Tau Ceti Beta","Black Hole","Space Outpost Beta-9","Orion Prime")
+ stopblurbs = list(
+ "Pluto, long since occupied with long-range sensors and scanners, stands ready to, and indeed continues to probe the far reaches of the galaxy.",
+ "At the edge of the Sol system lies a treacherous asteroid belt. Many have been crushed by stray asteroids and misguided judgement.",
+ "The nearest star system to Sol, in ages past it stood as a reminder of the boundaries of sub-light travel, now a low-population sanctuary for adventurers and traders.",
+ "This region of space is particularly devoid of matter. Such low-density pockets are known to exist, but the vastness of it is astounding.",
+ "Rigel Prime, the center of the Rigel system, burns hot, basking its planetary bodies in warmth and radiation.",
+ "Tau Ceti Beta has recently become a waypoint for colonists headed towards Orion. There are many ships and makeshift stations in the vicinity.",
+ "Sensors indicate that a black hole's gravitational field is affecting the region of space we were headed through. We could stay of course, but risk of being overcome by its gravity, or we could change course to go around, which will take longer.",
+ "You have come into range of the first man-made structure in this region of space. It has been constructed not by travellers from Sol, but by colonists from Orion. It stands as a monument to the colonists' success.",
+ "You have made it to Orion! Congratulations! Your crew is one of the few to start a new foothold for mankind!"
+ )
+
+/obj/machinery/computer/arcade/orion_trail/proc/newgame()
+ // Set names of settlers in crew
+ settlers = list()
+ for(var/i = 1; i <= 3; i++)
+ add_crewmember()
+ add_crewmember("[usr]")
+ // Re-set items to defaults
+ engine = 1
+ hull = 1
+ electronics = 1
+ food = 80
+ fuel = 60
+ alive = 4
+ turns = 1
+ event = null
+ gameStatus = ORION_STATUS_NORMAL
+ lings_aboard = 0
+
+ //spaceport junk
+ spaceport_raided = 0
+ spaceport_freebie = 0
+ last_spaceport_action = ""
+
+/obj/machinery/computer/arcade/orion_trail/ui_interact(mob/user)
+ . = ..()
+ if(fuel <= 0 || food <=0 || settlers.len == 0)
+ gameStatus = ORION_STATUS_GAMEOVER
+ event = null
+ var/dat = ""
+ if(gameStatus == ORION_STATUS_GAMEOVER)
+ dat = "Game Over
"
+ dat += "Like many before you, your crew never made it to Orion, lost to space...
Forever."
+ if(!settlers.len)
+ dat += "
Your entire crew died, and your ship joins the fleet of ghost-ships littering the galaxy."
+ else
+ if(food <= 0)
+ dat += "
You ran out of food and starved."
+ if(obj_flags & EMAGGED)
+ user.nutrition = 0 //yeah you pretty hongry
+ to_chat(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(obj_flags & EMAGGED)
+ var/mob/living/M = user
+ M.adjust_fire_stacks(5)
+ M.IgniteMob() //flew into a star, so you're on fire
+ to_chat(user, "You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames.")
+
+ if(obj_flags & EMAGGED)
+ to_chat(user, "You're never going to make it to Orion...")
+ user.death()
+ obj_flags &= ~EMAGGED //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!"
+
+ dat += "May They Rest In Peace
"
+ else if(event)
+ dat = eventdat
+ else if(gameStatus == ORION_STATUS_NORMAL)
+ var/title = stops[turns]
+ var/subtext = stopblurbs[turns]
+ dat = "[title]
"
+ dat += "[subtext]"
+ dat += "Crew:
"
+ dat += english_list(settlers)
+ dat += "
Food: [food] | Fuel: [fuel]"
+ dat += "
Engine Parts: [engine] | Hull Panels: [hull] | Electronics: [electronics]"
+ if(turns == 7)
+ dat += "Go Around Continue
"
+ else
+ dat += "Continue
"
+ dat += "Kill a Crewmember
"
+ dat += "Close
"
+ else
+ dat = "The Orion Trail
"
+ dat += "
Experience the journey of your ancestors!
"
+ dat += "New Game"
+ dat += "Close
"
+ var/datum/browser/popup = new(user, "arcade", "The Orion Trail",400,700)
+ popup.set_content(dat)
+ popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
+ popup.open()
+ return
+
+/obj/machinery/computer/arcade/orion_trail/Topic(href, href_list)
+ if(..())
+ return
+ if(href_list["close"])
+ usr.unset_machine()
+ usr << browse(null, "window=arcade")
+
+ if(busy)
+ return
+ busy = TRUE
+
+ if (href_list["continue"]) //Continue your travels
+ if(gameStatus == ORION_STATUS_NORMAL && !event && turns != 7)
+ if(turns >= ORION_TRAIL_WINTURN)
+ win(usr)
+ else
+ food -= (alive+lings_aboard)*2
+ fuel -= 5
+ if(turns == 2 && prob(30))
+ event = ORION_TRAIL_COLLISION
+ event()
+ else if(prob(75))
+ event = pickweight(events)
+ if(lings_aboard)
+ if(event == ORION_TRAIL_LING || prob(55))
+ event = ORION_TRAIL_LING_ATTACK
+ event()
+ turns += 1
+ if(obj_flags & EMAGGED)
+ var/mob/living/carbon/M = usr //for some vars
+ switch(event)
+ if(ORION_TRAIL_RAIDERS)
+ if(prob(50))
+ to_chat(usr, "You hear battle shouts. The tramping of boots on cold metal. Screams of agony. The rush of venting air. Are you going insane?")
+ M.hallucination += 30
+ else
+ to_chat(usr, "Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there...")
+ M.take_bodypart_damage(30)
+ playsound(loc, 'sound/weapons/genhit2.ogg', 100, 1)
+ if(ORION_TRAIL_ILLNESS)
+ var/severity = rand(1,3) //pray to RNGesus. PRAY, PIGS
+ if(severity == 1)
+ to_chat(M, "You suddenly feel slightly nauseated." )
+ if(severity == 2)
+ to_chat(usr, "You suddenly feel extremely nauseated and hunch over until it passes.")
+ M.Stun(60)
+ if(severity >= 3) //you didn't pray hard enough
+ to_chat(M, "An overpowering wave of nausea consumes over you. You hunch over, your stomach's contents preparing for a spectacular exit.")
+ M.Stun(100)
+ sleep(30)
+ M.vomit(10, distance = 5)
+ if(ORION_TRAIL_FLUX)
+ if(prob(75))
+ M.Knockdown(60)
+ say("A sudden gust of powerful wind slams [M] into the floor!")
+ M.take_bodypart_damage(25)
+ playsound(loc, 'sound/weapons/genhit.ogg', 100, 1)
+ else
+ to_chat(M, "A violent gale blows past you, and you barely manage to stay standing!")
+ if(ORION_TRAIL_COLLISION) //by far the most damaging event
+ if(prob(90))
+ playsound(loc, 'sound/effects/bang.ogg', 100, 1)
+ var/turf/open/floor/F
+ for(F in orange(1, src))
+ F.ScrapeAway()
+ say("Something slams into the floor around [src], exposing it to space!")
+ if(hull)
+ sleep(10)
+ say("A new floor suddenly appears around [src]. What the hell?")
+ playsound(loc, 'sound/weapons/genhit.ogg', 100, 1)
+ var/turf/open/space/T
+ for(T in orange(1, src))
+ T.PlaceOnTop(/turf/open/floor/plating)
+ else
+ say("Something slams into the floor around [src] - luckily, it didn't get through!")
+ playsound(loc, 'sound/effects/bang.ogg', 50, 1)
+ if(ORION_TRAIL_MALFUNCTION)
+ playsound(loc, 'sound/effects/empulse.ogg', 50, 1)
+ visible_message("[src] malfunctions, randomizing in-game stats!")
+ var/oldfood = food
+ var/oldfuel = fuel
+ food = rand(10,80) / rand(1,2)
+ fuel = rand(10,60) / rand(1,2)
+ if(electronics)
+ sleep(10)
+ if(oldfuel > fuel && oldfood > food)
+ audible_message("[src] lets out a somehow reassuring chime.")
+ else if(oldfuel < fuel || oldfood < food)
+ audible_message("[src] lets out a somehow ominous chime.")
+ food = oldfood
+ fuel = oldfuel
+ playsound(loc, 'sound/machines/chime.ogg', 50, 1)
+
+ else if(href_list["newgame"]) //Reset everything
+ if(gameStatus == ORION_STATUS_START)
+ newgame()
+ else if(href_list["menu"]) //back to the main menu
+ if(gameStatus == ORION_STATUS_GAMEOVER)
+ gameStatus = ORION_STATUS_START
+ event = null
+ food = 80
+ fuel = 60
+ settlers = list("Harry","Larry","Bob")
+ else if(href_list["slow"]) //slow down
+ if(event == ORION_TRAIL_FLUX)
+ food -= (alive+lings_aboard)*2
+ fuel -= 5
+ event = null
+ else if(href_list["pastblack"]) //slow down
+ if(turns == 7)
+ food -= ((alive+lings_aboard)*2)*3
+ fuel -= 15
+ turns += 1
+ event = null
+ else if(href_list["useengine"]) //use parts
+ if(event == ORION_TRAIL_BREAKDOWN)
+ engine = max(0, --engine)
+ event = null
+ else if(href_list["useelec"]) //use parts
+ if(event == ORION_TRAIL_MALFUNCTION)
+ electronics = max(0, --electronics)
+ event = null
+ else if(href_list["usehull"]) //use parts
+ if(event == ORION_TRAIL_COLLISION)
+ hull = max(0, --hull)
+ event = null
+ else if(href_list["wait"]) //wait 3 days
+ if(event == ORION_TRAIL_BREAKDOWN || event == ORION_TRAIL_MALFUNCTION || event == ORION_TRAIL_COLLISION)
+ food -= ((alive+lings_aboard)*2)*3
+ event = null
+ else if(href_list["keepspeed"]) //keep speed
+ if(event == ORION_TRAIL_FLUX)
+ if(prob(75))
+ event = "Breakdown"
+ event()
+ else
+ event = null
+ else if(href_list["blackhole"]) //keep speed past a black hole
+ if(turns == 7)
+ if(prob(75))
+ event = ORION_TRAIL_BLACKHOLE
+ event()
+ if(obj_flags & EMAGGED)
+ playsound(loc, 'sound/effects/supermatter.ogg', 100, 1)
+ say("A miniature black hole suddenly appears in front of [src], devouring [usr] alive!")
+ if(isliving(usr))
+ var/mob/living/L = usr
+ L.Stun(200, ignore_canstun = TRUE) //you can't run :^)
+ var/S = new /obj/singularity/academy(usr.loc)
+ addtimer(CALLBACK(src, /atom/movable/proc/say, "[S] winks out, just as suddenly as it appeared."), 50)
+ QDEL_IN(S, 50)
+ else
+ event = null
+ turns += 1
+ else if(href_list["holedeath"])
+ if(event == ORION_TRAIL_BLACKHOLE)
+ gameStatus = ORION_STATUS_GAMEOVER
+ event = null
+ else if(href_list["eventclose"]) //end an event
+ if(canContinueEvent)
+ event = null
+
+ else if(href_list["killcrew"]) //shoot a crewmember
+ if(gameStatus == ORION_STATUS_NORMAL || event == ORION_TRAIL_LING)
+ var/sheriff = remove_crewmember() //I shot the sheriff
+ playsound(loc,'sound/weapons/gunshot.ogg', 100, 1)
+
+ if(settlers.len == 0 || alive == 0)
+ say("The last crewmember [sheriff], shot themselves, GAME OVER!")
+ if(obj_flags & EMAGGED)
+ usr.death(0)
+ obj_flags &= EMAGGED
+ gameStatus = ORION_STATUS_GAMEOVER
+ event = null
+ else if(obj_flags & EMAGGED)
+ if(usr.name == sheriff)
+ say("The crew of the ship chose to kill [usr.name]!")
+ usr.death(0)
+
+ if(event == ORION_TRAIL_LING) //only ends the ORION_TRAIL_LING event, since you can do this action in multiple places
+ event = null
+
+ //Spaceport specific interactions
+ //they get a header because most of them don't reset event (because it's a shop, you leave when you want to)
+ //they also call event() again, to regen the eventdata, which is kind of odd but necessary
+ else if(href_list["buycrew"]) //buy a crewmember
+ if(gameStatus == ORION_STATUS_MARKET)
+ if(!spaceport_raided && food >= 10 && fuel >= 10)
+ var/bought = add_crewmember()
+ last_spaceport_action = "You hired [bought] as a new crewmember."
+ fuel -= 10
+ food -= 10
+ event()
+
+ else if(href_list["sellcrew"]) //sell a crewmember
+ if(gameStatus == ORION_STATUS_MARKET)
+ if(!spaceport_raided && settlers.len > 1)
+ var/sold = remove_crewmember()
+ last_spaceport_action = "You sold your crewmember, [sold]!"
+ fuel += 7
+ food += 7
+ event()
+
+ else if(href_list["leave_spaceport"])
+ if(gameStatus == ORION_STATUS_MARKET)
+ event = null
+ gameStatus = ORION_STATUS_NORMAL
+ spaceport_raided = 0
+ spaceport_freebie = 0
+ last_spaceport_action = ""
+
+ else if(href_list["raid_spaceport"])
+ if(gameStatus == ORION_STATUS_MARKET)
+ if(!spaceport_raided)
+ var/success = min(15 * alive,100) //default crew (4) have a 60% chance
+ spaceport_raided = 1
+
+ var/FU = 0
+ var/FO = 0
+ if(prob(success))
+ FU = rand(5,15)
+ FO = rand(5,15)
+ last_spaceport_action = "You successfully raided the spaceport! You gained [FU] Fuel and [FO] Food! (+[FU]FU,+[FO]FO)"
+ else
+ FU = rand(-5,-15)
+ FO = rand(-5,-15)
+ last_spaceport_action = "You failed to raid the spaceport! You lost [FU*-1] Fuel and [FO*-1] Food in your scramble to escape! ([FU]FU,[FO]FO)"
+
+ //your chance of lose a crewmember is 1/2 your chance of success
+ //this makes higher % failures hurt more, don't get cocky space cowboy!
+ if(prob(success*5))
+ var/lost_crew = remove_crewmember()
+ last_spaceport_action = "You failed to raid the spaceport! You lost [FU*-1] Fuel and [FO*-1] Food, AND [lost_crew] in your scramble to escape! ([FU]FI,[FO]FO,-Crew)"
+ if(obj_flags & EMAGGED)
+ say("WEEWOO! WEEWOO! Spaceport security en route!")
+ playsound(src, 'sound/items/weeoo1.ogg', 100, FALSE)
+ for(var/i, i<=3, i++)
+ var/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion/O = new/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion(get_turf(src))
+ O.target = usr
+
+
+ fuel += FU
+ food += FO
+ event()
+
+ else if(href_list["buyparts"])
+ if(gameStatus == ORION_STATUS_MARKET)
+ if(!spaceport_raided && fuel > 5)
+ switch(text2num(href_list["buyparts"]))
+ if(1) //Engine Parts
+ engine++
+ last_spaceport_action = "Bought Engine Parts"
+ if(2) //Hull Plates
+ hull++
+ last_spaceport_action = "Bought Hull Plates"
+ if(3) //Spare Electronics
+ electronics++
+ last_spaceport_action = "Bought Spare Electronics"
+ fuel -= 5 //they all cost 5
+ event()
+
+ else if(href_list["trade"])
+ if(gameStatus == ORION_STATUS_MARKET)
+ if(!spaceport_raided)
+ switch(text2num(href_list["trade"]))
+ if(1) //Fuel
+ if(fuel > 5)
+ fuel -= 5
+ food += 5
+ last_spaceport_action = "Traded Fuel for Food"
+ event()
+ if(2) //Food
+ if(food > 5)
+ fuel += 5
+ food -= 5
+ last_spaceport_action = "Traded Food for Fuel"
+ event()
+
+ add_fingerprint(usr)
+ updateUsrDialog()
+ busy = FALSE
+ return
+
+
+/obj/machinery/computer/arcade/orion_trail/proc/event()
+ eventdat = "[event]
"
+ canContinueEvent = 0
+ switch(event)
+ if(ORION_TRAIL_RAIDERS)
+ eventdat += "Raiders have come aboard your ship!"
+ if(prob(50))
+ var/sfood = rand(1,10)
+ var/sfuel = rand(1,10)
+ food -= sfood
+ fuel -= sfuel
+ eventdat += "
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 += "Continue
"
+ eventdat += "Close
"
+ 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 += "Slow Down Continue
"
+ eventdat += "Close
"
+
+ if(ORION_TRAIL_ILLNESS)
+ eventdat += "A deadly illness has been contracted!"
+ var/deadname = remove_crewmember()
+ eventdat += "
[deadname] was killed by the disease."
+ eventdat += "Continue
"
+ eventdat += "Close
"
+ 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 += "Use PartWait
"
+ else
+ eventdat += "Wait
"
+ eventdat += "Close
"
+
+ 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 += "Use PartWait
"
+ else
+ eventdat += "Wait
"
+ eventdat += "Close
"
+
+ 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 += "Use PartWait
"
+ else
+ eventdat += "Wait
"
+ eventdat += "Close
"
+
+ if(ORION_TRAIL_BLACKHOLE)
+ eventdat += "You were swept away into the black hole."
+ eventdat += "Oh...
"
+ eventdat += "Close
"
+ 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 += "Continue
"
+ eventdat += "Close
"
+ 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 += "Kill a Crewmember
"
+ eventdat += "Risk it
"
+ eventdat += "Close
"
+ 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 += "Changelings among your crew suddenly burst from hiding and attack!"
+ 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()
+ var/murder_text = pick("The changeling[ling2 ? "s" : ""] bring[ling2 ? "" : "s"] down [deadguy] and disembowel[ling2 ? "" : "s"] them in a spray of gore!", \
+ "[ling2 ? pick(ling1, ling2) : ling1] corners [deadguy] and impales them through the stomach!", \
+ "[ling2 ? pick(ling1, ling2) : ling1] decapitates [deadguy] in a single cleaving arc!")
+ eventdat += "
[murder_text]"
+ else
+ eventdat += "
You valiantly fight off the changeling[ling2 ? "s":""]!"
+ if(ling2)
+ food += 30
+ lings_aboard = max(0,lings_aboard-2)
+ else
+ food += 15
+ lings_aboard = max(0,--lings_aboard)
+ eventdat += "
Well, it's perfectly good food...\
+
You cut the changeling[ling2 ? "s" : ""] into meat, gaining [ling2 ? "30" : "15"] Food!"
+ else
+ eventdat += "
[pick("Sensing unfavorable odds", "After a failed attack", "Suddenly breaking nerve")], \
+ the changeling[ling2 ? "s":""] vanish[ling2 ? "" : "es"] into space through the airlocks! You're safe... for now."
+ if(ling2)
+ lings_aboard = max(0,lings_aboard-2)
+ else
+ lings_aboard = max(0,--lings_aboard)
+
+ eventdat += "Continue
"
+ eventdat += "Close
"
+ canContinueEvent = 1
+
+
+ if(ORION_TRAIL_SPACEPORT)
+ gameStatus = ORION_STATUS_MARKET
+ if(spaceport_raided)
+ eventdat += "The spaceport is on high alert! You've been barred from docking by the local authorities after your failed raid."
+ if(last_spaceport_action)
+ eventdat += "
Last Spaceport Action: [last_spaceport_action]"
+ eventdat += "Depart Spaceport
"
+ eventdat += "Close
"
+ else
+ eventdat += "Your jump into the sector yields a spaceport - a 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 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 pity on you, and generously give you some free supplies! (+[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 += "You cannot afford a new crewmember.
"
+
+ //Sell crew
+ if(settlers.len > 1)
+ eventdat += "Sell Crew for Fuel and Food (+7FU, +7FO)
"
+ else
+ eventdat += "You have no other crew to sell.
"
+
+ //BUY/SELL STUFF
+ eventdat += "Spare Parts:
"
+
+ //Engine parts
+ if(fuel > 5)
+ eventdat += "Buy Engine Parts (-5FU)
"
+ else
+ eventdat += "You cannot afford engine parts."
+
+ //Hull plates
+ if(fuel > 5)
+ eventdat += "
Buy Hull Plates (-5FU)
"
+ else
+ eventdat += "You cannot afford hull plates."
+
+ //Electronics
+ if(fuel > 5)
+ eventdat += "
Buy Spare Electronics (-5FU)
"
+ else
+ eventdat += "You cannot afford spare electronics."
+
+ //Trade
+ if(fuel > 5)
+ eventdat += "
Trade Fuel for Food (-5FU,+5FO)
"
+ else
+ eventdat += "You don't have 5FU to trade. 5)
+ eventdat += "
Trade Food for Fuel (+5FU,-5FO)
"
+ else
+ eventdat += "You don't have 5FO to trade.You 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()
+ obj_flags |= EMAGGED
+
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion
+ name = "spaceport security"
+ desc = "Premier corporate security forces for all spaceports found along the Orion Trail."
+ faction = list("orion")
+ loot = list()
+ del_on_death = TRUE
+
+/obj/item/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 = WEIGHT_CLASS_SMALL
+ var/active = 0 //if the ship is on
+
+/obj/item/orion_ship/examine(mob/user)
+ ..()
+ if(!(in_range(user, src)))
+ return
+ if(!active)
+ to_chat(user, "There's a little switch on the bottom. It's flipped down.")
+ else
+ to_chat(user, "There's a little switch on the bottom. It's flipped up.")
+
+/obj/item/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("[ADMIN_LOOKUPFLW(usr)] primed an explosive Orion ship for detonation at [AREACOORD(usr)].")
+ log_game("[key_name(usr)] primed an explosive Orion ship for detonation at [AREACOORD(usr)].")
+
+ to_chat(user, "You flip the switch on the underside of [src].")
+ active = 1
+ visible_message("[src] softly beeps and whirs to life!")
+ playsound(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)
+ 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(loc, 'sound/machines/buzz-sigh.ogg', 25, 1)
+ sleep(3.6)
+ visible_message("[src] explodes!")
+ explosion(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/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
index baa6fa577e..6576f51e46 100644
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -59,8 +59,8 @@
var/total_moles = air_sample.total_moles()
if(total_moles)
for(var/gas_id in air_sample.gases)
- var/gas_name = air_sample.gases[gas_id][GAS_META][META_GAS_NAME]
- signal.data["gases"][gas_name] = air_sample.gases[gas_id][MOLES] / total_moles * 100
+ var/gas_name = GLOB.meta_gas_names[gas_id]
+ signal.data["gases"][gas_name] = air_sample.gases[gas_id] / total_moles * 100
radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 00a5c8941d..bfa6b46134 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -13,17 +13,20 @@
var/scantemp_ckey
var/scantemp = "Ready to Scan"
var/menu = 1 //Which menu screen to display
- var/list/records = list()
var/datum/data/record/active_record = null
var/obj/item/disk/data/diskette = null //Mostly so the geneticist can steal everything.
var/loading = 0 // Nice loading text
var/autoprocess = 0
+ var/list/records = list()
light_color = LIGHT_COLOR_BLUE
/obj/machinery/computer/cloning/Initialize()
. = ..()
updatemodules(TRUE)
+ var/obj/item/circuitboard/computer/cloning/board = circuit
+ records = board.records
+
/obj/machinery/computer/cloning/Destroy()
if(pods)
@@ -346,6 +349,8 @@
active_record = null
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
src.menu = 2
+ var/obj/item/circuitboard/computer/cloning/board = circuit
+ board.records = records
else
src.temp = "Access Denied."
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
@@ -368,6 +373,8 @@
for(var/key in diskette.fields)
src.active_record.fields[key] = diskette.fields[key]
src.temp = "Load successful."
+ var/obj/item/circuitboard/computer/cloning/board = circuit
+ board.records = records
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
if("eject")
@@ -450,7 +457,7 @@
scantemp = "Subject's brain is not responding to scanning stimuli."
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
return
- if((mob_occupant.has_trait(TRAIT_NOCLONE)) && (src.scanner.scan_level < 2))
+ if((HAS_TRAIT(mob_occupant, TRAIT_NOCLONE)) && (src.scanner.scan_level < 2))
scantemp = "Subject no longer contains the fundamental materials required to create a living clone."
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
return
@@ -502,5 +509,7 @@
R.fields["imp"] = "[REF(imp)]"
src.records += R
+ var/obj/item/circuitboard/computer/cloning/board = circuit
+ board.records = records
scantemp = "Subject successfully scanned."
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 43f5b96fbd..752765baa1 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -173,14 +173,15 @@
var/obj/machinery/shuttle_manipulator/M = locate() in GLOB.machines
if(M)
SSshuttle.shuttle_purchased = TRUE
- M.unload_preview()
- M.load_template(S)
- M.existing_shuttle = SSshuttle.emergency
- M.action_load(S)
SSshuttle.points -= S.credit_cost
minor_announce("[usr.real_name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase")
message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [S.name].")
SSblackbox.record_feedback("text", "shuttle_purchase", 1, "[S.name]")
+ M.unload_preview()
+ M.load_template(S)
+ M.existing_shuttle = SSshuttle.emergency
+ M.action_load(S)
+ message_admins("[S.name] loaded, purchased by [usr]")
else
to_chat(usr, "Something went wrong! The shuttle exchange system seems to be down.")
else
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index ccc2121929..c11f7d9edc 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -31,7 +31,6 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
var/list/jobs = new/list()
jobs["Captain"] = 00
- jobs["Head of Personnel"] = 50
jobs["Head of Security"] = 10
jobs["Warden"] = 11
jobs["Security Officer"] = 12
@@ -47,9 +46,10 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
jobs["Chief Engineer"] = 40
jobs["Station Engineer"] = 41
jobs["Atmospheric Technician"] = 42
- jobs["Quartermaster"] = 51
- jobs["Shaft Miner"] = 52
- jobs["Cargo Technician"] = 53
+ jobs["Quartermaster"] = 50
+ jobs["Shaft Miner"] = 51
+ jobs["Cargo Technician"] = 52
+ jobs["Head of Personnel"] = 60
jobs["Bartender"] = 61
jobs["Cook"] = 62
jobs["Botanist"] = 63
diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm
index 2980c741be..9d49574317 100644
--- a/code/game/machinery/computer/dna_console.dm
+++ b/code/game/machinery/computer/dna_console.dm
@@ -76,7 +76,7 @@
if(connected && connected.is_operational())
if(connected.occupant) //set occupant_status message
viable_occupant = connected.occupant
- if(viable_occupant.has_dna() && !viable_occupant.has_trait(TRAIT_RADIMMUNE) && !viable_occupant.has_trait(TRAIT_NOCLONE) || (connected.scan_level == 3)) //occupant is viable for dna modification
+ if(viable_occupant.has_dna() && !HAS_TRAIT(viable_occupant, TRAIT_RADIMMUNE) && !HAS_TRAIT(viable_occupant, TRAIT_NOCLONE) || (connected.scan_level == 3)) //occupant is viable for dna modification
occupant_status += "[viable_occupant.name] => "
switch(viable_occupant.stat)
if(CONSCIOUS)
@@ -523,7 +523,7 @@
var/mob/living/carbon/viable_occupant = null
if(connected)
viable_occupant = connected.occupant
- if(!istype(viable_occupant) || !viable_occupant.dna || viable_occupant.has_trait(TRAIT_RADIMMUNE) || viable_occupant.has_trait(TRAIT_NOCLONE))
+ if(!istype(viable_occupant) || !viable_occupant.dna || HAS_TRAIT(viable_occupant, TRAIT_RADIMMUNE) || HAS_TRAIT(viable_occupant, TRAIT_NOCLONE))
viable_occupant = null
return viable_occupant
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index 7beb32eebb..1c6d713437 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -214,11 +214,11 @@
sparkles += S
switch(i)
if(1 to 8)
- S.orbit(src, 30, TRUE, 60, 36, TRUE, FALSE)
+ S.orbit(src, 30, TRUE, 60, 36, TRUE)
if(9 to 16)
- S.orbit(src, 62, TRUE, 60, 36, TRUE, FALSE)
+ S.orbit(src, 62, TRUE, 60, 36, TRUE)
if(17 to 24)
- S.orbit(src, 95, TRUE, 60, 36, TRUE, FALSE)
+ S.orbit(src, 95, TRUE, 60, 36, TRUE)
if(25)
S.pixel_y = 7
S.forceMove(get_turf(src))
diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm
index 7b7c8a3411..4210435f33 100644
--- a/code/game/machinery/defibrillator_mount.dm
+++ b/code/game/machinery/defibrillator_mount.dm
@@ -69,7 +69,7 @@
if(defib)
to_chat(user, "There's already a defibrillator in [src]!")
return
- if(I.item_flags & NODROP || !user.transferItemToLoc(I, src))
+ if(HAS_TRAIT(I, TRAIT_NODROP) || !user.transferItemToLoc(I, src))
to_chat(user, "[I] is stuck to your hand!")
return
user.visible_message("[user] hooks up [I] to [src]!", \
diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm
index 90a6b07733..7895fb8c9f 100644
--- a/code/game/machinery/dna_scanner.dm
+++ b/code/game/machinery/dna_scanner.dm
@@ -99,7 +99,7 @@
var/mob/living/mob_occupant = get_mob_or_brainmob(occupant)
if(istype(mob_occupant))
if(locate_computer(/obj/machinery/computer/cloning))
- if(!mob_occupant.suiciding && !(mob_occupant.has_trait(TRAIT_NOCLONE)) && !mob_occupant.hellbound)
+ if(!mob_occupant.suiciding && !(HAS_TRAIT(mob_occupant, TRAIT_NOCLONE)) && !mob_occupant.hellbound)
mob_occupant.notify_ghost_cloning("Your corpse has been placed into a cloning scanner. Re-enter your corpse if you want to be cloned!", source = src)
// DNA manipulators cannot operate on severed heads or brains
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 0183fcecd4..1081cb5fa7 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -763,7 +763,7 @@
if(ishuman(user) && prob(40) && src.density)
var/mob/living/carbon/human/H = user
- if((H.has_trait(TRAIT_DUMB)) && Adjacent(user))
+ if((HAS_TRAIT(H, TRAIT_DUMB)) && Adjacent(user))
playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
if(!istype(H.head, /obj/item/clothing/head/helmet))
H.visible_message("[user] headbutts the airlock.", \
diff --git a/code/game/machinery/exp_cloner.dm b/code/game/machinery/exp_cloner.dm
index 45ac999a6a..e8364d2271 100644
--- a/code/game/machinery/exp_cloner.dm
+++ b/code/game/machinery/exp_cloner.dm
@@ -42,11 +42,11 @@
icon_state = "pod_1"
//Get the clone body ready
maim_clone(H)
- H.add_trait(TRAIT_STABLEHEART, "cloning")
- H.add_trait(TRAIT_EMOTEMUTE, "cloning")
- H.add_trait(TRAIT_MUTE, "cloning")
- H.add_trait(TRAIT_NOBREATH, "cloning")
- H.add_trait(TRAIT_NOCRITDAMAGE, "cloning")
+ ADD_TRAIT(H, TRAIT_STABLEHEART, "cloning")
+ ADD_TRAIT(H, TRAIT_EMOTEMUTE, "cloning")
+ ADD_TRAIT(H, TRAIT_MUTE, "cloning")
+ ADD_TRAIT(H, TRAIT_NOBREATH, "cloning")
+ ADD_TRAIT(H, TRAIT_NOCRITDAMAGE, "cloning")
H.Unconscious(80)
var/list/candidates = pollCandidatesForMob("Do you want to play as [clonename]'s defective clone?", null, null, null, 100, H)
@@ -268,7 +268,7 @@
scantemp = "Unable to locate valid genetic data."
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
return
- if((mob_occupant.has_trait(TRAIT_NOCLONE)) && (src.scanner.scan_level < 2))
+ if((HAS_TRAIT(mob_occupant, TRAIT_NOCLONE)) && (src.scanner.scan_level < 2))
scantemp = "Subject no longer contains the fundamental materials required to create a living clone."
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
return
diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm
index c955edbcd0..f6cb58bbbc 100644
--- a/code/game/machinery/gulag_item_reclaimer.dm
+++ b/code/game/machinery/gulag_item_reclaimer.dm
@@ -30,7 +30,7 @@
obj_flags |= EMAGGED
/obj/machinery/gulag_item_reclaimer/attackby(obj/item/I, mob/user)
- if(istype(I, /obj/item/card/id/prisoner))
+ if(istype(I, /obj/item/card/id))
if(!inserted_id)
if(!user.transferItemToLoc(I, src))
return
@@ -83,7 +83,7 @@
usr.put_in_hands(inserted_id)
inserted_id = null
else
- var/obj/item/I = usr.is_holding_item_of_type(/obj/item/card/id/prisoner)
+ var/obj/item/I = usr.is_holding_item_of_type(/obj/item/card/id)
if(I)
if(!usr.transferItemToLoc(I, src))
return
diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm
index 1f40672e05..8be7becfdd 100644
--- a/code/game/machinery/harvester.dm
+++ b/code/game/machinery/harvester.dm
@@ -65,7 +65,7 @@
if(!isitem(A))
continue
var/obj/item/I = A
- if(!(I.item_flags & NODROP))
+ if(!HAS_TRAIT(I, TRAIT_NODROP))
say("Subject may not have abiotic items on.")
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1)
return
@@ -73,7 +73,7 @@
say("Subject is not organic.")
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1)
return
- if(!allow_living && !(C.stat == DEAD || C.has_trait(TRAIT_FAKEDEATH))) //I mean, the machines scanners arent advanced enough to tell you're alive
+ if(!allow_living && !(C.stat == DEAD || HAS_TRAIT(C, TRAIT_FAKEDEATH))) //I mean, the machines scanners arent advanced enough to tell you're alive
say("Subject is still alive.")
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1)
return
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index 7284b3c738..03c60be91c 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -81,12 +81,6 @@
to_chat(usr, "The drip beeps: Warning, incompatible creature!")
return
- var/mob/living/L
- if(isliving(target))
- L = target
- if(!L.can_inject(usr, 1))
- return
-
if(Adjacent(target) && usr.Adjacent(target))
if(beaker)
usr.visible_message("[usr] attaches [src] to [target].", "You attach [src] to [target].")
diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm
index 8a0658fd0f..a3250fe1b0 100644
--- a/code/game/machinery/limbgrower.dm
+++ b/code/game/machinery/limbgrower.dm
@@ -10,7 +10,6 @@
icon = 'icons/obj/machines/limbgrower.dmi'
icon_state = "limbgrower_idleoff"
density = TRUE
- container_type = OPENCONTAINER
use_power = IDLE_POWER_USE
idle_power_usage = 10
active_power_usage = 100
@@ -34,7 +33,7 @@
)
/obj/machinery/limbgrower/Initialize()
- create_reagents(100)
+ create_reagents(100, OPENCONTAINER)
stored_research = new /datum/techweb/specialized/autounlocking/limbgrower
. = ..()
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index 911bb76bda..b0204ddeb8 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -485,7 +485,7 @@
threatcount += 4
if(shoot_unloyal)
- if (!perp.has_trait(TRAIT_MINDSHIELD))
+ if (!HAS_TRAIT(perp, TRAIT_MINDSHIELD))
threatcount += 4
return threatcount
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index f2c216ca98..ad9a846bdc 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -323,7 +323,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
emergency = "Medical"
if(radio_freq)
Radio.set_frequency(radio_freq)
- Radio.talk_into(src,"[emergency] emergency in [department]!!",radio_freq,get_spans(),get_default_language())
+ Radio.talk_into(src,"[emergency] emergency in [department]!!",radio_freq)
update_icon()
addtimer(CALLBACK(src, .proc/clear_emergency), 3000)
@@ -382,7 +382,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
screen = 6
if(radio_freq)
- Radio.talk_into(src,"[alert]: [message]",radio_freq,get_spans(),get_default_language())
+ Radio.talk_into(src, "[alert]: [message]", radio_freq)
switch(priority)
if(2)
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 930edfe467..27faa6bffb 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -51,6 +51,7 @@
/obj/machinery/suit_storage_unit/security
suit_type = /obj/item/clothing/suit/space/hardsuit/security
mask_type = /obj/item/clothing/mask/gas/sechailer
+ storage_type = /obj/item/tank/jetpack/oxygen/security
/obj/machinery/suit_storage_unit/hos
suit_type = /obj/item/clothing/suit/space/hardsuit/security/hos
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index 1a8dd231f4..2ff7ee1a13 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -92,6 +92,12 @@
var/obj/item/toy/crayon/CR = WM.color_source
add_atom_colour(CR.paint_color, WASHABLE_COLOUR_PRIORITY)
+/obj/item/reagents_containers/rag/towel/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
+ add_atom_colour(CR.paint_color, WASHABLE_COLOUR_PRIORITY)
+
/mob/living/simple_animal/pet/dog/corgi/machine_wash(obj/machinery/washing_machine/WM)
gib()
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 8a5a83379d..23be95ff16 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -76,6 +76,9 @@
return 0
if(energy_drain && !chassis.has_charge(energy_drain))
return 0
+ if(chassis.equipment_disabled)
+ to_chat(chassis.occupant, "Error -- Equipment control unit is unresponsive.")
+ return 0
return 1
/obj/item/mecha_parts/mecha_equipment/proc/action(atom/target)
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 99baad11ae..21bbdfd14b 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -159,15 +159,15 @@
t1 = "*dead*"
else
t1 = "Unknown"
- return {"Health: [patient.stat > 1 ? "[t1]" : "[patient.health]% ([t1])"]
- Core Temperature: [patient.bodytemperature-T0C]°C ([patient.bodytemperature*1.8-459.67]°F)
- Brute Damage: [patient.getBruteLoss()]%
- Respiratory Damage: [patient.getOxyLoss()]%
- Toxin Content: [patient.getToxLoss()]%
- Burn Severity: [patient.getFireLoss()]%
- [patient.getCloneLoss() ? "Subject appears to have cellular damage." : ""]
- [patient.getBrainLoss() ? "Significant brain damage detected." : ""]
- [length(patient.get_traumas()) ? "Brain Traumas detected." : ""]
+ return {"Health: [patient.stat > 1 ? "[t1]" : "[patient.health]% ([t1])"]
+ Core Temperature: [patient.bodytemperature-T0C]°C ([patient.bodytemperature*1.8-459.67]°F)
+ Brute Damage: [patient.getBruteLoss()]%
+ Respiratory Damage: [patient.getOxyLoss()]%
+ Toxin Content: [patient.getToxLoss()]%
+ Burn Severity: [patient.getFireLoss()]%
+ [patient.getCloneLoss() ? "Subject appears to have cellular damage." : ""]
+ [patient.getBrainLoss() ? "Significant brain damage detected." : ""]
+ [length(patient.get_traumas()) ? "Brain Traumas detected." : ""]
"}
/obj/item/mecha_parts/mecha_equipment/medical/sleeper/proc/get_patient_reagents()
@@ -257,8 +257,7 @@
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/Initialize()
. = ..()
- create_reagents(max_volume)
- reagents.set_reacting(FALSE)
+ create_reagents(max_volume, NO_REACT)
syringes = new
known_reagents = list("epinephrine"="Epinephrine","charcoal"="Charcoal")
processed_reagents = new
@@ -274,7 +273,7 @@
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/critfail()
..()
if(reagents)
- reagents.set_reacting(TRUE)
+ DISABLE_BITFIELD(reagents.reagents_holder_flags, NO_REACT)
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/can_attach(obj/mecha/medical/M)
if(..())
diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index 1a3886c3df..80c92c7922 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -421,14 +421,13 @@
if(!istype(T))
return
var/datum/gas_mixture/GM = new
- GM.add_gas(/datum/gas/plasma)
if(prob(10))
- GM.gases[/datum/gas/plasma][MOLES] += 100
+ GM.gases[/datum/gas/plasma] += 100
GM.temperature = 1500+T0C //should be enough to start a fire
T.visible_message("[src] suddenly disgorges a cloud of heated plasma.")
qdel(src)
else
- GM.gases[/datum/gas/plasma][MOLES] += 5
+ GM.gases[/datum/gas/plasma] += 5
GM.temperature = istype(T) ? T.air.return_temperature() : T20C
T.visible_message("[src] suddenly disgorges a cloud of plasma.")
T.assume_air(GM)
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index d8c0fbeeb3..2e5a13beb2 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -305,7 +305,7 @@
name = "\improper SRM-8 missile rack"
desc = "A weapon for combat exosuits. Shoots light explosive missiles."
icon_state = "mecha_missilerack"
- projectile = /obj/item/projectile/bullet/srmrocket
+ projectile = /obj/item/projectile/bullet/a84mm_he
fire_sound = 'sound/weapons/grenadelaunch.ogg'
projectiles = 8
projectile_energy_cost = 1000
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index d5de4a4898..22aac63d2b 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -42,6 +42,7 @@
var/last_message = 0
var/add_req_access = 1
var/maint_access = 0
+ var/equipment_disabled = 0 //disabled due to EMP
var/dna_lock //dna-locking the mech
var/list/proc_res = list() //stores proc owners, like proc_res["functionname"] = owner reference
var/datum/effect_system/spark_spread/spark_system = new
@@ -143,7 +144,6 @@
diag_hud_set_mechhealth()
diag_hud_set_mechcell()
diag_hud_set_mechstat()
- diag_hud_set_mechtracking()
/obj/mecha/get_cell()
return cell
@@ -205,6 +205,15 @@
GLOB.mechas_list -= src //global mech list
return ..()
+/obj/mecha/proc/restore_equipment()
+ equipment_disabled = 0
+ if(istype(src, /obj/mecha/combat))
+ mouse_pointer = 'icons/mecha/mecha_mouse.dmi'
+ if(occupant)
+ SEND_SOUND(occupant, sound('sound/items/timer.ogg', volume=50))
+ to_chat(occupant, "Equipment control unit has been rebooted successfuly.")
+ occupant.update_mouse_pointer()
+
/obj/mecha/CheckParts(list/parts_list)
..()
cell = locate(/obj/item/stock_parts/cell) in contents
@@ -237,9 +246,8 @@
cabin_air = new
cabin_air.temperature = T20C
cabin_air.volume = 200
- cabin_air.add_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
- cabin_air.gases[/datum/gas/oxygen][MOLES] = O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
- cabin_air.gases[/datum/gas/nitrogen][MOLES] = N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
+ cabin_air.gases[/datum/gas/oxygen] = O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
+ cabin_air.gases[/datum/gas/nitrogen] = N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
return cabin_air
/obj/mecha/proc/add_radio()
@@ -395,8 +403,6 @@
diag_hud_set_mechhealth()
diag_hud_set_mechcell()
diag_hud_set_mechstat()
- diag_hud_set_mechtracking()
-
/obj/mecha/proc/drop_item()//Derpfix, but may be useful in future for engineering exosuits.
return
@@ -446,13 +452,13 @@
var/mob/living/L = user
if(!Adjacent(target))
if(selected && selected.is_ranged())
- if(L.has_trait(TRAIT_PACIFISM) && selected.harmful)
+ if(HAS_TRAIT(L, TRAIT_PACIFISM) && selected.harmful)
to_chat(user, "You don't want to harm other living beings!")
return
if(selected.action(target,params))
selected.start_cooldown()
else if(selected && selected.is_melee())
- if(isliving(target) && selected.harmful && L.has_trait(TRAIT_PACIFISM))
+ if(isliving(target) && selected.harmful && HAS_TRAIT(L, TRAIT_PACIFISM))
to_chat(user, "You don't want to harm other living beings!")
return
if(selected.action(target,params))
@@ -538,7 +544,7 @@
var/oldloc = loc
if(internal_damage & MECHA_INT_CONTROL_LOST)
move_result = mechsteprand()
- else if(dir != direction && !strafe)
+ else if(dir != direction && (!strafe || occupant.client.keys_held["Alt"]))
move_result = mechturn(direction)
else
move_result = mechstep(direction)
diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm
index 6d42c302e1..7b00e208cc 100644
--- a/code/game/mecha/mecha_actions.dm
+++ b/code/game/mecha/mecha_actions.dm
@@ -128,7 +128,7 @@
/datum/action/innate/mecha/strafe
- name = "Toggle Strafing"
+ name = "Toggle Strafing. Disabled when Alt is held."
button_icon_state = "strafe"
/datum/action/innate/mecha/strafe/Activate()
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 714c66d032..3b957431f7 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -11,8 +11,8 @@
var/obj/mecha/M = new result(drop_location())
QDEL_NULL(M.cell)
- var/atom/parent_atom = parent
- M.CheckParts(parent_atom.contents)
+ var/obj/item/mecha_parts/chassis/parent_chassis = parent
+ M.CheckParts(parent_chassis.contents)
SSblackbox.record_feedback("tally", "mechas_created", 1, M.name)
QDEL_NULL(parent)
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index 1524da42f2..9498eec3da 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -21,8 +21,9 @@
var/answer = TR.get_mecha_info()
if(answer)
dat += {"
[answer]
- Send message
- Show exosuit log | (EMP pulse)
"}
+ Send message
+ Show exosuit log
+ [TR.recharging?"Recharging EMP Pulse...
":"(EMP Pulse)
"]"}
if(screen==1)
dat += "Log contents
"
@@ -65,6 +66,7 @@
icon_state = "motion2"
w_class = WEIGHT_CLASS_SMALL
var/ai_beacon = FALSE //If this beacon allows for AI control. Exists to avoid using istype() on checking.
+ var/recharging = 0
/obj/item/mecha_parts/mecha_tracking/proc/get_mecha_info()
if(!in_mecha())
@@ -102,10 +104,16 @@
return 0
/obj/item/mecha_parts/mecha_tracking/proc/shock()
+ if(recharging)
+ return
var/obj/mecha/M = in_mecha()
if(M)
- M.emp_act(EMP_LIGHT)
- qdel(src)
+ M.emp_act(EMP_HEAVY)
+ addtimer(CALLBACK(src, /obj/item/mecha_parts/mecha_tracking/proc/recharge), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
+ recharging = 1
+
+/obj/item/mecha_parts/mecha_tracking/proc/recharge()
+ recharging = 0
/obj/item/mecha_parts/mecha_tracking/proc/get_mecha_log()
if(!ismecha(loc))
diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm
index 367c750787..62a62b569d 100644
--- a/code/game/mecha/mecha_defense.dm
+++ b/code/game/mecha/mecha_defense.dm
@@ -149,7 +149,14 @@
use_power((cell.charge/3)/(severity*2))
take_damage(30 / severity, BURN, "energy", 1)
log_message("EMP detected", color="red")
- check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),1)
+
+ if(istype(src, /obj/mecha/combat))
+ mouse_pointer = 'icons/mecha/mecha_mouse-disable.dmi'
+ occupant?.update_mouse_pointer()
+ if(!equipment_disabled && occupant) //prevent spamming this message with back-to-back EMPs
+ to_chat(occupant, "Error -- Connection to equipment control unit has been lost.")
+ addtimer(CALLBACK(src, /obj/mecha/proc/restore_equipment), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
+ equipment_disabled = 1
/obj/mecha/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature>max_temperature)
diff --git a/code/game/mecha/medical/medical.dm b/code/game/mecha/medical/medical.dm
index e86b5174cc..8b4e48cd3e 100644
--- a/code/game/mecha/medical/medical.dm
+++ b/code/game/mecha/medical/medical.dm
@@ -1,8 +1,3 @@
-/obj/mecha/medical/Initialize()
- . = ..()
- trackers += new /obj/item/mecha_parts/mecha_tracking(src)
-
-
/obj/mecha/medical/mechturn(direction)
setDir(direction)
playsound(src,'sound/mecha/mechmove01.ogg',40,1)
@@ -18,4 +13,4 @@
var/result = step_rand(src)
if(result)
playsound(src,'sound/mecha/mechstep.ogg',25,1)
- return result
\ No newline at end of file
+ return result
diff --git a/code/game/mecha/working/working.dm b/code/game/mecha/working/working.dm
index 498ccd94fa..c9e7d99ac0 100644
--- a/code/game/mecha/working/working.dm
+++ b/code/game/mecha/working/working.dm
@@ -1,6 +1,3 @@
/obj/mecha/working
internal_damage_threshold = 60
-/obj/mecha/working/Initialize()
- . = ..()
- trackers += new /obj/item/mecha_parts/mecha_tracking(src)
diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index 55a162ad38..cc69b88cc4 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -219,7 +219,7 @@
name = "stabilized plasma"
desc = "A puddle of stabilized plasma."
icon_state = "flour"
- color = "#C8A5DC"
+ color = "#9e0089"
/obj/effect/decal/cleanable/insectguts
name = "insect guts"
diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
index 34263ef9a4..0a0348ae39 100644
--- a/code/game/objects/effects/decals/crayon.dm
+++ b/code/game/objects/effects/decals/crayon.dm
@@ -3,6 +3,7 @@
desc = "Graffiti. Damn kids."
icon = 'icons/effects/crayondecal.dmi'
icon_state = "rune1"
+ plane = GAME_PLANE //makes the graffiti visible over a wall.
gender = NEUTER
mergeable_decal = FALSE
var/do_icon_rotate = TRUE
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index 264715e2ac..10ee73915c 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -1,347 +1,347 @@
-// Foam
-// Similar to smoke, but slower and mobs absorb its reagent through their exposed skin.
-#define ALUMINUM_FOAM 1
-#define IRON_FOAM 2
-#define RESIN_FOAM 3
-
-
-/obj/effect/particle_effect/foam
- name = "foam"
- icon_state = "foam"
- opacity = 0
- anchored = TRUE
- density = FALSE
- layer = EDGED_TURF_LAYER
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- var/amount = 3
- animate_movement = 0
- var/metal = 0
- var/lifetime = 40
- var/reagent_divisor = 7
- var/static/list/blacklisted_turfs = typecacheof(list(
- /turf/open/space/transit,
- /turf/open/chasm,
- /turf/open/lava))
-
-/obj/effect/particle_effect/foam/firefighting
- name = "firefighting foam"
- lifetime = 20 //doesn't last as long as normal foam
- amount = 0 //no spread
- var/absorbed_plasma = 0
-
-/obj/effect/particle_effect/foam/firefighting/MakeSlippery()
- return
-
-/obj/effect/particle_effect/foam/firefighting/process()
- ..()
-
- var/turf/open/T = get_turf(src)
- var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in T)
- if(hotspot && istype(T) && T.air)
- qdel(hotspot)
- var/datum/gas_mixture/G = T.air
- var/plas_amt = min(30,G.gases[/datum/gas/plasma][MOLES]) //Absorb some plasma
- G.gases[/datum/gas/plasma][MOLES] -= plas_amt
- absorbed_plasma += plas_amt
- if(G.temperature > T20C)
- G.temperature = max(G.temperature/2,T20C)
- G.garbage_collect()
- T.air_update_turf()
-
-/obj/effect/particle_effect/foam/firefighting/kill_foam()
- STOP_PROCESSING(SSfastprocess, src)
-
- if(absorbed_plasma)
- var/obj/effect/decal/cleanable/plasma/P = (locate(/obj/effect/decal/cleanable/plasma) in get_turf(src))
- if(!P)
- P = new(loc)
- P.reagents.add_reagent("stable_plasma", absorbed_plasma)
-
- flick("[icon_state]-disolve", src)
- QDEL_IN(src, 5)
-
-/obj/effect/particle_effect/foam/firefighting/foam_mob(mob/living/L)
- if(!istype(L))
- return
- L.adjust_fire_stacks(-2)
- L.ExtinguishMob()
-
-/obj/effect/particle_effect/foam/firefighting/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
- return
-
-/obj/effect/particle_effect/foam/metal
- name = "aluminium foam"
- metal = ALUMINUM_FOAM
- icon_state = "mfoam"
-
-/obj/effect/particle_effect/foam/metal/MakeSlippery()
- return
-
-/obj/effect/particle_effect/foam/metal/smart
- name = "smart foam"
-
-/obj/effect/particle_effect/foam/metal/iron
- name = "iron foam"
- metal = IRON_FOAM
-
-/obj/effect/particle_effect/foam/metal/resin
- name = "resin foam"
- metal = RESIN_FOAM
-
-/obj/effect/particle_effect/foam/long_life
- lifetime = 150
-
-/obj/effect/particle_effect/foam/Initialize()
- . = ..()
- MakeSlippery()
- create_reagents(1000) //limited by the size of the reagent holder anyway.
- START_PROCESSING(SSfastprocess, src)
- playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3)
-
-/obj/effect/particle_effect/foam/proc/MakeSlippery()
- AddComponent(/datum/component/slippery, 100)
-
-/obj/effect/particle_effect/foam/Destroy()
- STOP_PROCESSING(SSfastprocess, src)
- return ..()
-
-
-/obj/effect/particle_effect/foam/proc/kill_foam()
- STOP_PROCESSING(SSfastprocess, src)
- switch(metal)
- if(ALUMINUM_FOAM)
- new /obj/structure/foamedmetal(get_turf(src))
- if(IRON_FOAM)
- new /obj/structure/foamedmetal/iron(get_turf(src))
- if(RESIN_FOAM)
- new /obj/structure/foamedmetal/resin(get_turf(src))
- flick("[icon_state]-disolve", src)
- QDEL_IN(src, 5)
-
-/obj/effect/particle_effect/foam/smart/kill_foam() //Smart foam adheres to area borders for walls
- STOP_PROCESSING(SSfastprocess, src)
- if(metal)
- var/turf/T = get_turf(src)
- if(isspaceturf(T)) //Block up any exposed space
- T.PlaceOnTop(/turf/open/floor/plating/foam)
- for(var/direction in GLOB.cardinals)
- var/turf/cardinal_turf = get_step(T, direction)
- if(get_area(cardinal_turf) != get_area(T)) //We're at an area boundary, so let's block off this turf!
- new/obj/structure/foamedmetal(T)
- break
- flick("[icon_state]-disolve", src)
- QDEL_IN(src, 5)
-
-/obj/effect/particle_effect/foam/process()
- lifetime--
- if(lifetime < 1)
- kill_foam()
- return
-
- var/fraction = 1/initial(reagent_divisor)
- for(var/obj/O in range(0,src))
- if(O.type == src.type)
- continue
- if(isturf(O.loc))
- var/turf/T = O.loc
- if(T.intact && O.level == 1) //hidden under the floor
- continue
- if(lifetime % reagent_divisor)
- reagents.reaction(O, VAPOR, fraction)
- var/hit = 0
- for(var/mob/living/L in range(0,src))
- hit += foam_mob(L)
- if(hit)
- lifetime++ //this is so the decrease from mobs hit and the natural decrease don't cumulate.
- var/T = get_turf(src)
- if(lifetime % reagent_divisor)
- reagents.reaction(T, VAPOR, fraction)
-
- if(--amount < 0)
- return
- spread_foam()
-
-/obj/effect/particle_effect/foam/proc/foam_mob(mob/living/L)
- if(lifetime<1)
- return 0
- if(!istype(L))
- return 0
- var/fraction = 1/initial(reagent_divisor)
- if(lifetime % reagent_divisor)
- reagents.reaction(L, VAPOR, fraction)
- lifetime--
- return 1
-
-/obj/effect/particle_effect/foam/proc/spread_foam()
- var/turf/t_loc = get_turf(src)
- for(var/turf/T in t_loc.GetAtmosAdjacentTurfs())
- var/obj/effect/particle_effect/foam/foundfoam = locate() in T //Don't spread foam where there's already foam!
- if(foundfoam)
- continue
-
- if(is_type_in_typecache(T, blacklisted_turfs))
- continue
-
- for(var/mob/living/L in T)
- foam_mob(L)
- var/obj/effect/particle_effect/foam/F = new src.type(T)
- F.amount = amount
- reagents.copy_to(F, (reagents.total_volume))
- F.add_atom_colour(color, FIXED_COLOUR_PRIORITY)
- F.metal = metal
-
-
-/obj/effect/particle_effect/foam/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
- if(prob(max(0, exposed_temperature - 475))) //foam dissolves when heated
- kill_foam()
-
-
-/obj/effect/particle_effect/foam/metal/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
- return
-
-
-///////////////////////////////////////////////
-//FOAM EFFECT DATUM
-/datum/effect_system/foam_spread
- var/amount = 10 // the size of the foam spread.
- var/obj/chemholder
- effect_type = /obj/effect/particle_effect/foam
- var/metal = 0
-
-
-/datum/effect_system/foam_spread/metal
- effect_type = /obj/effect/particle_effect/foam/metal
-
-
-/datum/effect_system/foam_spread/metal/smart
- effect_type = /obj/effect/particle_effect/foam/smart
-
-
-/datum/effect_system/foam_spread/long
- effect_type = /obj/effect/particle_effect/foam/long_life
-
-/datum/effect_system/foam_spread/New()
- ..()
- chemholder = new /obj()
- var/datum/reagents/R = new/datum/reagents(1000)
- chemholder.reagents = R
- R.my_atom = chemholder
-
-/datum/effect_system/foam_spread/Destroy()
- qdel(chemholder)
- chemholder = null
- return ..()
-
-/datum/effect_system/foam_spread/set_up(amt=5, loca, datum/reagents/carry = null)
- if(isturf(loca))
- location = loca
- else
- location = get_turf(loca)
-
- amount = round(sqrt(amt / 2), 1)
- carry.copy_to(chemholder, carry.total_volume)
-
-/datum/effect_system/foam_spread/metal/set_up(amt=5, loca, datum/reagents/carry = null, metaltype)
- ..()
- metal = metaltype
-
-/datum/effect_system/foam_spread/start()
- var/obj/effect/particle_effect/foam/F = new effect_type(location)
- var/foamcolor = mix_color_from_reagents(chemholder.reagents.reagent_list)
- chemholder.reagents.copy_to(F, chemholder.reagents.total_volume/amount)
- F.add_atom_colour(foamcolor, FIXED_COLOUR_PRIORITY)
- F.amount = amount
- F.metal = metal
-
-
-//////////////////////////////////////////////////////////
-// FOAM STRUCTURE. Formed by metal foams. Dense and opaque, but easy to break
-/obj/structure/foamedmetal
- icon = 'icons/effects/effects.dmi'
- icon_state = "metalfoam"
- density = TRUE
- opacity = 1 // changed in New()
- anchored = TRUE
- layer = EDGED_TURF_LAYER
- resistance_flags = FIRE_PROOF | ACID_PROOF
- name = "foamed metal"
- desc = "A lightweight foamed metal wall."
- gender = PLURAL
- max_integrity = 20
- CanAtmosPass = ATMOS_PASS_DENSITY
-
-/obj/structure/foamedmetal/Initialize()
- . = ..()
- air_update_turf(1)
-
-/obj/structure/foamedmetal/Move()
- var/turf/T = loc
- . = ..()
- move_update_air(T)
-
-/obj/structure/foamedmetal/attack_paw(mob/user)
- return attack_hand(user)
-
-/obj/structure/foamedmetal/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
- playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1)
-
-/obj/structure/foamedmetal/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- user.changeNext_move(CLICK_CD_MELEE)
- user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
- to_chat(user, "You hit [src] but bounce off it!")
- playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1)
-
-/obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target)
- return !density
-
-/obj/structure/foamedmetal/iron
- max_integrity = 50
- icon_state = "ironfoam"
-
-//Atmos Backpack Resin, transparent, prevents atmos and filters the air
-/obj/structure/foamedmetal/resin
- name = "\improper ATMOS Resin"
- desc = "A lightweight, transparent resin used to suffocate fires, scrub the air of toxins, and restore the air to a safe temperature."
- opacity = FALSE
- icon_state = "atmos_resin"
- alpha = 120
- max_integrity = 10
-
-/obj/structure/foamedmetal/resin/Initialize()
- . = ..()
- if(isopenturf(loc))
- var/turf/open/O = loc
- O.ClearWet()
- if(O.air)
- var/datum/gas_mixture/G = O.air
- G.temperature = 293.15
- for(var/obj/effect/hotspot/H in O)
- qdel(H)
- var/list/G_gases = G.gases
- for(var/I in G_gases)
- if(I == /datum/gas/oxygen || I == /datum/gas/nitrogen)
- continue
- G_gases[I][MOLES] = 0
- G.garbage_collect()
- O.air_update_turf()
- for(var/obj/machinery/atmospherics/components/unary/U in O)
- if(!U.welded)
- U.welded = TRUE
- U.update_icon()
- U.visible_message("[U] sealed shut!")
- for(var/mob/living/L in O)
- L.ExtinguishMob()
- for(var/obj/item/Item in O)
- Item.extinguish()
-
-/obj/structure/foamedmetal/resin/CanPass(atom/movable/mover, turf/target)
- if(istype(mover) && (mover.pass_flags & PASSGLASS))
- return TRUE
- . = ..()
-
-#undef ALUMINUM_FOAM
-#undef IRON_FOAM
-#undef RESIN_FOAM
+// Foam
+// Similar to smoke, but slower and mobs absorb its reagent through their exposed skin.
+#define ALUMINUM_FOAM 1
+#define IRON_FOAM 2
+#define RESIN_FOAM 3
+
+
+/obj/effect/particle_effect/foam
+ name = "foam"
+ icon_state = "foam"
+ opacity = 0
+ anchored = TRUE
+ density = FALSE
+ layer = EDGED_TURF_LAYER
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ var/amount = 3
+ animate_movement = 0
+ var/metal = 0
+ var/lifetime = 40
+ var/reagent_divisor = 7
+ var/static/list/blacklisted_turfs = typecacheof(list(
+ /turf/open/space/transit,
+ /turf/open/chasm,
+ /turf/open/lava))
+
+/obj/effect/particle_effect/foam/firefighting
+ name = "firefighting foam"
+ lifetime = 20 //doesn't last as long as normal foam
+ amount = 0 //no spread
+ var/absorbed_plasma = 0
+
+/obj/effect/particle_effect/foam/firefighting/MakeSlippery()
+ return
+
+/obj/effect/particle_effect/foam/firefighting/process()
+ ..()
+
+ var/turf/open/T = get_turf(src)
+ var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in T)
+ if(hotspot && istype(T) && T.air)
+ qdel(hotspot)
+ var/datum/gas_mixture/G = T.air
+ var/plas_amt = min(30,G.gases[/datum/gas/plasma]) //Absorb some plasma
+ G.gases[/datum/gas/plasma] -= plas_amt
+ absorbed_plasma += plas_amt
+ if(G.temperature > T20C)
+ G.temperature = max(G.temperature/2,T20C)
+ GAS_GARBAGE_COLLECT(G.gases)
+ T.air_update_turf()
+
+/obj/effect/particle_effect/foam/firefighting/kill_foam()
+ STOP_PROCESSING(SSfastprocess, src)
+
+ if(absorbed_plasma)
+ var/obj/effect/decal/cleanable/plasma/P = (locate(/obj/effect/decal/cleanable/plasma) in get_turf(src))
+ if(!P)
+ P = new(loc)
+ P.reagents.add_reagent("stable_plasma", absorbed_plasma)
+
+ flick("[icon_state]-disolve", src)
+ QDEL_IN(src, 5)
+
+/obj/effect/particle_effect/foam/firefighting/foam_mob(mob/living/L)
+ if(!istype(L))
+ return
+ L.adjust_fire_stacks(-2)
+ L.ExtinguishMob()
+
+/obj/effect/particle_effect/foam/firefighting/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+ return
+
+/obj/effect/particle_effect/foam/metal
+ name = "aluminium foam"
+ metal = ALUMINUM_FOAM
+ icon_state = "mfoam"
+
+/obj/effect/particle_effect/foam/metal/MakeSlippery()
+ return
+
+/obj/effect/particle_effect/foam/metal/smart
+ name = "smart foam"
+
+/obj/effect/particle_effect/foam/metal/iron
+ name = "iron foam"
+ metal = IRON_FOAM
+
+/obj/effect/particle_effect/foam/metal/resin
+ name = "resin foam"
+ metal = RESIN_FOAM
+
+/obj/effect/particle_effect/foam/long_life
+ lifetime = 150
+
+/obj/effect/particle_effect/foam/Initialize()
+ . = ..()
+ MakeSlippery()
+ create_reagents(1000) //limited by the size of the reagent holder anyway.
+ START_PROCESSING(SSfastprocess, src)
+ playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3)
+
+/obj/effect/particle_effect/foam/proc/MakeSlippery()
+ AddComponent(/datum/component/slippery, 100)
+
+/obj/effect/particle_effect/foam/Destroy()
+ STOP_PROCESSING(SSfastprocess, src)
+ return ..()
+
+
+/obj/effect/particle_effect/foam/proc/kill_foam()
+ STOP_PROCESSING(SSfastprocess, src)
+ switch(metal)
+ if(ALUMINUM_FOAM)
+ new /obj/structure/foamedmetal(get_turf(src))
+ if(IRON_FOAM)
+ new /obj/structure/foamedmetal/iron(get_turf(src))
+ if(RESIN_FOAM)
+ new /obj/structure/foamedmetal/resin(get_turf(src))
+ flick("[icon_state]-disolve", src)
+ QDEL_IN(src, 5)
+
+/obj/effect/particle_effect/foam/smart/kill_foam() //Smart foam adheres to area borders for walls
+ STOP_PROCESSING(SSfastprocess, src)
+ if(metal)
+ var/turf/T = get_turf(src)
+ if(isspaceturf(T)) //Block up any exposed space
+ T.PlaceOnTop(/turf/open/floor/plating/foam)
+ for(var/direction in GLOB.cardinals)
+ var/turf/cardinal_turf = get_step(T, direction)
+ if(get_area(cardinal_turf) != get_area(T)) //We're at an area boundary, so let's block off this turf!
+ new/obj/structure/foamedmetal(T)
+ break
+ flick("[icon_state]-disolve", src)
+ QDEL_IN(src, 5)
+
+/obj/effect/particle_effect/foam/process()
+ lifetime--
+ if(lifetime < 1)
+ kill_foam()
+ return
+
+ var/fraction = 1/initial(reagent_divisor)
+ for(var/obj/O in range(0,src))
+ if(O.type == src.type)
+ continue
+ if(isturf(O.loc))
+ var/turf/T = O.loc
+ if(T.intact && O.level == 1) //hidden under the floor
+ continue
+ if(lifetime % reagent_divisor)
+ reagents.reaction(O, VAPOR, fraction)
+ var/hit = 0
+ for(var/mob/living/L in range(0,src))
+ hit += foam_mob(L)
+ if(hit)
+ lifetime++ //this is so the decrease from mobs hit and the natural decrease don't cumulate.
+ var/T = get_turf(src)
+ if(lifetime % reagent_divisor)
+ reagents.reaction(T, VAPOR, fraction)
+
+ if(--amount < 0)
+ return
+ spread_foam()
+
+/obj/effect/particle_effect/foam/proc/foam_mob(mob/living/L)
+ if(lifetime<1)
+ return 0
+ if(!istype(L))
+ return 0
+ var/fraction = 1/initial(reagent_divisor)
+ if(lifetime % reagent_divisor)
+ reagents.reaction(L, VAPOR, fraction)
+ lifetime--
+ return 1
+
+/obj/effect/particle_effect/foam/proc/spread_foam()
+ var/turf/t_loc = get_turf(src)
+ for(var/turf/T in t_loc.GetAtmosAdjacentTurfs())
+ var/obj/effect/particle_effect/foam/foundfoam = locate() in T //Don't spread foam where there's already foam!
+ if(foundfoam)
+ continue
+
+ if(is_type_in_typecache(T, blacklisted_turfs))
+ continue
+
+ for(var/mob/living/L in T)
+ foam_mob(L)
+ var/obj/effect/particle_effect/foam/F = new src.type(T)
+ F.amount = amount
+ reagents.copy_to(F, (reagents.total_volume))
+ F.add_atom_colour(color, FIXED_COLOUR_PRIORITY)
+ F.metal = metal
+
+
+/obj/effect/particle_effect/foam/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+ if(prob(max(0, exposed_temperature - 475))) //foam dissolves when heated
+ kill_foam()
+
+
+/obj/effect/particle_effect/foam/metal/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+ return
+
+
+///////////////////////////////////////////////
+//FOAM EFFECT DATUM
+/datum/effect_system/foam_spread
+ var/amount = 10 // the size of the foam spread.
+ var/obj/chemholder
+ effect_type = /obj/effect/particle_effect/foam
+ var/metal = 0
+
+
+/datum/effect_system/foam_spread/metal
+ effect_type = /obj/effect/particle_effect/foam/metal
+
+
+/datum/effect_system/foam_spread/metal/smart
+ effect_type = /obj/effect/particle_effect/foam/smart
+
+
+/datum/effect_system/foam_spread/long
+ effect_type = /obj/effect/particle_effect/foam/long_life
+
+/datum/effect_system/foam_spread/New()
+ ..()
+ chemholder = new /obj()
+ var/datum/reagents/R = new/datum/reagents(1000)
+ chemholder.reagents = R
+ R.my_atom = chemholder
+
+/datum/effect_system/foam_spread/Destroy()
+ qdel(chemholder)
+ chemholder = null
+ return ..()
+
+/datum/effect_system/foam_spread/set_up(amt=5, loca, datum/reagents/carry = null)
+ if(isturf(loca))
+ location = loca
+ else
+ location = get_turf(loca)
+
+ amount = round(sqrt(amt / 2), 1)
+ carry.copy_to(chemholder, carry.total_volume)
+
+/datum/effect_system/foam_spread/metal/set_up(amt=5, loca, datum/reagents/carry = null, metaltype)
+ ..()
+ metal = metaltype
+
+/datum/effect_system/foam_spread/start()
+ var/obj/effect/particle_effect/foam/F = new effect_type(location)
+ var/foamcolor = mix_color_from_reagents(chemholder.reagents.reagent_list)
+ chemholder.reagents.copy_to(F, chemholder.reagents.total_volume/amount)
+ F.add_atom_colour(foamcolor, FIXED_COLOUR_PRIORITY)
+ F.amount = amount
+ F.metal = metal
+
+
+//////////////////////////////////////////////////////////
+// FOAM STRUCTURE. Formed by metal foams. Dense and opaque, but easy to break
+/obj/structure/foamedmetal
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "metalfoam"
+ density = TRUE
+ opacity = 1 // changed in New()
+ anchored = TRUE
+ layer = EDGED_TURF_LAYER
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ name = "foamed metal"
+ desc = "A lightweight foamed metal wall."
+ gender = PLURAL
+ max_integrity = 20
+ CanAtmosPass = ATMOS_PASS_DENSITY
+
+/obj/structure/foamedmetal/Initialize()
+ . = ..()
+ air_update_turf(1)
+
+/obj/structure/foamedmetal/Move()
+ var/turf/T = loc
+ . = ..()
+ move_update_air(T)
+
+/obj/structure/foamedmetal/attack_paw(mob/user)
+ return attack_hand(user)
+
+/obj/structure/foamedmetal/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1)
+
+/obj/structure/foamedmetal/attack_hand(mob/user)
+ . = ..()
+ if(.)
+ return
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
+ to_chat(user, "You hit [src] but bounce off it!")
+ playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1)
+
+/obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target)
+ return !density
+
+/obj/structure/foamedmetal/iron
+ max_integrity = 50
+ icon_state = "ironfoam"
+
+//Atmos Backpack Resin, transparent, prevents atmos and filters the air
+/obj/structure/foamedmetal/resin
+ name = "\improper ATMOS Resin"
+ desc = "A lightweight, transparent resin used to suffocate fires, scrub the air of toxins, and restore the air to a safe temperature."
+ opacity = FALSE
+ icon_state = "atmos_resin"
+ alpha = 120
+ max_integrity = 10
+
+/obj/structure/foamedmetal/resin/Initialize()
+ . = ..()
+ if(isopenturf(loc))
+ var/turf/open/O = loc
+ O.ClearWet()
+ if(O.air)
+ var/datum/gas_mixture/G = O.air
+ G.temperature = 293.15
+ for(var/obj/effect/hotspot/H in O)
+ qdel(H)
+ var/list/G_gases = G.gases
+ for(var/I in G_gases)
+ if(I == /datum/gas/oxygen || I == /datum/gas/nitrogen)
+ continue
+ G_gases[I] = 0
+ GAS_GARBAGE_COLLECT(G.gases)
+ O.air_update_turf()
+ for(var/obj/machinery/atmospherics/components/unary/U in O)
+ if(!U.welded)
+ U.welded = TRUE
+ U.update_icon()
+ U.visible_message("[U] sealed shut!")
+ for(var/mob/living/L in O)
+ L.ExtinguishMob()
+ for(var/obj/item/Item in O)
+ Item.extinguish()
+
+/obj/structure/foamedmetal/resin/CanPass(atom/movable/mover, turf/target)
+ if(istype(mover) && (mover.pass_flags & PASSGLASS))
+ return TRUE
+ . = ..()
+
+#undef ALUMINUM_FOAM
+#undef IRON_FOAM
+#undef RESIN_FOAM
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index e8e833890b..79deac475b 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -1,329 +1,328 @@
-/////////////////////////////////////////////
-//// SMOKE SYSTEMS
-/////////////////////////////////////////////
-
-/obj/effect/particle_effect/smoke
- name = "smoke"
- icon = 'icons/effects/96x96.dmi'
- icon_state = "smoke"
- pixel_x = -32
- pixel_y = -32
- opacity = 0
- layer = FLY_LAYER
- anchored = TRUE
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- animate_movement = 0
- var/amount = 4
- var/lifetime = 5
- var/opaque = 1 //whether the smoke can block the view when in enough amount
-
-
-/obj/effect/particle_effect/smoke/proc/fade_out(frames = 16)
- if(alpha == 0) //Handle already transparent case
- return
- if(frames == 0)
- frames = 1 //We will just assume that by 0 frames, the coder meant "during one frame".
- var/step = alpha / frames
- for(var/i = 0, i < frames, i++)
- alpha -= step
- if(alpha < 160)
- set_opacity(0) //if we were blocking view, we aren't now because we're fading out
- stoplag()
-
-/obj/effect/particle_effect/smoke/Initialize()
- . = ..()
- create_reagents(500)
- START_PROCESSING(SSobj, src)
-
-
-/obj/effect/particle_effect/smoke/Destroy()
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/effect/particle_effect/smoke/proc/kill_smoke()
- STOP_PROCESSING(SSobj, src)
- INVOKE_ASYNC(src, .proc/fade_out)
- QDEL_IN(src, 10)
-
-/obj/effect/particle_effect/smoke/process()
- lifetime--
- if(lifetime < 1)
- kill_smoke()
- return 0
- for(var/mob/living/L in range(0,src))
- smoke_mob(L)
- return 1
-
-/obj/effect/particle_effect/smoke/proc/smoke_mob(mob/living/carbon/C)
- if(!istype(C))
- return 0
- if(lifetime<1)
- return 0
- if(C.internal != null || C.has_smoke_protection())
- return 0
- if(C.smoke_delay)
- return 0
- C.smoke_delay++
- addtimer(CALLBACK(src, .proc/remove_smoke_delay, C), 10)
- return 1
-
-/obj/effect/particle_effect/smoke/proc/remove_smoke_delay(mob/living/carbon/C)
- if(C)
- C.smoke_delay = 0
-
-/obj/effect/particle_effect/smoke/proc/spread_smoke()
- var/turf/t_loc = get_turf(src)
- if(!t_loc)
- return
- var/list/newsmokes = list()
- for(var/turf/T in t_loc.GetAtmosAdjacentTurfs())
- var/obj/effect/particle_effect/smoke/foundsmoke = locate() in T //Don't spread smoke where there's already smoke!
- if(foundsmoke)
- continue
- for(var/mob/living/L in T)
- smoke_mob(L)
- var/obj/effect/particle_effect/smoke/S = new type(T)
- reagents.copy_to(S, reagents.total_volume)
- S.setDir(pick(GLOB.cardinals))
- S.amount = amount-1
- S.add_atom_colour(color, FIXED_COLOUR_PRIORITY)
- S.lifetime = lifetime
- if(S.amount>0)
- if(opaque)
- S.set_opacity(TRUE)
- newsmokes.Add(S)
-
- if(newsmokes.len)
- spawn(1) //the smoke spreads rapidly but not instantly
- for(var/obj/effect/particle_effect/smoke/SM in newsmokes)
- SM.spread_smoke()
-
-
-/datum/effect_system/smoke_spread
- var/amount = 10
- effect_type = /obj/effect/particle_effect/smoke
-
-/datum/effect_system/smoke_spread/set_up(radius = 5, loca)
- if(isturf(loca))
- location = loca
- else
- location = get_turf(loca)
- amount = radius
-
-/datum/effect_system/smoke_spread/start()
- if(holder)
- location = get_turf(holder)
- var/obj/effect/particle_effect/smoke/S = new effect_type(location)
- S.amount = amount
- if(S.amount)
- S.spread_smoke()
-
-
-/////////////////////////////////////////////
-// Bad smoke
-/////////////////////////////////////////////
-
-/obj/effect/particle_effect/smoke/bad
- lifetime = 8
-
-/obj/effect/particle_effect/smoke/bad/smoke_mob(mob/living/carbon/M)
- if(..())
- M.drop_all_held_items()
- M.adjustOxyLoss(1)
- M.emote("cough")
- return 1
-
-/obj/effect/particle_effect/smoke/bad/CanPass(atom/movable/mover, turf/target)
- if(istype(mover, /obj/item/projectile/beam))
- var/obj/item/projectile/beam/B = mover
- B.damage = (B.damage/2)
- return 1
-
-
-
-/datum/effect_system/smoke_spread/bad
- effect_type = /obj/effect/particle_effect/smoke/bad
-
-/////////////////////////////////////////////
-// Nanofrost smoke
-/////////////////////////////////////////////
-
-/obj/effect/particle_effect/smoke/freezing
- name = "nanofrost smoke"
- color = "#B2FFFF"
- opaque = 0
-
-/datum/effect_system/smoke_spread/freezing
- effect_type = /obj/effect/particle_effect/smoke/freezing
- var/blast = 0
- var/temperature = 2
- var/weldvents = TRUE
- var/distcheck = TRUE
-
-/datum/effect_system/smoke_spread/freezing/proc/Chilled(atom/A)
- if(isopenturf(A))
- var/turf/open/T = A
- if(T.air)
- var/datum/gas_mixture/G = T.air
- if(!distcheck || get_dist(T, location) < blast) // Otherwise we'll get silliness like people using Nanofrost to kill people through walls with cold air
- G.temperature = temperature
- T.air_update_turf()
- for(var/obj/effect/hotspot/H in T)
- qdel(H)
- var/list/G_gases = G.gases
- if(G_gases[/datum/gas/plasma])
- G.assert_gas(/datum/gas/nitrogen)
- G_gases[/datum/gas/nitrogen][MOLES] += (G_gases[/datum/gas/plasma][MOLES])
- G_gases[/datum/gas/plasma][MOLES] = 0
- G.garbage_collect()
- if (weldvents)
- for(var/obj/machinery/atmospherics/components/unary/U in T)
- if(!isnull(U.welded) && !U.welded) //must be an unwelded vent pump or vent scrubber.
- U.welded = TRUE
- U.update_icon()
- U.visible_message("[U] was frozen shut!")
- for(var/mob/living/L in T)
- L.ExtinguishMob()
- for(var/obj/item/Item in T)
- Item.extinguish()
-
-/datum/effect_system/smoke_spread/freezing/set_up(radius = 5, loca, blast_radius = 0)
- ..()
- blast = blast_radius
-
-/datum/effect_system/smoke_spread/freezing/start()
- if(blast)
- for(var/turf/T in RANGE_TURFS(blast, location))
- Chilled(T)
- ..()
-
-/datum/effect_system/smoke_spread/freezing/decon
- temperature = 293.15
- distcheck = FALSE
- weldvents = FALSE
-
-
-/////////////////////////////////////////////
-// Sleep smoke
-/////////////////////////////////////////////
-
-/obj/effect/particle_effect/smoke/sleeping
- color = "#9C3636"
- lifetime = 10
-
-/obj/effect/particle_effect/smoke/sleeping/smoke_mob(mob/living/carbon/M)
- if(..())
- M.Sleeping(200)
- M.emote("cough")
- return 1
-
-/datum/effect_system/smoke_spread/sleeping
- effect_type = /obj/effect/particle_effect/smoke/sleeping
-
-/////////////////////////////////////////////
-// Chem smoke
-/////////////////////////////////////////////
-
-/obj/effect/particle_effect/smoke/chem
- lifetime = 10
-
-
-/obj/effect/particle_effect/smoke/chem/process()
- if(..())
- var/turf/T = get_turf(src)
- var/fraction = 1/initial(lifetime)
- for(var/atom/movable/AM in T)
- if(AM.type == src.type)
- continue
- if(T.intact && AM.level == 1) //hidden under the floor
- continue
- reagents.reaction(AM, TOUCH, fraction)
-
- reagents.reaction(T, TOUCH, fraction)
- return 1
-
-/obj/effect/particle_effect/smoke/chem/smoke_mob(mob/living/carbon/M)
- if(lifetime<1)
- return 0
- if(!istype(M))
- return 0
- var/mob/living/carbon/C = M
- if(C.internal != null || C.has_smoke_protection())
- return 0
- var/fraction = 1/initial(lifetime)
- reagents.copy_to(C, fraction*reagents.total_volume)
- reagents.reaction(M, INGEST, fraction)
- return 1
-
-
-
-/datum/effect_system/smoke_spread/chem
- var/obj/chemholder
- effect_type = /obj/effect/particle_effect/smoke/chem
-
-/datum/effect_system/smoke_spread/chem/New()
- ..()
- chemholder = new /obj()
- var/datum/reagents/R = new/datum/reagents(500)
- chemholder.reagents = R
- R.my_atom = chemholder
-
-/datum/effect_system/smoke_spread/chem/Destroy()
- qdel(chemholder)
- chemholder = null
- return ..()
-
-/datum/effect_system/smoke_spread/chem/set_up(datum/reagents/carry = null, radius = 1, loca, silent = FALSE)
- if(isturf(loca))
- location = loca
- else
- location = get_turf(loca)
- amount = radius
- carry.copy_to(chemholder, carry.total_volume)
-
- if(!silent)
- var/contained = ""
- for(var/reagent in carry.reagent_list)
- contained += " [reagent] "
- if(contained)
- contained = "\[[contained]\]"
-
- var/where = "[AREACOORD(location)]"
- if(carry.my_atom.fingerprintslast)
- var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast)
- var/more = ""
- if(M)
- more = "[ADMIN_LOOKUPFLW(M)] "
- message_admins("Smoke: ([ADMIN_VERBOSEJMP(location)])[contained]. Key: [more ? more : carry.my_atom.fingerprintslast].")
- log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last touched by [carry.my_atom.fingerprintslast].")
- else
- message_admins("Smoke: ([ADMIN_VERBOSEJMP(location)])[contained]. No associated key.")
- log_game("A chemical smoke reaction has taken place in ([where])[contained]. No associated key.")
-
-
-/datum/effect_system/smoke_spread/chem/start()
- var/mixcolor = mix_color_from_reagents(chemholder.reagents.reagent_list)
- if(holder)
- location = get_turf(holder)
- var/obj/effect/particle_effect/smoke/chem/S = new effect_type(location)
-
- if(chemholder.reagents.total_volume > 1) // can't split 1 very well
- chemholder.reagents.copy_to(S, chemholder.reagents.total_volume)
-
- if(mixcolor)
- S.add_atom_colour(mixcolor, FIXED_COLOUR_PRIORITY) // give the smoke color, if it has any to begin with
- S.amount = amount
- if(S.amount)
- S.spread_smoke() //calling process right now so the smoke immediately attacks mobs.
-
-
-/////////////////////////////////////////////
-// Transparent smoke
-/////////////////////////////////////////////
-
-//Same as the base type, but the smoke produced is not opaque
-/datum/effect_system/smoke_spread/transparent
- effect_type = /obj/effect/particle_effect/smoke/transparent
-
-/obj/effect/particle_effect/smoke/transparent
- opaque = FALSE
+/////////////////////////////////////////////
+//// SMOKE SYSTEMS
+/////////////////////////////////////////////
+
+/obj/effect/particle_effect/smoke
+ name = "smoke"
+ icon = 'icons/effects/96x96.dmi'
+ icon_state = "smoke"
+ pixel_x = -32
+ pixel_y = -32
+ opacity = 0
+ layer = FLY_LAYER
+ anchored = TRUE
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ animate_movement = 0
+ var/amount = 4
+ var/lifetime = 5
+ var/opaque = 1 //whether the smoke can block the view when in enough amount
+
+
+/obj/effect/particle_effect/smoke/proc/fade_out(frames = 16)
+ if(alpha == 0) //Handle already transparent case
+ return
+ if(frames == 0)
+ frames = 1 //We will just assume that by 0 frames, the coder meant "during one frame".
+ var/step = alpha / frames
+ for(var/i = 0, i < frames, i++)
+ alpha -= step
+ if(alpha < 160)
+ set_opacity(0) //if we were blocking view, we aren't now because we're fading out
+ stoplag()
+
+/obj/effect/particle_effect/smoke/Initialize()
+ . = ..()
+ create_reagents(500)
+ START_PROCESSING(SSobj, src)
+
+
+/obj/effect/particle_effect/smoke/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ return ..()
+
+/obj/effect/particle_effect/smoke/proc/kill_smoke()
+ STOP_PROCESSING(SSobj, src)
+ INVOKE_ASYNC(src, .proc/fade_out)
+ QDEL_IN(src, 10)
+
+/obj/effect/particle_effect/smoke/process()
+ lifetime--
+ if(lifetime < 1)
+ kill_smoke()
+ return 0
+ for(var/mob/living/L in range(0,src))
+ smoke_mob(L)
+ return 1
+
+/obj/effect/particle_effect/smoke/proc/smoke_mob(mob/living/carbon/C)
+ if(!istype(C))
+ return 0
+ if(lifetime<1)
+ return 0
+ if(C.internal != null || C.has_smoke_protection())
+ return 0
+ if(C.smoke_delay)
+ return 0
+ C.smoke_delay++
+ addtimer(CALLBACK(src, .proc/remove_smoke_delay, C), 10)
+ return 1
+
+/obj/effect/particle_effect/smoke/proc/remove_smoke_delay(mob/living/carbon/C)
+ if(C)
+ C.smoke_delay = 0
+
+/obj/effect/particle_effect/smoke/proc/spread_smoke()
+ var/turf/t_loc = get_turf(src)
+ if(!t_loc)
+ return
+ var/list/newsmokes = list()
+ for(var/turf/T in t_loc.GetAtmosAdjacentTurfs())
+ var/obj/effect/particle_effect/smoke/foundsmoke = locate() in T //Don't spread smoke where there's already smoke!
+ if(foundsmoke)
+ continue
+ for(var/mob/living/L in T)
+ smoke_mob(L)
+ var/obj/effect/particle_effect/smoke/S = new type(T)
+ reagents.copy_to(S, reagents.total_volume)
+ S.setDir(pick(GLOB.cardinals))
+ S.amount = amount-1
+ S.add_atom_colour(color, FIXED_COLOUR_PRIORITY)
+ S.lifetime = lifetime
+ if(S.amount>0)
+ if(opaque)
+ S.set_opacity(TRUE)
+ newsmokes.Add(S)
+
+ if(newsmokes.len)
+ spawn(1) //the smoke spreads rapidly but not instantly
+ for(var/obj/effect/particle_effect/smoke/SM in newsmokes)
+ SM.spread_smoke()
+
+
+/datum/effect_system/smoke_spread
+ var/amount = 10
+ effect_type = /obj/effect/particle_effect/smoke
+
+/datum/effect_system/smoke_spread/set_up(radius = 5, loca)
+ if(isturf(loca))
+ location = loca
+ else
+ location = get_turf(loca)
+ amount = radius
+
+/datum/effect_system/smoke_spread/start()
+ if(holder)
+ location = get_turf(holder)
+ var/obj/effect/particle_effect/smoke/S = new effect_type(location)
+ S.amount = amount
+ if(S.amount)
+ S.spread_smoke()
+
+
+/////////////////////////////////////////////
+// Bad smoke
+/////////////////////////////////////////////
+
+/obj/effect/particle_effect/smoke/bad
+ lifetime = 8
+
+/obj/effect/particle_effect/smoke/bad/smoke_mob(mob/living/carbon/M)
+ if(..())
+ M.drop_all_held_items()
+ M.adjustOxyLoss(1)
+ M.emote("cough")
+ return 1
+
+/obj/effect/particle_effect/smoke/bad/CanPass(atom/movable/mover, turf/target)
+ if(istype(mover, /obj/item/projectile/beam))
+ var/obj/item/projectile/beam/B = mover
+ B.damage = (B.damage/2)
+ return 1
+
+
+
+/datum/effect_system/smoke_spread/bad
+ effect_type = /obj/effect/particle_effect/smoke/bad
+
+/////////////////////////////////////////////
+// Nanofrost smoke
+/////////////////////////////////////////////
+
+/obj/effect/particle_effect/smoke/freezing
+ name = "nanofrost smoke"
+ color = "#B2FFFF"
+ opaque = 0
+
+/datum/effect_system/smoke_spread/freezing
+ effect_type = /obj/effect/particle_effect/smoke/freezing
+ var/blast = 0
+ var/temperature = 2
+ var/weldvents = TRUE
+ var/distcheck = TRUE
+
+/datum/effect_system/smoke_spread/freezing/proc/Chilled(atom/A)
+ if(isopenturf(A))
+ var/turf/open/T = A
+ if(T.air)
+ var/datum/gas_mixture/G = T.air
+ if(!distcheck || get_dist(T, location) < blast) // Otherwise we'll get silliness like people using Nanofrost to kill people through walls with cold air
+ G.temperature = temperature
+ T.air_update_turf()
+ for(var/obj/effect/hotspot/H in T)
+ qdel(H)
+ var/list/G_gases = G.gases
+ if(G_gases[/datum/gas/plasma])
+ G_gases[/datum/gas/nitrogen] += (G_gases[/datum/gas/plasma])
+ G_gases[/datum/gas/plasma] = 0
+ GAS_GARBAGE_COLLECT(G.gases)
+ if (weldvents)
+ for(var/obj/machinery/atmospherics/components/unary/U in T)
+ if(!isnull(U.welded) && !U.welded) //must be an unwelded vent pump or vent scrubber.
+ U.welded = TRUE
+ U.update_icon()
+ U.visible_message("[U] was frozen shut!")
+ for(var/mob/living/L in T)
+ L.ExtinguishMob()
+ for(var/obj/item/Item in T)
+ Item.extinguish()
+
+/datum/effect_system/smoke_spread/freezing/set_up(radius = 5, loca, blast_radius = 0)
+ ..()
+ blast = blast_radius
+
+/datum/effect_system/smoke_spread/freezing/start()
+ if(blast)
+ for(var/turf/T in RANGE_TURFS(blast, location))
+ Chilled(T)
+ ..()
+
+/datum/effect_system/smoke_spread/freezing/decon
+ temperature = 293.15
+ distcheck = FALSE
+ weldvents = FALSE
+
+
+/////////////////////////////////////////////
+// Sleep smoke
+/////////////////////////////////////////////
+
+/obj/effect/particle_effect/smoke/sleeping
+ color = "#9C3636"
+ lifetime = 10
+
+/obj/effect/particle_effect/smoke/sleeping/smoke_mob(mob/living/carbon/M)
+ if(..())
+ M.Sleeping(200)
+ M.emote("cough")
+ return 1
+
+/datum/effect_system/smoke_spread/sleeping
+ effect_type = /obj/effect/particle_effect/smoke/sleeping
+
+/////////////////////////////////////////////
+// Chem smoke
+/////////////////////////////////////////////
+
+/obj/effect/particle_effect/smoke/chem
+ lifetime = 10
+
+
+/obj/effect/particle_effect/smoke/chem/process()
+ if(..())
+ var/turf/T = get_turf(src)
+ var/fraction = 1/initial(lifetime)
+ for(var/atom/movable/AM in T)
+ if(AM.type == src.type)
+ continue
+ if(T.intact && AM.level == 1) //hidden under the floor
+ continue
+ reagents.reaction(AM, TOUCH, fraction)
+
+ reagents.reaction(T, TOUCH, fraction)
+ return 1
+
+/obj/effect/particle_effect/smoke/chem/smoke_mob(mob/living/carbon/M)
+ if(lifetime<1)
+ return 0
+ if(!istype(M))
+ return 0
+ var/mob/living/carbon/C = M
+ if(C.internal != null || C.has_smoke_protection())
+ return 0
+ var/fraction = 1/initial(lifetime)
+ reagents.copy_to(C, fraction*reagents.total_volume)
+ reagents.reaction(M, INGEST, fraction)
+ return 1
+
+
+
+/datum/effect_system/smoke_spread/chem
+ var/obj/chemholder
+ effect_type = /obj/effect/particle_effect/smoke/chem
+
+/datum/effect_system/smoke_spread/chem/New()
+ ..()
+ chemholder = new /obj()
+ var/datum/reagents/R = new/datum/reagents(500)
+ chemholder.reagents = R
+ R.my_atom = chemholder
+
+/datum/effect_system/smoke_spread/chem/Destroy()
+ qdel(chemholder)
+ chemholder = null
+ return ..()
+
+/datum/effect_system/smoke_spread/chem/set_up(datum/reagents/carry = null, radius = 1, loca, silent = FALSE)
+ if(isturf(loca))
+ location = loca
+ else
+ location = get_turf(loca)
+ amount = radius
+ carry.copy_to(chemholder, carry.total_volume)
+
+ if(!silent)
+ var/contained = ""
+ for(var/reagent in carry.reagent_list)
+ contained += " [reagent] "
+ if(contained)
+ contained = "\[[contained]\]"
+
+ var/where = "[AREACOORD(location)]"
+ if(carry.my_atom.fingerprintslast)
+ var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast)
+ var/more = ""
+ if(M)
+ more = "[ADMIN_LOOKUPFLW(M)] "
+ message_admins("Smoke: ([ADMIN_VERBOSEJMP(location)])[contained]. Key: [more ? more : carry.my_atom.fingerprintslast].")
+ log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last touched by [carry.my_atom.fingerprintslast].")
+ else
+ message_admins("Smoke: ([ADMIN_VERBOSEJMP(location)])[contained]. No associated key.")
+ log_game("A chemical smoke reaction has taken place in ([where])[contained]. No associated key.")
+
+
+/datum/effect_system/smoke_spread/chem/start()
+ var/mixcolor = mix_color_from_reagents(chemholder.reagents.reagent_list)
+ if(holder)
+ location = get_turf(holder)
+ var/obj/effect/particle_effect/smoke/chem/S = new effect_type(location)
+
+ if(chemholder.reagents.total_volume > 1) // can't split 1 very well
+ chemholder.reagents.copy_to(S, chemholder.reagents.total_volume)
+
+ if(mixcolor)
+ S.add_atom_colour(mixcolor, FIXED_COLOUR_PRIORITY) // give the smoke color, if it has any to begin with
+ S.amount = amount
+ if(S.amount)
+ S.spread_smoke() //calling process right now so the smoke immediately attacks mobs.
+
+
+/////////////////////////////////////////////
+// Transparent smoke
+/////////////////////////////////////////////
+
+//Same as the base type, but the smoke produced is not opaque
+/datum/effect_system/smoke_spread/transparent
+ effect_type = /obj/effect/particle_effect/smoke/transparent
+
+/obj/effect/particle_effect/smoke/transparent
+ opaque = FALSE
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 12a72685bb..32d91ee76a 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -131,7 +131,7 @@
var/obj/item/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
victim.log_message("entered a blood frenzy", LOG_ATTACK)
- chainsaw.item_flags |= NODROP
+ ADD_TRAIT(chainsaw, TRAIT_NODROP, CHAINSAW_FRENZY_TRAIT)
victim.drop_all_held_items()
victim.put_in_hands(chainsaw, forced = TRUE)
chainsaw.attack_self(victim)
@@ -170,7 +170,7 @@
if(!victim.client || !istype(victim))
return
to_chat(victim, "You feel fast!")
- victim.add_trait(TRAIT_GOTTAGOREALLYFAST, "yellow_orb")
+ ADD_TRAIT(victim, TRAIT_GOTTAGOREALLYFAST, "yellow_orb")
sleep(duration)
- victim.remove_trait(TRAIT_GOTTAGOREALLYFAST, "yellow_orb")
+ REMOVE_TRAIT(victim, TRAIT_GOTTAGOREALLYFAST, "yellow_orb")
to_chat(victim, "You slow down.")
diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
index b1bb3e6b4d..65395d534a 100644
--- a/code/game/objects/effects/spawners/bombspawner.dm
+++ b/code/game/objects/effects/spawners/bombspawner.dm
@@ -1,6 +1,6 @@
#define CELSIUS_TO_KELVIN(T_K) ((T_K) + T0C)
-#define OPTIMAL_TEMP_K_PLA_BURN_SCALE(PRESSURE_P,PRESSURE_O,TEMP_O) (((PRESSURE_P) * GLOB.meta_gas_info[/datum/gas/plasma][META_GAS_SPECIFIC_HEAT]) / (((PRESSURE_P) * GLOB.meta_gas_info[/datum/gas/plasma][META_GAS_SPECIFIC_HEAT] + (PRESSURE_O) * GLOB.meta_gas_info[/datum/gas/oxygen][META_GAS_SPECIFIC_HEAT]) / PLASMA_UPPER_TEMPERATURE - (PRESSURE_O) * GLOB.meta_gas_info[/datum/gas/oxygen][META_GAS_SPECIFIC_HEAT] / CELSIUS_TO_KELVIN(TEMP_O)))
+#define OPTIMAL_TEMP_K_PLA_BURN_SCALE(PRESSURE_P,PRESSURE_O,TEMP_O) (((PRESSURE_P) * GLOB.meta_gas_specific_heats[/datum/gas/plasma]) / (((PRESSURE_P) * GLOB.meta_gas_specific_heats[/datum/gas/plasma] + (PRESSURE_O) * GLOB.meta_gas_specific_heats[/datum/gas/oxygen]) / PLASMA_UPPER_TEMPERATURE - (PRESSURE_O) * GLOB.meta_gas_specific_heats[/datum/gas/oxygen] / CELSIUS_TO_KELVIN(TEMP_O)))
#define OPTIMAL_TEMP_K_PLA_BURN_RATIO(PRESSURE_P,PRESSURE_O,TEMP_O) (CELSIUS_TO_KELVIN(TEMP_O) * PLASMA_OXYGEN_FULLBURN * (PRESSURE_P) / (PRESSURE_O))
/obj/effect/spawner/newbomb
@@ -19,12 +19,10 @@
var/obj/item/tank/internals/plasma/PT = new(V)
var/obj/item/tank/internals/oxygen/OT = new(V)
- PT.air_contents.assert_gas(/datum/gas/plasma)
- PT.air_contents.gases[/datum/gas/plasma][MOLES] = pressure_p*PT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_p))
+ PT.air_contents.gases[/datum/gas/plasma] = pressure_p*PT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_p))
PT.air_contents.temperature = CELSIUS_TO_KELVIN(temp_p)
- OT.air_contents.assert_gas(/datum/gas/oxygen)
- OT.air_contents.gases[/datum/gas/oxygen][MOLES] = pressure_o*OT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_o))
+ OT.air_contents.gases[/datum/gas/oxygen] = pressure_o*OT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_o))
OT.air_contents.temperature = CELSIUS_TO_KELVIN(temp_o)
V.tank_one = PT
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 4a77274d23..bdb949a570 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -30,6 +30,18 @@
loot_spawned++
return INITIALIZE_HINT_QDEL
+/obj/effect/spawner/lootdrop/bedsheet
+ icon = 'icons/obj/bedsheets.dmi'
+ icon_state = "random_bedsheet"
+ name = "random dorms bedsheet"
+ loot = list(/obj/item/bedsheet = 8, /obj/item/bedsheet/blue = 8, /obj/item/bedsheet/green = 8,
+ /obj/item/bedsheet/grey = 8, /obj/item/bedsheet/orange = 8, /obj/item/bedsheet/purple = 8,
+ /obj/item/bedsheet/red = 8, /obj/item/bedsheet/yellow = 8, /obj/item/bedsheet/brown = 8,
+ /obj/item/bedsheet/black = 8, /obj/item/bedsheet/patriot = 3, /obj/item/bedsheet/rainbow = 3,
+ /obj/item/bedsheet/ian = 3, /obj/item/bedsheet/runtime = 3, /obj/item/bedsheet/nanotrasen = 3,
+ /obj/item/bedsheet/pirate = 1, /obj/item/bedsheet/cosmos = 1, /obj/item/bedsheet/gondola = 1
+ )
+
/obj/effect/spawner/lootdrop/armory_contraband
name = "armory contraband gun spawner"
lootdoubles = FALSE
@@ -108,6 +120,33 @@
loot = GLOB.maintenance_loot
. = ..()
+/obj/effect/spawner/lootdrop/glowstick
+ name = "random colored glowstick"
+ icon = 'icons/obj/lighting.dmi'
+ icon_state = "random_glowstick"
+
+/obj/effect/spawner/lootdrop/glowstick/Initialize()
+ loot = typesof(/obj/item/flashlight/glowstick)
+ . = ..()
+
+
+/obj/effect/spawner/lootdrop/gloves
+ name = "random gloves"
+ desc = "These gloves are supposed to be a random color..."
+ icon = 'icons/obj/clothing/gloves.dmi'
+ icon_state = "random_gloves"
+ loot = list(
+ /obj/item/clothing/gloves/color/orange = 1,
+ /obj/item/clothing/gloves/color/red = 1,
+ /obj/item/clothing/gloves/color/blue = 1,
+ /obj/item/clothing/gloves/color/purple = 1,
+ /obj/item/clothing/gloves/color/green = 1,
+ /obj/item/clothing/gloves/color/grey = 1,
+ /obj/item/clothing/gloves/color/light_brown = 1,
+ /obj/item/clothing/gloves/color/brown = 1,
+ /obj/item/clothing/gloves/color/white = 1,
+ /obj/item/clothing/gloves/color/rainbow = 1)
+
/obj/effect/spawner/lootdrop/crate_spawner
name = "lootcrate spawner" //USE PROMO CODE "SELLOUT" FOR 20% OFF!
lootdoubles = FALSE
@@ -214,6 +253,20 @@
/obj/item/aiModule/core/full/damaged
)
+/obj/effect/spawner/lootdrop/mre
+ name = "random MRE"
+ icon = 'icons/obj/storage.dmi'
+ icon_state = "mre"
+
+/obj/effect/spawner/lootdrop/mre/Initialize()
+ for(var/A in subtypesof(/obj/item/storage/box/mre))
+ var/obj/item/storage/box/mre/M = A
+ var/our_chance = initial(M.spawner_chance)
+ if(our_chance)
+ LAZYSET(loot, M, our_chance)
+ return ..()
+
+
// Tech storage circuit board spawners
// For these, make sure that lootcount equals the number of list items
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index d49f311c18..e851140252 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -234,9 +234,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
research_msg += "."
to_chat(user, research_msg.Join())
-/obj/item/proc/speechModification(message) //for message modding by mask slot.
- return message
-
/obj/item/interact(mob/user)
add_fingerprint(user)
ui_interact(user)
@@ -261,7 +258,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
can_handle_hot = TRUE
else if(C.gloves && (C.gloves.max_heat_protection_temperature > 360))
can_handle_hot = TRUE
- else if(C.has_trait(TRAIT_RESISTHEAT) || C.has_trait(TRAIT_RESISTHEATHANDS))
+ else if(HAS_TRAIT(C, TRAIT_RESISTHEAT) || HAS_TRAIT(C, TRAIT_RESISTHEATHANDS))
can_handle_hot = TRUE
if(can_handle_hot)
@@ -454,10 +451,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
return 0
/obj/item/proc/eyestab(mob/living/carbon/M, mob/living/carbon/user)
- if(user.has_trait(TRAIT_PACIFISM))
+ if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, "You don't want to harm [M]!")
return
- if(user.has_trait(TRAIT_CLUMSY) && prob(50))
+ if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
M = user
var/is_human_victim = 0
var/obj/item/bodypart/affecting = M.get_bodypart(BODY_ZONE_HEAD)
@@ -528,7 +525,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
M.adjust_blurriness(15)
if(M.stat != DEAD)
to_chat(M, "Your eyes start to bleed profusely!")
- if(!(M.has_trait(TRAIT_BLIND) || M.has_trait(TRAIT_NEARSIGHT)))
+ if(!(HAS_TRAIT(M, TRAIT_BLIND) || HAS_TRAIT(M, TRAIT_NEARSIGHT)))
to_chat(M, "You become nearsighted!")
M.become_nearsighted(EYE_DAMAGE)
if(prob(50))
@@ -662,11 +659,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
else
. = ""
-
-//when an item modify our speech spans when in our active hand. Override this to modify speech spans.
-/obj/item/proc/get_held_item_speechspans(mob/living/carbon/user)
- return
-
/obj/item/hitby(atom/movable/AM)
return
@@ -701,7 +693,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
..()
/obj/item/proc/microwave_act(obj/machinery/microwave/M)
- if(M && M.dirty < 100)
+ if(istype(M) && M.dirty < 100)
M.dirty++
/obj/item/proc/on_mob_death(mob/living/L, gibbed)
@@ -840,6 +832,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
return ..()
/obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=TRUE, diagonals_first = FALSE, var/datum/callback/callback)
- if (item_flags & NODROP)
+ if (HAS_TRAIT(src, TRAIT_NODROP))
return
return ..()
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index 7881c277ff..1ff3c7df9f 100644
--- a/code/game/objects/items/RCD.dm
+++ b/code/game/objects/items/RCD.dm
@@ -161,13 +161,18 @@ RLD
user.visible_message("[user] sets the RCD to 'Wall' and points it down [user.p_their()] throat! It looks like [user.p_theyre()] trying to commit suicide..")
return (BRUTELOSS)
-/obj/item/construction/rcd/verb/toggle_window_type()
- set name = "Toggle Window Type"
+/obj/item/construction/rcd/verb/toggle_window_type_verb()
+ set name = "RCD : Toggle Window Type"
set category = "Object"
- set src in usr // What does this do?
+ set src in view(1)
+ if(!usr.canUseTopic(src, BE_CLOSE))
+ return
+
+ toggle_window_type(usr)
+
+/obj/item/construction/rcd/proc/toggle_window_type(mob/user)
var/window_type_name
-
if (window_type == /obj/structure/window/fulltile)
window_type = /obj/structure/window/reinforced/fulltile
window_type_name = "reinforced glass"
@@ -175,17 +180,14 @@ RLD
window_type = /obj/structure/window/fulltile
window_type_name = "glass"
- to_chat(usr, "You change \the [src]'s window mode to [window_type_name].")
+ to_chat(user, "You change \the [src]'s window mode to [window_type_name].")
-/obj/item/construction/rcd/verb/change_airlock_access()
- set name = "Change Airlock Access"
- set category = "Object"
- set src in usr
+/obj/item/construction/rcd/verb/change_airlock_access(mob/user)
- if (!ishuman(usr) && !usr.has_unlimited_silicon_privilege)
- return ..(usr)
+ if (!ishuman(user) && !user.has_unlimited_silicon_privilege)
+ return
- var/t1 = text("")
+ var/t1 = ""
if(use_one_access)
@@ -216,24 +218,23 @@ RLD
t1 += "Close
\n"
- var/datum/browser/popup = new(usr, "airlock_electronics", "Access Control", 900, 500)
+ var/datum/browser/popup = new(user, "rcd_access", "Access Control", 900, 500)
popup.set_content(t1)
- popup.set_title_image(usr.browse_rsc_icon(src.icon, src.icon_state))
+ popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
popup.open()
- onclose(usr, "airlock")
+ onclose(user, "rcd_access")
/obj/item/construction/rcd/Topic(href, href_list)
..()
if (usr.stat || usr.restrained())
return
if (href_list["close"])
- usr << browse(null, "window=airlock")
+ usr << browse(null, "window=rcd_access")
return
if (href_list["access"])
toggle_access(href_list["access"])
-
- change_airlock_access()
+ change_airlock_access(usr)
/obj/item/construction/rcd/proc/toggle_access(acc)
if (acc == "all")
@@ -253,16 +254,77 @@ RLD
if (!conf_access.len)
conf_access = null
-/obj/item/construction/rcd/verb/change_airlock_setting()
- set name = "Change Airlock Setting"
- set category = "Object"
- set src in usr
+/obj/item/construction/rcd/proc/get_airlock_image(airlock_type)
+ var/obj/machinery/door/airlock/proto = airlock_type
+ var/ic = initial(proto.icon)
+ var/mutable_appearance/MA = mutable_appearance(ic, "closed")
+ if(!initial(proto.glass))
+ MA.overlays += "fill_closed"
+ //Not scaling these down to button size because they look horrible then, instead just bumping up radius.
+ return MA
- var/airlockcat = input(usr, "Select whether the airlock is solid or glass.") in list("Solid", "Glass")
+/obj/item/construction/rcd/proc/check_menu(mob/living/user)
+ if(!istype(user))
+ return FALSE
+ if(user.incapacitated() || !user.Adjacent(src))
+ return FALSE
+ return TRUE
+
+/obj/item/construction/rcd/proc/change_airlock_setting(mob/user)
+ if(!user)
+ return
+
+ var/list/solid_or_glass_choices = list(
+ "Solid" = get_airlock_image(/obj/machinery/door/airlock),
+ "Glass" = get_airlock_image(/obj/machinery/door/airlock/glass)
+ )
+
+ var/list/solid_choices = list(
+ "Standard" = get_airlock_image(/obj/machinery/door/airlock),
+ "Public" = get_airlock_image(/obj/machinery/door/airlock/public),
+ "Engineering" = get_airlock_image(/obj/machinery/door/airlock/engineering),
+ "Atmospherics" = get_airlock_image(/obj/machinery/door/airlock/atmos),
+ "Security" = get_airlock_image(/obj/machinery/door/airlock/security),
+ "Command" = get_airlock_image(/obj/machinery/door/airlock/command),
+ "Medical" = get_airlock_image(/obj/machinery/door/airlock/medical),
+ "Research" = get_airlock_image(/obj/machinery/door/airlock/research),
+ "Freezer" = get_airlock_image(/obj/machinery/door/airlock/freezer),
+ "Science" = get_airlock_image(/obj/machinery/door/airlock/science),
+ "Virology" = get_airlock_image(/obj/machinery/door/airlock/virology),
+ "Mining" = get_airlock_image(/obj/machinery/door/airlock/mining),
+ "Maintenance" = get_airlock_image(/obj/machinery/door/airlock/maintenance),
+ "External" = get_airlock_image(/obj/machinery/door/airlock/external),
+ "External Maintenance" = get_airlock_image(/obj/machinery/door/airlock/maintenance/external),
+ "Airtight Hatch" = get_airlock_image(/obj/machinery/door/airlock/hatch),
+ "Maintenance Hatch" = get_airlock_image(/obj/machinery/door/airlock/maintenance_hatch)
+ )
+
+ var/list/glass_choices = list(
+ "Standard" = get_airlock_image(/obj/machinery/door/airlock/glass),
+ "Public" = get_airlock_image(/obj/machinery/door/airlock/public/glass),
+ "Engineering" = get_airlock_image(/obj/machinery/door/airlock/engineering/glass),
+ "Atmospherics" = get_airlock_image(/obj/machinery/door/airlock/atmos/glass),
+ "Security" = get_airlock_image(/obj/machinery/door/airlock/security/glass),
+ "Command" = get_airlock_image(/obj/machinery/door/airlock/command/glass),
+ "Medical" = get_airlock_image(/obj/machinery/door/airlock/medical/glass),
+ "Research" = get_airlock_image(/obj/machinery/door/airlock/research/glass),
+ "Science" = get_airlock_image(/obj/machinery/door/airlock/science/glass),
+ "Virology" = get_airlock_image(/obj/machinery/door/airlock/virology/glass),
+ "Mining" = get_airlock_image(/obj/machinery/door/airlock/mining/glass),
+ "Maintenance" = get_airlock_image(/obj/machinery/door/airlock/maintenance/glass),
+ "External" = get_airlock_image(/obj/machinery/door/airlock/external/glass),
+ "External Maintenance" = get_airlock_image(/obj/machinery/door/airlock/maintenance/external/glass)
+ )
+
+ var/airlockcat = show_radial_menu(user, src, solid_or_glass_choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE)
+ if(!check_menu(user))
+ return
switch(airlockcat)
if("Solid")
if(advanced_airlock_setting == 1)
- var/airlockpaint = input(usr, "Select the type of the airlock.") in list("Standard", "Public", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Freezer", "Science", "Virology", "Mining", "Maintenance", "External", "External Maintenance", "Airtight Hatch", "Maintenance Hatch")
+ var/airlockpaint = show_radial_menu(user, src, solid_choices, radius = 42, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE)
+ if(!check_menu(user))
+ return
switch(airlockpaint)
if("Standard")
airlock_type = /obj/machinery/door/airlock
@@ -305,7 +367,9 @@ RLD
if("Glass")
if(advanced_airlock_setting == 1)
- var/airlockpaint = input(usr, "Select the type of the airlock.") in list("Standard", "Public", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Science", "Virology", "Mining", "Maintenance", "External", "External Maintenance")
+ var/airlockpaint = show_radial_menu(user, src , glass_choices, radius = 42, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE)
+ if(!check_menu(user))
+ return
switch(airlockpaint)
if("Standard")
airlock_type = /obj/machinery/door/airlock/glass
@@ -350,14 +414,16 @@ RLD
return FALSE
if(do_after(user, rcd_results["delay"] * delay_mod, target = A))
if(checkResource(rcd_results["cost"], user))
+ var/atom/cached = A
if(A.rcd_act(user, src, rcd_results["mode"]))
useResource(rcd_results["cost"], user)
activate()
- playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+ investigate_log("[user] used [src] on [cached] (now [A]) with cost [rcd_results["cost"]], delay [rcd_results["delay"]], mode [rcd_results["mode"]].", INVESTIGATE_RCD)
+ playsound(src, 'sound/machines/click.ogg', 50, 1)
return TRUE
-/obj/item/construction/rcd/New()
- ..()
+/obj/item/construction/rcd/Initialize()
+ . = ..()
GLOB.rcd_list += src
/obj/item/construction/rcd/Destroy()
@@ -366,19 +432,46 @@ RLD
/obj/item/construction/rcd/attack_self(mob/user)
..()
- switch(mode)
- if(1)
- mode = 2
- to_chat(user, "You change RCD's mode to 'Airlock'.")
- if(2)
- mode = 3
- to_chat(user, "You change RCD's mode to 'Deconstruct'.")
- if(3)
- mode = 4
- to_chat(user, "You change RCD's mode to 'Grilles & Windows'.")
- if(4)
- mode = 1
- to_chat(user, "You change RCD's mode to 'Floor & Walls'.")
+ var/list/choices = list(
+ "Airlock" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlock"),
+ "Deconstruct" = image(icon= 'icons/mob/radial.dmi', icon_state = "delete"),
+ "Grilles & Windows" = image(icon = 'icons/mob/radial.dmi', icon_state = "grillewindow"),
+ "Floors & Walls" = image(icon = 'icons/mob/radial.dmi', icon_state = "wallfloor")
+ )
+ if(mode == RCD_AIRLOCK)
+ choices += list(
+ "Change Access" = image(icon = 'icons/mob/radial.dmi', icon_state = "access"),
+ "Change Airlock Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlocktype")
+ )
+ else if(mode == RCD_WINDOWGRILLE)
+ choices += list(
+ "Change Window Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "windowtype")
+ )
+ var/choice = show_radial_menu(user,src,choices, custom_check = CALLBACK(src,.proc/check_menu,user))
+ if(!check_menu(user))
+ return
+ switch(choice)
+ if("Floors & Walls")
+ mode = RCD_FLOORWALL
+ if("Airlock")
+ mode = RCD_AIRLOCK
+ if("Deconstruct")
+ mode = RCD_DECONSTRUCT
+ if("Grilles & Windows")
+ mode = RCD_WINDOWGRILLE
+ if("Change Access")
+ change_airlock_access(user)
+ return
+ if("Change Airlock Type")
+ change_airlock_setting(user)
+ return
+ if("Change Window Type")
+ toggle_window_type(user)
+ return
+ else
+ return
+ playsound(src, 'sound/effects/pop.ogg', 50, 0)
+ to_chat(user, "You change RCD's mode to '[choice]'.")
/obj/item/construction/rcd/proc/target_check(atom/A, mob/user) // only returns true for stuff the device can actually work with
if((isturf(A) && A.density && mode==RCD_DECONSTRUCT) || (isturf(A) && !A.density) || (istype(A, /obj/machinery/door/airlock) && mode==RCD_DECONSTRUCT) || istype(A, /obj/structure/grille) || (istype(A, /obj/structure/window) && mode==RCD_DECONSTRUCT) || istype(A, /obj/structure/girder))
@@ -523,7 +616,7 @@ RLD
name = "rapid-light-device (RLD)"
desc = "A device used to rapidly provide lighting sources to an area. Reload with metal, plasteel, glass or compressed matter cartridges."
icon = 'icons/obj/tools.dmi'
- icon_state = "rld-5"
+ icon_state = "rld"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
matter = 500
@@ -531,6 +624,8 @@ RLD
sheetmultiplier = 16
var/mode = LIGHT_MODE
actions_types = list(/datum/action/item_action/pick_color)
+ ammo_sections = 5
+ has_ammobar = TRUE
var/wallcost = 10
var/floorcost = 15
@@ -544,6 +639,10 @@ RLD
var/color_choice = null
+/obj/item/construction/rld/Initialize()
+ . = ..()
+ update_icon()
+
/obj/item/construction/rld/ui_action_click(mob/user, var/datum/action/A)
if(istype(A, /datum/action/item_action/pick_color))
color_choice = input(user,"","Choose Color",color_choice) as color
@@ -551,9 +650,10 @@ RLD
..()
/obj/item/construction/rld/update_icon()
- icon_state = "rld-[round(matter/35)]"
..()
-
+ var/ratio = CEILING((matter / max_matter) * ammo_sections, 1)
+ cut_overlays() //To prevent infinite stacking of overlays
+ add_overlay("rld_light[ratio]")
/obj/item/construction/rld/attack_self(mob/user)
..()
diff --git a/code/game/objects/items/RCL.dm b/code/game/objects/items/RCL.dm
index bc1b128c69..63f460f9aa 100644
--- a/code/game/objects/items/RCL.dm
+++ b/code/game/objects/items/RCL.dm
@@ -2,7 +2,7 @@
name = "rapid cable layer"
desc = "A device used to rapidly deploy cables. It has screws on the side which can be removed to slide off the cables. Do not use without insulation!"
icon = 'icons/obj/tools.dmi'
- icon_state = "rcl-0"
+ icon_state = "rcl-empty"
item_state = "rcl-0"
var/obj/structure/cable/last
var/obj/item/stack/cable_coil/loaded
@@ -14,13 +14,14 @@
w_class = WEIGHT_CLASS_NORMAL
var/max_amount = 90
var/active = FALSE
- actions_types = list(/datum/action/item_action/rcl)
+ actions_types = list(/datum/action/item_action/rcl_col,/datum/action/item_action/rcl_gui)
var/list/colors = list("red", "yellow", "green", "blue", "pink", "orange", "cyan", "white")
var/current_color_index = 1
var/ghetto = FALSE
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
var/datum/component/mobhook
+ var/datum/radial_menu/persistent/wiring_gui_menu
/obj/item/twohanded/rcl/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/stack/cable_coil))
@@ -85,27 +86,38 @@
/obj/item/twohanded/rcl/Destroy()
QDEL_NULL(loaded)
last = null
- setActive(FALSE, null) // setactive(FALSE) removes mobhook
+ QDEL_NULL(mobhook)
+ QDEL_NULL(wiring_gui_menu)
return ..()
/obj/item/twohanded/rcl/update_icon()
if(!loaded)
- icon_state = "rcl-0"
- item_state = "rcl-0"
+ icon_state = "rcl-empty"
+ item_state = "rcl-empty"
return
+ cut_overlays()
+ var/cable_amount = 0
switch(loaded.amount)
if(61 to INFINITY)
- icon_state = "rcl-30"
- item_state = "rcl"
+ cable_amount = 3
if(31 to 60)
- icon_state = "rcl-20"
- item_state = "rcl"
+ cable_amount = 2
if(1 to 30)
- icon_state = "rcl-10"
- item_state = "rcl"
+ cable_amount = 1
else
- icon_state = "rcl-0"
- item_state = "rcl-0"
+ cable_amount = 0
+
+ var/mutable_appearance/cable_overlay = mutable_appearance(icon, "rcl-[cable_amount]")
+ cable_overlay.color = GLOB.cable_colors[colors[current_color_index]]
+ if(cable_amount >= 1)
+ icon_state = "rcl"
+ item_state = "rcl"
+ add_overlay(cable_overlay)
+ else
+ icon_state = "rcl-empty"
+ item_state = "rcl-0"
+ add_overlay(cable_overlay)
+
/obj/item/twohanded/rcl/proc/is_empty(mob/user, loud = 1)
update_icon()
@@ -115,20 +127,28 @@
if(loaded)
QDEL_NULL(loaded)
loaded = null
+ QDEL_NULL(wiring_gui_menu)
unwield(user)
- setActive(wielded, user)
+ active = wielded
return TRUE
return FALSE
+/obj/item/twohanded/rcl/pickup(mob/user)
+ ..()
+ getMobhook(user)
+
+
+
/obj/item/twohanded/rcl/dropped(mob/wearer)
..()
if(mobhook)
- setActive(FALSE, mobhook.parent)
+ active = FALSE
+ QDEL_NULL(mobhook)
last = null
/obj/item/twohanded/rcl/attack_self(mob/user)
..()
- setActive(wielded, user)
+ active = wielded
if(!active)
last = null
else if(!last)
@@ -137,17 +157,24 @@
last = C
break
-/obj/item/twohanded/rcl/proc/setActive(toggle, mob/user)
- active = toggle
- if (active && user)
- if (mobhook && mobhook.parent != user)
+obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook)
+ if(to_hook)
+ if(mobhook && mobhook.parent != to_hook)
QDEL_NULL(mobhook)
if (!mobhook)
- mobhook = user.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, .proc/trigger)))
+ mobhook = to_hook.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, .proc/trigger)))
else
QDEL_NULL(mobhook)
/obj/item/twohanded/rcl/proc/trigger(mob/user)
+ if(active)
+ layCable(user)
+ if(wiring_gui_menu) //update the wire options as you move
+ wiringGuiUpdate(user)
+
+
+//previous contents of trigger(), lays cable each time the player moves
+/obj/item/twohanded/rcl/proc/layCable(mob/user)
if(!isturf(user.loc))
return
if(is_empty(user, 0))
@@ -156,7 +183,7 @@
if(prob(2) && ghetto) //Give ghetto RCLs a 2% chance to jam, requiring it to be reactviated manually.
to_chat(user, "[src]'s wires jam!")
- setActive(FALSE, user)
+ active = FALSE
return
else
if(last)
@@ -179,6 +206,91 @@
is_empty(user) //If we've run out, display message
update_icon()
+//searches the current tile for a stub cable of the same colour
+/obj/item/twohanded/rcl/proc/findLinkingCable(mob/user)
+ var/turf/T
+ if(!isturf(user.loc))
+ return
+
+ T = get_turf(user)
+ if(T.intact || !T.can_have_cabling())
+ return
+
+ for(var/obj/structure/cable/C in T)
+ if(!C)
+ continue
+ if(C.cable_color != GLOB.cable_colors[colors[current_color_index]])
+ continue
+ if(C.d1 == 0)
+ return C
+ break
+ return
+
+
+/obj/item/twohanded/rcl/proc/wiringGuiGenerateChoices(mob/user)
+ var/fromdir = 0
+ var/obj/structure/cable/linkingCable = findLinkingCable(user)
+ if(linkingCable)
+ fromdir = linkingCable.d2
+
+ var/list/wiredirs = list("1","5","4","6","2","10","8","9")
+ for(var/icondir in wiredirs)
+ var/dirnum = text2num(icondir)
+ var/cablesuffix = "[min(fromdir,dirnum)]-[max(fromdir,dirnum)]"
+ if(fromdir == dirnum) //cables can't loop back on themselves
+ cablesuffix = "invalid"
+ var/image/img = image(icon = 'icons/mob/radial.dmi', icon_state = "cable_[cablesuffix]")
+ img.color = GLOB.cable_colors[colors[current_color_index]]
+ wiredirs[icondir] = img
+ return wiredirs
+
+/obj/item/twohanded/rcl/proc/showWiringGui(mob/user)
+ var/list/choices = wiringGuiGenerateChoices(user)
+
+ wiring_gui_menu = show_radial_menu_persistent(user, src , choices, select_proc = CALLBACK(src, .proc/wiringGuiReact, user), radius = 42)
+
+/obj/item/twohanded/rcl/proc/wiringGuiUpdate(mob/user)
+ if(!wiring_gui_menu)
+ return
+
+ wiring_gui_menu.entry_animation = FALSE //stop the open anim from playing each time we update
+ var/list/choices = wiringGuiGenerateChoices(user)
+
+ wiring_gui_menu.change_choices(choices,FALSE)
+
+
+//Callback used to respond to interactions with the wiring menu
+/obj/item/twohanded/rcl/proc/wiringGuiReact(mob/living/user,choice)
+ if(!choice) //close on a null choice (the center button)
+ QDEL_NULL(wiring_gui_menu)
+ return
+
+ choice = text2num(choice)
+
+ if(!isturf(user.loc))
+ return
+ if(is_empty(user, 0))
+ to_chat(user, "\The [src] is empty!")
+ return
+
+ var/turf/T = get_turf(user)
+ if(T.intact || !T.can_have_cabling())
+ return
+
+ loaded.item_color = colors[current_color_index]
+
+ var/obj/structure/cable/linkingCable = findLinkingCable(user)
+ if(linkingCable)
+ if(choice != linkingCable.d2)
+ loaded.cable_join(linkingCable, user, FALSE, choice)
+ last = null
+ else
+ last = loaded.place_turf(get_turf(src), user, choice)
+
+ is_empty(user) //If we've run out, display message
+
+ wiringGuiUpdate(user)
+
/obj/item/twohanded/rcl/pre_loaded/Initialize() //Comes preloaded with cable, for testing stuff
. = ..()
@@ -192,12 +304,22 @@
update_icon()
/obj/item/twohanded/rcl/ui_action_click(mob/user, action)
- if(istype(action, /datum/action/item_action/rcl))
+ if(istype(action, /datum/action/item_action/rcl_col))
current_color_index++;
if (current_color_index > colors.len)
current_color_index = 1
var/cwname = colors[current_color_index]
to_chat(user, "Color changed to [cwname]!")
+ if(loaded)
+ loaded.item_color= colors[current_color_index]
+ update_icon()
+ if(wiring_gui_menu)
+ wiringGuiUpdate(user)
+ else if(istype(action, /datum/action/item_action/rcl_gui))
+ if(wiring_gui_menu) //The menu is already open, close it
+ QDEL_NULL(wiring_gui_menu)
+ else //open the menu
+ showWiringGui(user)
/obj/item/twohanded/rcl/ghetto
actions_types = list()
@@ -207,13 +329,29 @@
/obj/item/twohanded/rcl/ghetto/update_icon()
if(!loaded)
- icon_state = "rclg-0"
+ icon_state = "rclg-empty"
item_state = "rclg-0"
return
+ cut_overlays()
+ var/cable_amount = 0
switch(loaded.amount)
- if(1 to INFINITY)
- icon_state = "rclg-1"
- item_state = "rcl"
+ if(20 to INFINITY)
+ cable_amount = 3
+ if(10 to 19)
+ cable_amount = 2
+ if(1 to 9)
+ cable_amount = 1
else
- icon_state = "rclg-1"
- item_state = "rclg-1"
+ cable_amount = 0
+
+ var/mutable_appearance/cable_overlay = mutable_appearance(icon, "rcl-[cable_amount]")
+ cable_overlay.color = GLOB.cable_colors[colors[current_color_index]]
+ if(cable_amount >= 1)
+ icon_state = "rclg"
+ item_state = "rclg"
+ add_overlay(cable_overlay)
+ else
+ icon_state = "rclg-empty"
+ item_state = "rclg-0"
+ add_overlay(cable_overlay)
+
diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm
index 41ddc22106..1dbdb4efe0 100644
--- a/code/game/objects/items/RPD.dm
+++ b/code/game/objects/items/RPD.dm
@@ -233,6 +233,10 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
playsound(get_turf(user), 'sound/items/deconstruct.ogg', 50, 1)
return(BRUTELOSS)
+/obj/item/pipe_dispenser/ui_base_html(html)
+ var/datum/asset/spritesheet/assets = get_asset_datum(/datum/asset/spritesheet/pipes)
+ . = replacetext(html, "", assets.css_tag())
+
/obj/item/pipe_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -331,7 +335,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
//make sure what we're clicking is valid for the current category
var/static/list/make_pipe_whitelist
if(!make_pipe_whitelist)
- make_pipe_whitelist = typecacheof(list(/obj/structure/lattice, /obj/structure/girder, /obj/item/pipe))
+ make_pipe_whitelist = typecacheof(list(/obj/structure/lattice, /obj/structure/girder, /obj/item/pipe, /obj/structure/window, /obj/structure/grille))
var/can_make_pipe = (isturf(A) || is_type_in_typecache(A, make_pipe_whitelist))
. = FALSE
@@ -431,6 +435,10 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
to_chat(user, "You start building a transit tube...")
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, transit_build_speed, target = A))
+ for(var/obj/structure/c_transit_tube/tube in A)
+ if(tube.dir == queued_p_dir || (queued_p_flipped && (tube.dir == turn(queued_p_dir, 45))))
+ to_chat(user, "[src]'s error light flickers; there's already a pipe in the way!")
+ return
activate()
if(queued_p_type == /obj/structure/c_transit_tube_pod)
var/obj/structure/c_transit_tube_pod/pod = new /obj/structure/c_transit_tube_pod(A)
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index ab877ff97a..699efaac2e 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -59,7 +59,7 @@
/obj/item/areaeditor/blueprints/attack_self(mob/user)
. = ..()
if(!legend)
- var/area/A = get_area()
+ var/area/A = get_area(user)
if(get_area_type() == AREA_STATION)
. += "According to \the [src], you are now in \"[html_encode(A.name)]\".
"
. += "Change area name
"
@@ -140,12 +140,10 @@
legend = FALSE
-/obj/item/areaeditor/proc/get_area()
- var/turf/T = get_turf(usr)
- var/area/A = T.loc
- return A
-/obj/item/areaeditor/proc/get_area_type(area/A = get_area())
+/obj/item/areaeditor/proc/get_area_type(area/A)
+ if(!A)
+ A = get_area(usr)
if(A.outdoors)
return AREA_SPACE
var/list/SPECIALS = list(
@@ -183,7 +181,7 @@
return ""
/obj/item/areaeditor/proc/edit_area()
- var/area/A = get_area()
+ var/area/A = get_area(usr)
var/prevname = "[A.name]"
var/str = stripped_input(usr,"New area name:", "Area Creation", "", MAX_NAME_LEN)
if(!str || !length(str) || str==prevname) //cancel
diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm
index a8f5894b7c..80fc0f43fd 100644
--- a/code/game/objects/items/body_egg.dm
+++ b/code/game/objects/items/body_egg.dm
@@ -16,7 +16,7 @@
/obj/item/organ/body_egg/Insert(var/mob/living/carbon/M, special = 0)
..()
- owner.add_trait(TRAIT_XENO_HOST, TRAIT_GENERIC)
+ ADD_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC)
START_PROCESSING(SSobj, src)
owner.med_hud_set_status()
INVOKE_ASYNC(src, .proc/AddInfectionImages, owner)
@@ -24,7 +24,7 @@
/obj/item/organ/body_egg/Remove(var/mob/living/carbon/M, special = 0)
STOP_PROCESSING(SSobj, src)
if(owner)
- owner.remove_trait(TRAIT_XENO_HOST, TRAIT_GENERIC)
+ REMOVE_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC)
owner.med_hud_set_status()
INVOKE_ASYNC(src, .proc/RemoveInfectionImages, owner)
..()
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 30b1ca3399..96bbe759ca 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -105,7 +105,7 @@
if(isturf(A))
return
- if(istype(A,/obj/item/storage/lockbox))
+ if(istype(A,/obj/item/storage/lockbox) || istype(A, /obj/item/storage/pod))
A.emag_act(user)
uses = max(uses - 1, 0)
if(!uses)
diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm
index f7c37715aa..5db5aa416e 100644
--- a/code/game/objects/items/chrono_eraser.dm
+++ b/code/game/objects/items/chrono_eraser.dm
@@ -48,7 +48,7 @@
icon_state = "chronogun"
item_state = "chronogun"
w_class = WEIGHT_CLASS_NORMAL
- item_flags = NODROP | DROPDEL
+ item_flags = DROPDEL
ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam)
can_charge = 0
fire_delay = 50
@@ -58,6 +58,7 @@
/obj/item/gun/energy/chrono_gun/Initialize()
. = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, CHRONO_GUN_TRAIT)
if(istype(loc, /obj/item/chrono_eraser))
TED = loc
else //admin must have spawned it
@@ -150,8 +151,8 @@
gun = loc
. = ..()
-
-
+
+
/obj/effect/chrono_field
@@ -248,9 +249,8 @@
/obj/effect/chrono_field/return_air() //we always have nominal air and temperature
var/datum/gas_mixture/GM = new
- GM.add_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
- GM.gases[/datum/gas/oxygen][MOLES] = MOLES_O2STANDARD
- GM.gases[/datum/gas/nitrogen][MOLES] = MOLES_N2STANDARD
+ GM.gases[/datum/gas/oxygen] = MOLES_O2STANDARD
+ GM.gases[/datum/gas/nitrogen] = MOLES_N2STANDARD
GM.temperature = T20C
return GM
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 1ad7974fc1..000c52ae43 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -102,7 +102,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_state = "cigoff"
throw_speed = 0.5
item_state = "cigoff"
- container_type = INJECTABLE
w_class = WEIGHT_CLASS_TINY
body_parts_covered = null
grind_results = list()
@@ -123,8 +122,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/Initialize()
. = ..()
- create_reagents(chem_volume)
- reagents.set_reacting(FALSE) // so it doesn't react until you light it
+ create_reagents(chem_volume, INJECTABLE | NO_REACT) // so it doesn't react until you light it
if(list_reagents)
reagents.add_reagent_list(list_reagents)
if(starts_lit)
@@ -184,7 +182,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
qdel(src)
return
// allowing reagents to react after being lit
- reagents.set_reacting(TRUE)
+ DISABLE_BITFIELD(reagents.reagents_holder_flags, NO_REACT)
reagents.handle_reactions()
icon_state = icon_on
item_state = icon_on
@@ -325,7 +323,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
list_reagents = list("space_drugs" = 15, "lipolicide" = 35)
/obj/item/clothing/mask/cigarette/rollie/mindbreaker
- list_reagents = list("mindbreaker" = 35, "lipolicide" = 15)
+ list_reagents = list("mindbreaker" = 35, "lipolicide" = 15)
/obj/item/cigbutt/roach
name = "roach"
@@ -709,9 +707,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
item_state = null
w_class = WEIGHT_CLASS_TINY
var/chem_volume = 100
- var/vapetime = 0 //this so it won't puff out clouds every tick
- var/screw = 0 // kinky
- var/super = 0 //for the fattest vapes dude.
+ var/vapetime = FALSE //this so it won't puff out clouds every tick
+ var/screw = FALSE // kinky
+ var/super = FALSE //for the fattest vapes dude.
/obj/item/clothing/mask/vape/suicide_act(mob/user)
user.visible_message("[user] is puffin hard on dat vape, [user.p_they()] trying to join the vape life on a whole notha plane!")//it doesn't give you cancer, it is cancer
@@ -720,8 +718,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/vape/Initialize(mapload, param_color)
. = ..()
- create_reagents(chem_volume)
- reagents.set_reacting(FALSE) // so it doesn't react until you light it
+ create_reagents(chem_volume, NO_REACT) // so it doesn't react until you light it
reagents.add_reagent("nicotine", 50)
if(!icon_state)
if(!param_color)
@@ -730,52 +727,48 @@ CIGARETTE PACKETS ARE IN FANCY.DM
item_state = "[param_color]_vape"
/obj/item/clothing/mask/vape/attackby(obj/item/O, mob/user, params)
- if(O.is_drainable())
- if(reagents.total_volume < chem_volume)
- if(O.reagents.total_volume > 0)
- O.reagents.trans_to(src,25)
- to_chat(user, "You add the contents of [O] to [src].")
- else
- to_chat(user, "[O] is empty!")
- else
- to_chat(user, "[src] can't hold anymore reagents!")
-
- if(istype(O, /obj/item/screwdriver))
+ if(O.tool_behaviour == TOOL_SCREWDRIVER)
if(!screw)
- screw = 1
+ screw = TRUE
to_chat(user, "You open the cap on [src].")
- if(super)
+ ENABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER)
+ if(obj_flags & EMAGGED)
+ add_overlay("vapeopen_high")
+ else if(super)
add_overlay("vapeopen_med")
else
add_overlay("vapeopen_low")
else
- screw = 0
+ screw = FALSE
to_chat(user, "You close the cap on [src].")
+ DISABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER)
cut_overlays()
- if(istype(O, /obj/item/multitool))
+ if(O.tool_behaviour == TOOL_MULTITOOL)
if(screw && !(obj_flags & EMAGGED))//also kinky
if(!super)
cut_overlays()
- super = 1
+ super = TRUE
to_chat(user, "You increase the voltage of [src].")
add_overlay("vapeopen_med")
else
cut_overlays()
- super = 0
+ super = FALSE
to_chat(user, "You decrease the voltage of [src].")
add_overlay("vapeopen_low")
if(screw && (obj_flags & EMAGGED))
to_chat(user, "[src] can't be modified!")
+ else
+ ..()
/obj/item/clothing/mask/vape/emag_act(mob/user)// I WON'T REGRET WRITTING THIS, SURLY.
if(screw)
if(!(obj_flags & EMAGGED))
cut_overlays()
obj_flags |= EMAGGED
- super = 0
+ super = FALSE
to_chat(user, "You maximize the voltage of [src].")
add_overlay("vapeopen_high")
var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread //for effect
@@ -790,13 +783,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(reagents.total_volume > 0)
to_chat(user, "You empty [src] of all reagents.")
reagents.clear_reagents()
- return
/obj/item/clothing/mask/vape/equipped(mob/user, slot)
if(slot == SLOT_WEAR_MASK)
if(!screw)
to_chat(user, "You start puffing on the vape.")
- reagents.set_reacting(TRUE)
+ DISABLE_BITFIELD(reagents.reagents_holder_flags, NO_REACT)
START_PROCESSING(SSobj, src)
else //it will not start if the vape is opened.
to_chat(user, "You need to close the cap first!")
@@ -804,7 +796,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/vape/dropped(mob/user)
var/mob/living/carbon/C = user
if(C.get_item_by_slot(SLOT_WEAR_MASK) == src)
- reagents.set_reacting(FALSE)
+ ENABLE_BITFIELD(reagents.reagents_holder_flags, NO_REACT)
STOP_PROCESSING(SSobj, src)
/obj/item/clothing/mask/vape/proc/hand_reagents()//had to rename to avoid duplicate error
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index 26f00c730e..7d2ffe0a02 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -110,6 +110,7 @@
/obj/item/circuitboard/computer/cloning
name = "Cloning (Computer Board)"
build_path = /obj/machinery/computer/cloning
+ var/list/records = list()
/obj/item/circuitboard/computer/prototype_cloning
name = "Prototype Cloning (Computer Board)"
@@ -123,6 +124,14 @@
name = "Orion Trail (Computer Board)"
build_path = /obj/machinery/computer/arcade/orion_trail
+/obj/item/circuitboard/computer/arcade/minesweeper
+ name = "Minesweeper (Computer Board)"
+ build_path = /obj/machinery/computer/arcade/minesweeper
+
+/obj/item/circuitboard/computer/arcade/amputation
+ name = "Mediborg's Amputation Adventure (Computer Board)"
+ build_path = /obj/machinery/computer/arcade/amputation
+
/obj/item/circuitboard/computer/turbine_control
name = "Turbine control (Computer Board)"
build_path = /obj/machinery/computer/turbine_computer
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 26f8a73cb3..99d6c874e8 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -68,6 +68,8 @@
var/pre_noise = FALSE
var/post_noise = FALSE
+ var/datum/team/gang/gang //For marking territory.
+ var/gang_tag_delay = 30 //this is the delay for gang mode tag applications on anything that gang = true on.
/obj/item/toy/crayon/suicide_act(mob/user)
user.visible_message("[user] is jamming [src] up [user.p_their()] nose and into [user.p_their()] brain. It looks like [user.p_theyre()] trying to commit suicide!")
@@ -252,7 +254,7 @@
cost = 0
if(ishuman(user))
var/mob/living/carbon/human/H = user
- if (H.has_trait(TRAIT_TAGGER))
+ if (HAS_TRAIT(H, TRAIT_TAGGER))
cost *= 0.5
var/charges_used = use_charges(user, cost)
if(!charges_used)
@@ -288,6 +290,13 @@
else if(drawing in numerals)
temp = "number"
+ // If a gang member is using a gang spraycan, it'll behave differently
+ var/gang_mode = FALSE
+ if(gang && user.mind && user.mind.has_antag_datum(/datum/antagonist/gang)) //Heres a check.
+ gang_mode = TRUE // No more runtimes if a non-gang member sprays a gang can, it just works like normal cans.
+ // discontinue if the area isn't valid for tagging because gang "honour"
+ if(gang_mode && (!can_claim_for_gang(user, target)))
+ return
var/graf_rot
if(drawing in oriented)
@@ -310,20 +319,22 @@
clicky = CLAMP(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2)
if(!instant)
- to_chat(user, "You start drawing a [temp] on the [target.name]...")
+ to_chat(user, "You start drawing a [temp] on the [target.name]...")
if(pre_noise)
audible_message("You hear spraying.")
playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5)
- var/takes_time = !instant
+ var/takes_time = !instant //For order purposes, since I'm maximum bad.
+ if(gang_mode)
+ takes_time = TRUE
var/wait_time = 50
if(paint_mode == PAINT_LARGE_HORIZONTAL)
wait_time *= 3
- if(takes_time)
- if(!do_after(user, 50, target = target))
+ if(takes_time) //This is what deteremines the time it takes to spray a tag in gang mode. 50 is Default.
+ if(!do_after(user, gang_tag_delay, target = target)) //25 is a good number, but we have gang_tag_delay var now.
return
if(length(text_buffer))
@@ -332,26 +343,34 @@
var/list/turf/affected_turfs = list()
+
if(actually_paints)
- switch(paint_mode)
- if(PAINT_NORMAL)
- var/obj/effect/decal/cleanable/crayon/C = new(target, paint_color, drawing, temp, graf_rot)
- C.add_hiddenprint(user)
- C.pixel_x = clickx
- C.pixel_y = clicky
- affected_turfs += target
- if(PAINT_LARGE_HORIZONTAL)
- var/turf/left = locate(target.x-1,target.y,target.z)
- var/turf/right = locate(target.x+1,target.y,target.z)
- if(is_type_in_list(left, validSurfaces) && is_type_in_list(right, validSurfaces))
- var/obj/effect/decal/cleanable/crayon/C = new(left, paint_color, drawing, temp, graf_rot, PAINT_LARGE_HORIZONTAL_ICON)
+ if(gang_mode)
+ // Double check it wasn't tagged in the meanwhile.
+ if(!can_claim_for_gang(user, target))
+ return
+ tag_for_gang(user, target)
+ affected_turfs += target
+ else
+ switch(paint_mode)
+ if(PAINT_NORMAL)
+ var/obj/effect/decal/cleanable/crayon/C = new(target, paint_color, drawing, temp, graf_rot)
C.add_hiddenprint(user)
- affected_turfs += left
- affected_turfs += right
+ C.pixel_x = clickx
+ C.pixel_y = clicky
affected_turfs += target
- else
- to_chat(user, "There isn't enough space to paint!")
- return
+ if(PAINT_LARGE_HORIZONTAL)
+ var/turf/left = locate(target.x-1,target.y,target.z)
+ var/turf/right = locate(target.x+1,target.y,target.z)
+ if(is_type_in_list(left, validSurfaces) && is_type_in_list(right, validSurfaces))
+ var/obj/effect/decal/cleanable/crayon/C = new(left, paint_color, drawing, temp, graf_rot, PAINT_LARGE_HORIZONTAL_ICON)
+ C.add_hiddenprint(user)
+ affected_turfs += left
+ affected_turfs += right
+ affected_turfs += target
+ else
+ to_chat(user, "There isn't enough space to paint!")
+ return
if(!instant)
to_chat(user, "You finish drawing \the [temp].")
@@ -373,6 +392,52 @@
reagents.trans_to(t, ., volume_multiplier)
check_empty(user)
+
+//////////////Gang mode stuff/////////////////
+/obj/item/toy/crayon/proc/can_claim_for_gang(mob/user, atom/target)
+ // Check area validity.
+ // Reject space, player-created areas, and non-station z-levels.
+ var/area/A = get_area(target)
+ if(!A || (!is_station_level(A.z)) || !A.valid_territory)
+ to_chat(user, "[A] is unsuitable for tagging.")
+ return FALSE
+
+ var/spraying_over = FALSE
+ for(var/G in target)
+ var/obj/effect/decal/cleanable/crayon/gang/gangtag = G
+ if(istype(gangtag))
+ var/datum/antagonist/gang/GA = user.mind.has_antag_datum(/datum/antagonist/gang)
+ if(gangtag.gang != GA.gang)
+ spraying_over = TRUE
+ break
+
+ var/occupying_gang = territory_claimed(A, user)
+ if(occupying_gang && !spraying_over)
+ to_chat(user, "[A] has already been tagged by the [occupying_gang] gang! You must get rid of or spray over the old tag first!")
+ return FALSE
+
+ // If you pass the gauntlet of checks, you're good to proceed
+ return TRUE
+
+/obj/item/toy/crayon/proc/territory_claimed(area/territory, mob/user)
+ for(var/datum/team/gang/G in GLOB.gangs)
+ if(territory.type in (G.territories|G.new_territories))
+ . = G.name
+ break
+
+/obj/item/toy/crayon/proc/tag_for_gang(mob/user, atom/target)
+ //Delete any old markings on this tile, including other gang tags
+ for(var/obj/effect/decal/cleanable/crayon/old_marking in target)
+ qdel(old_marking)
+
+ var/datum/antagonist/gang/G = user.mind.has_antag_datum(/datum/antagonist/gang)
+ var/area/territory = get_area(target)
+
+ new /obj/effect/decal/cleanable/crayon/gang(target,G.gang,"graffiti",0,user) // Heres the gang tag.
+ to_chat(user, "You tagged [territory] for your gang!")
+/////////////////Gang end////////////////////
+
+
/obj/item/toy/crayon/attack(mob/M, mob/user)
if(edible && (M == user))
to_chat(user, "You take a bite of the [src.name]. Delicious!")
@@ -524,6 +589,7 @@
is_capped = TRUE
self_contained = FALSE // Don't disappear when they're empty
can_change_colour = TRUE
+ gang = TRUE //Gang check is true for all things upon the honored hierarchy of spraycans, except those that are FALSE.
validSurfaces = list(/turf/open/floor, /turf/closed/wall)
reagent_contents = list("welding_fuel" = 1, "ethanol" = 1)
@@ -669,6 +735,7 @@
icon_capped = "deathcan2_cap"
icon_uncapped = "deathcan2"
use_overlays = FALSE
+ gang = FALSE
volume_multiplier = 25
charges = 100
@@ -683,6 +750,7 @@
icon_capped = "clowncan2_cap"
icon_uncapped = "clowncan2"
use_overlays = FALSE
+ gang = FALSE
reagent_contents = list("lube" = 1, "banana" = 1)
volume_multiplier = 5
@@ -695,6 +763,7 @@
icon_capped = "mimecan_cap"
icon_uncapped = "mimecan"
use_overlays = FALSE
+ gang = FALSE
can_change_colour = FALSE
paint_color = "#FFFFFF" //RGB
@@ -703,6 +772,26 @@
post_noise = FALSE
reagent_contents = list("nothing" = 1, "mutetoxin" = 1)
+/obj/item/toy/crayon/spraycan/gang
+ charges = 20 // Charges back to 20, which is the default value for them.
+ gang = TRUE
+ gang_tag_delay = 15 //Its 50% faster than a regular spraycan, for tagging. After-all they did spend points/meet the boss.
+
+ pre_noise = FALSE
+ post_noise = TRUE // Its even more stealthy just a tad.
+
+/obj/item/toy/crayon/spraycan/gang/Initialize(loc, datum/team/gang/G)
+ ..()
+ if(G)
+ gang = G
+ paint_color = G.color
+ update_icon()
+
+/obj/item/toy/crayon/spraycan/gang/examine(mob/user)
+ . = ..()
+ if(user.mind && user.mind.has_antag_datum(/datum/antagonist/gang) || isobserver(user))
+ to_chat(user, "This spraycan has been specially modified with a stage 2 nozzle kit, making it faster.")
+
#undef RANDOM_GRAFFITI
#undef RANDOM_LETTER
#undef RANDOM_NUMBER
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index ba4a0ffae8..55e75b3992 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -444,7 +444,7 @@
/obj/item/twohanded/shockpaddles/proc/can_defib(mob/living/carbon/H)
var/obj/item/organ/brain/BR = H.getorgan(/obj/item/organ/brain)
- return (!H.suiciding && !(H.has_trait(TRAIT_NOCLONE)) && !H.hellbound && ((world.time - H.timeofdeath) < tlimit) && (H.getBruteLoss() < 180) && (H.getFireLoss() < 180) && H.getorgan(/obj/item/organ/heart) && BR && !BR.damaged_brain)
+ return (!H.suiciding && !(HAS_TRAIT(H, TRAIT_NOCLONE)) && !H.hellbound && ((world.time - H.timeofdeath) < tlimit) && (H.getBruteLoss() < 180) && (H.getFireLoss() < 180) && H.getorgan(/obj/item/organ/heart) && BR && !BR.damaged_brain)
/obj/item/twohanded/shockpaddles/proc/shock_touching(dmg, mob/H)
if(req_defib)
@@ -585,7 +585,7 @@
shock_touching(30, H)
var/failed
- if (H.suiciding || (H.has_trait(TRAIT_NOCLONE)))
+ if (H.suiciding || (HAS_TRAIT(H, TRAIT_NOCLONE)))
failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Recovery of patient impossible. Further attempts futile."
else if (H.hellbound)
failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's soul appears to be on another plane of existence. Further attempts futile."
diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm
index 29f0cf27f9..55d1a2c78a 100644
--- a/code/game/objects/items/dehy_carp.dm
+++ b/code/game/objects/items/dehy_carp.dm
@@ -19,6 +19,9 @@
else
return ..()
+/obj/item/toy/plush/carpplushie/dehy_carp/plop(obj/item/toy/plush/Daddy)
+ return FALSE
+
/obj/item/toy/plush/carpplushie/dehy_carp/proc/Swell()
desc = "It's growing!"
visible_message("[src] swells up!")
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 7d3d36c5b2..45baa542d4 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -10,11 +10,20 @@ GLOBAL_LIST_EMPTY(PDAs)
#define PDA_SCANNER_HALOGEN 4
#define PDA_SCANNER_GAS 5
#define PDA_SPAM_DELAY 2 MINUTES
+#define PDA_STANDARD_OVERLAYS list("pda-r", "blank", "id_overlay", "insert_overlay", "light_overlay", "pai_overlay")
+
+//pda icon overlays list defines
+#define PDA_OVERLAY_ALERT 1
+#define PDA_OVERLAY_SCREEN 2
+#define PDA_OVERLAY_ID 3
+#define PDA_OVERLAY_ITEM 4
+#define PDA_OVERLAY_LIGHT 5
+#define PDA_OVERLAY_PAI 6
/obj/item/pda
name = "\improper PDA"
desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
- icon = 'icons/obj/pda.dmi'
+ icon = 'icons/obj/pda_alt.dmi'
icon_state = "pda"
item_state = "electronic"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
@@ -31,7 +40,8 @@ GLOBAL_LIST_EMPTY(PDAs)
var/default_cartridge = 0 // Access level defined by cartridge
var/obj/item/cartridge/cartridge = null //current cartridge
var/mode = 0 //Controls what menu the PDA will display. 0 is hub; the rest are either built in or based on cartridge.
- var/icon_alert = "pda-r" //Icon to be overlayed for message alerts. Taken from the pda icon file.
+ var/list/overlays_icons = list('icons/obj/pda_alt.dmi' = list("pda-r", "screen_default", "id_overlay", "insert_overlay", "light_overlay", "pai_overlay"))
+ var/current_overlays = PDA_STANDARD_OVERLAYS
var/font_index = 0 //This int tells DM which font is currently selected and lets DM know when the last font has been selected so that it can cycle back to the first font when "toggle font" is pressed again.
var/font_mode = "font-family:monospace;" //The currently selected font.
var/background_color = "#808000" //The currently selected background color.
@@ -58,7 +68,6 @@ GLOBAL_LIST_EMPTY(PDAs)
var/last_everyone //No text for everyone spamming
var/last_noise //Also no honk spamming that's bad too
var/ttone = "beep" //The ringtone!
- var/lock_code = "" // Lockcode to unlock uplink
var/honkamt = 0 //How many honks left when infected with honk.exe
var/mimeamt = 0 //How many silence left when infected with mime.exe
var/note = "Congratulations, your station has chosen the Thinktronic 5230 Personal Data Assistant! To help with navigation, we have provided the following definitions. North: Fore. South: Aft. West: Port. East: Starboard. Quarter is either side of aft." //Current note in the notepad function
@@ -78,7 +87,9 @@ GLOBAL_LIST_EMPTY(PDAs)
var/list/contained_item = list(/obj/item/pen, /obj/item/toy/crayon, /obj/item/lipstick, /obj/item/flashlight/pen, /obj/item/clothing/mask/cigarette)
var/obj/item/inserted_item //Used for pen, crayon, and lipstick insertion or removal. Same as above.
- var/overlays_x_offset = 0 //x offset to use for certain overlays
+ var/list/overlays_offsets // offsets to use for certain overlays
+ var/overlays_x_offset = 0
+ var/overlays_y_offset = 0
var/underline_flag = TRUE //flag for underline
@@ -91,15 +102,13 @@ GLOBAL_LIST_EMPTY(PDAs)
return BRUTELOSS
/obj/item/pda/examine(mob/user)
- ..()
- if(!id && !inserted_item)
- return
-
- if(id)
- to_chat(user, "Alt-click to remove the id.")
-
+ . = ..()
+ var/dat = id ? "Alt-click to remove the id." : ""
if(inserted_item && (!isturf(loc)))
- to_chat(user, "Ctrl-click to remove [inserted_item].")
+ dat += "\nCtrl-click to remove [inserted_item]."
+ if(LAZYLEN(GLOB.pda_reskins))
+ dat += "\nCtrl-shift-click it to reskin it."
+ to_chat(user, dat)
/obj/item/pda/Initialize()
. = ..()
@@ -113,30 +122,71 @@ GLOBAL_LIST_EMPTY(PDAs)
inserted_item = new inserted_item(src)
else
inserted_item = new /obj/item/pen(src)
- update_icon()
+ update_icon(FALSE, TRUE)
+
+/obj/item/pda/CtrlShiftClick(mob/living/user)
+ . = ..()
+ if(GLOB.pda_reskins && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
+ reskin_obj(user)
+
+/obj/item/pda/reskin_obj(mob/M)
+ if(!LAZYLEN(GLOB.pda_reskins))
+ return
+ var/dat = "Reskin options for [name]:"
+ for(var/V in GLOB.pda_reskins)
+ var/output = icon2html(GLOB.pda_reskins[V], M, icon_state)
+ dat += "\n[V]: [output]"
+ to_chat(M, dat)
+
+ var/choice = input(M, "Choose the a reskin for [src]","Reskin Object") as null|anything in GLOB.pda_reskins
+ var/new_icon = GLOB.pda_reskins[choice]
+ if(QDELETED(src) || isnull(new_icon) || new_icon == icon || M.incapacitated() || !in_range(M,src))
+ return
+ icon = new_icon
+ update_icon(FALSE, TRUE)
+ to_chat(M, "[src] is now skinned as '[choice]'.")
+
+/obj/item/pda/proc/set_new_overlays()
+ if(!overlays_offsets || !(icon in overlays_offsets))
+ overlays_x_offset = 0
+ overlays_y_offset = 0
+ else
+ var/list/new_offsets = overlays_offsets[icon]
+ if(new_offsets)
+ overlays_x_offset = new_offsets[1]
+ overlays_y_offset = new_offsets[2]
+ if(!(icon in overlays_icons))
+ current_overlays = PDA_STANDARD_OVERLAYS
+ return
+ current_overlays = overlays_icons[icon]
/obj/item/pda/equipped(mob/user, slot)
. = ..()
- if(!equipped)
- if(user.client)
- background_color = user.client.prefs.pda_color
- switch(user.client.prefs.pda_style)
- if(MONO)
- font_index = MODE_MONO
- font_mode = FONT_MONO
- if(SHARE)
- font_index = MODE_SHARE
- font_mode = FONT_SHARE
- if(ORBITRON)
- font_index = MODE_ORBITRON
- font_mode = FONT_ORBITRON
- if(VT)
- font_index = MODE_VT
- font_mode = FONT_VT
- else
- font_index = MODE_MONO
- font_mode = FONT_MONO
- equipped = TRUE
+ if(equipped)
+ return
+ if(user.client)
+ background_color = user.client.prefs.pda_color
+ switch(user.client.prefs.pda_style)
+ if(MONO)
+ font_index = MODE_MONO
+ font_mode = FONT_MONO
+ if(SHARE)
+ font_index = MODE_SHARE
+ font_mode = FONT_SHARE
+ if(ORBITRON)
+ font_index = MODE_ORBITRON
+ font_mode = FONT_ORBITRON
+ if(VT)
+ font_index = MODE_VT
+ font_mode = FONT_VT
+ else
+ font_index = MODE_MONO
+ font_mode = FONT_MONO
+ var/pref_skin = GLOB.pda_reskins[user.client.prefs.pda_skin]
+ if(icon != pref_skin)
+ icon = pref_skin
+ update_icon(FALSE, TRUE)
+ equipped = TRUE
/obj/item/pda/proc/update_label()
name = "PDA-[owner] ([ownjob])" //Name generalisation
@@ -150,33 +200,36 @@ GLOBAL_LIST_EMPTY(PDAs)
/obj/item/pda/GetID()
return id
-/obj/item/pda/update_icon()
+/obj/item/pda/update_icon(alert = FALSE, new_overlays = FALSE)
+ if(new_overlays)
+ set_new_overlays()
cut_overlays()
+ add_overlay(alert ? current_overlays[PDA_OVERLAY_ALERT] : current_overlays[PDA_OVERLAY_SCREEN])
var/mutable_appearance/overlay = new()
overlay.pixel_x = overlays_x_offset
if(id)
- overlay.icon_state = "id_overlay"
+ overlay.icon_state = current_overlays[PDA_OVERLAY_ID]
add_overlay(new /mutable_appearance(overlay))
if(inserted_item)
- overlay.icon_state = "insert_overlay"
+ overlay.icon_state = current_overlays[PDA_OVERLAY_ITEM]
add_overlay(new /mutable_appearance(overlay))
if(fon)
- overlay.icon_state = "light_overlay"
+ overlay.icon_state = current_overlays[PDA_OVERLAY_LIGHT]
add_overlay(new /mutable_appearance(overlay))
if(pai)
- if(pai.pai)
- overlay.icon_state = "pai_overlay"
- add_overlay(new /mutable_appearance(overlay))
- else
- overlay.icon_state = "pai_off_overlay"
- add_overlay(new /mutable_appearance(overlay))
+ overlay.icon_state = "[current_overlays[PDA_OVERLAY_PAI]][pai.pai ? "" : "_off"]"
+ add_overlay(new /mutable_appearance(overlay))
-/obj/item/pda/MouseDrop(obj/over_object, src_location, over_location)
+/obj/item/pda/MouseDrop(mob/over, src_location, over_location)
var/mob/M = usr
- if((!istype(over_object, /obj/screen)) && usr.canUseTopic(src))
+ if((M == over) && usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return attack_self(M)
return ..()
+/obj/item/pda/attack_self_tk(mob/user)
+ to_chat(user, "The PDA's capacitive touch screen doesn't seem to respond!")
+ return
+
/obj/item/pda/interact(mob/user)
if(!user.IsAdvancedToolUser())
to_chat(user, "You don't have the dexterity to do this!")
@@ -358,9 +411,9 @@ GLOBAL_LIST_EMPTY(PDAs)
if (total_moles)
for(var/id in env_gases)
- var/gas_level = env_gases[id][MOLES]/total_moles
+ var/gas_level = env_gases[id]/total_moles
if(gas_level > 0)
- dat += "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_level*100, 0.01)]%
"
+ dat += "[GLOB.meta_gas_names[id]]: [round(gas_level*100, 0.01)]%
"
dat += "Temperature: [round(environment.temperature-T0C)]°C
"
dat += "
"
@@ -382,7 +435,7 @@ GLOBAL_LIST_EMPTY(PDAs)
var/mob/living/U = usr
//Looking for master was kind of pointless since PDAs don't appear to have one.
- if(usr.canUseTopic(src) && !href_list["close"])
+ if(usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK) && !href_list["close"])
add_fingerprint(U)
U.set_machine(src)
@@ -636,7 +689,7 @@ GLOBAL_LIST_EMPTY(PDAs)
/obj/item/pda/proc/remove_id()
- if(issilicon(usr) || !usr.canUseTopic(src, BE_CLOSE))
+ if(issilicon(usr) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
if (id)
@@ -736,8 +789,7 @@ GLOBAL_LIST_EMPTY(PDAs)
to_chat(L, "[icon2html(src)] Message from [hrefstart][signal.data["name"]] ([signal.data["job"]])[hrefend], [signal.format_message()] (Reply)")
- update_icon()
- add_overlay(icon_alert)
+ update_icon(TRUE)
/obj/item/pda/proc/send_to_all(mob/living/U)
if (last_everyone && world.time < last_everyone + PDA_SPAM_DELAY)
@@ -802,7 +854,7 @@ GLOBAL_LIST_EMPTY(PDAs)
/obj/item/pda/proc/remove_pen()
- if(issilicon(usr) || !usr.canUseTopic(src, BE_CLOSE))
+ if(issilicon(usr) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
if(inserted_item)
@@ -1076,4 +1128,11 @@ GLOBAL_LIST_EMPTY(PDAs)
#undef PDA_SCANNER_HALOGEN
#undef PDA_SCANNER_GAS
#undef PDA_SPAM_DELAY
+#undef PDA_STANDARD_OVERLAYS
+#undef PDA_OVERLAY_ALERT
+#undef PDA_OVERLAY_SCREEN
+#undef PDA_OVERLAY_ID
+#undef PDA_OVERLAY_ITEM
+#undef PDA_OVERLAY_LIGHT
+#undef PDA_OVERLAY_PAI
\ No newline at end of file
diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm
index 80d8cb5963..54b82d8e07 100644
--- a/code/game/objects/items/devices/PDA/PDA_types.dm
+++ b/code/game/objects/items/devices/PDA/PDA_types.dm
@@ -124,6 +124,16 @@
icon_state = "pda-captain"
detonatable = FALSE
+/obj/item/pda/lieutenant
+ name = "lieutenant PDA"
+ default_cartridge = /obj/item/cartridge/captain
+ inserted_item = /obj/item/pen/fountain/captain
+ icon_state = "pda-lieutenant"
+ ttone = "bwoink"
+ detonatable = FALSE
+ hidden = TRUE
+ note = "Congratulations, you have chosen the Thinktronic 5230-2 Personal Data Assistant Prestige Edition! To help with navigation, we have provided the following definitions. North: Fore. South: Aft. West: Port. East: Starboard. Quarter is either side of aft."
+
/obj/item/pda/cargo
name = "cargo technician PDA"
default_cartridge = /obj/item/cartridge/quartermaster
@@ -171,25 +181,29 @@
/obj/item/pda/curator
name = "curator PDA"
icon_state = "pda-library"
- icon_alert = "pda-r-library"
+ overlays_icons = list('icons/obj/pda.dmi' = list("pda-r-library","blank","id_overlay","insert_overlay", "light_overlay", "pai_overlay"),
+ 'icons/obj/pda_alt.dmi' = list("pda-r","screen_default","id_overlay","insert_overlay", "light_overlay", "pai_overlay"))
+ current_overlays = list("pda-r-library","blank","id_overlay","insert_overlay", "light_overlay", "pai_overlay")
default_cartridge = /obj/item/cartridge/curator
inserted_item = /obj/item/pen/fountain
desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a WGW-11 series e-reader."
- note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!"
+ note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant! To help with navigation, we have provided the following definitions. North: Fore. South: Aft. West: Port. East: Starboard. Quarter is either side of aft."
silent = TRUE //Quiet in the library!
+ overlays_offsets = list('icons/obj/pda.dmi' = list(-3,0))
overlays_x_offset = -3
/obj/item/pda/clear
name = "clear PDA"
icon_state = "pda-clear"
desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a special edition with a transparent case."
- note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition!"
+ note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition! To help with navigation, we have provided the following definitions. North: Fore. South: Aft. West: Port. East: Starboard. Quarter is either side of aft."
/obj/item/pda/neko
name = "neko PDA"
icon_state = "pda-neko"
- desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a special edition a feline fine case."
- note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Mew Turbo Limited Edition NYA~!"
+ overlays_icons = list('icons/obj/pda_alt.dmi' = list("pda-r", "screen_neko", "id_overlay", "insert_overlay", "light_overlay", "pai_overlay"))
+ desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a special feline edition."
+ note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Mew Turbo Limited Edition NYA~! To help with navigation, we have provided the following definitions. North: Fore. South: Aft. West: Port. East: Starboard. Quarter is either side of aft."
/obj/item/pda/cook
name = "cook PDA"
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index 1a733fbff2..bf352e8eb7 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -87,7 +87,7 @@
/obj/item/cartridge/detective
name = "\improper D.E.T.E.C.T. cartridge"
- icon_state = "cart-s"
+ icon_state = "cart-eye"
access = CART_SECURITY | CART_MEDICAL | CART_MANIFEST
bot_access_flags = SEC_BOT
@@ -100,23 +100,25 @@
/obj/item/cartridge/lawyer
name = "\improper P.R.O.V.E. cartridge"
- icon_state = "cart-s"
+ icon_state = "cart-law"
access = CART_SECURITY
spam_enabled = 1
/obj/item/cartridge/curator
name = "\improper Lib-Tweet cartridge"
- icon_state = "cart-s"
+ icon_state = "cart-lib"
access = CART_NEWSCASTER
/obj/item/cartridge/roboticist
name = "\improper B.O.O.P. Remote Control cartridge"
desc = "Packed with heavy duty triple-bot interlink!"
+ icon_state = "cart-robo"
bot_access_flags = FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT
access = CART_DRONEPHONE
/obj/item/cartridge/signal
name = "generic signaler cartridge"
+ icon_state = "cart-sig"
desc = "A data cartridge with an integrated radio signaler module."
/obj/item/cartridge/signal/toxins
diff --git a/code/game/objects/items/devices/PDA/virus_cart.dm b/code/game/objects/items/devices/PDA/virus_cart.dm
index 13d653a4fe..d85c5d72d8 100644
--- a/code/game/objects/items/devices/PDA/virus_cart.dm
+++ b/code/game/objects/items/devices/PDA/virus_cart.dm
@@ -53,7 +53,6 @@
/obj/item/cartridge/virus/syndicate
name = "\improper Detomatix cartridge"
- icon_state = "cart"
access = CART_REMOTE_DOOR
remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing.
charges = 4
@@ -85,7 +84,7 @@
/obj/item/cartridge/virus/frame
name = "\improper F.R.A.M.E. cartridge"
- icon_state = "cart"
+ icon_state = "cart-f"
var/telecrystals = 0
/obj/item/cartridge/virus/frame/send_virus(obj/item/pda/target, mob/living/U)
@@ -99,7 +98,7 @@
GET_COMPONENT_FROM(hidden_uplink, /datum/component/uplink, target)
if(!hidden_uplink)
hidden_uplink = target.AddComponent(/datum/component/uplink)
- target.lock_code = lock_code
+ hidden_uplink.unlock_code = lock_code
else
hidden_uplink.hidden_crystals += hidden_uplink.telecrystals //Temporarially hide the PDA's crystals, so you can't steal telecrystals.
hidden_uplink.telecrystals = telecrystals
diff --git a/code/game/objects/items/devices/compressionkit.dm b/code/game/objects/items/devices/compressionkit.dm
new file mode 100644
index 0000000000..5ac958328d
--- /dev/null
+++ b/code/game/objects/items/devices/compressionkit.dm
@@ -0,0 +1,127 @@
+/obj/item/compressionkit
+ name = "bluespace compression kit"
+ desc = "An illegally modified BSRPED, capable of reducing the size of most items."
+ icon = 'icons/obj/tools.dmi'
+ icon_state = "compression_c"
+ item_state = "RPED"
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ w_class = WEIGHT_CLASS_NORMAL
+ var/charges = 5
+ // var/damage_multiplier = 0.2 Not in use yet.
+ var/mode = 0
+
+/obj/item/compressionkit/examine(mob/user)
+ ..()
+ to_chat(user, "It has [charges] charges left. Recharge with bluespace crystals.")
+ to_chat(user, "Use in-hand to swap toggle compress/expand mode (expand mode not yet implemented).")
+
+/obj/item/compressionkit/attack_self(mob/user)
+ if(mode == 0)
+ mode = 1
+ icon_state = "compression_e"
+ to_chat(user, "You switch the compressor to expand mode. This isn't implemented yet, so right now it wont do anything different!")
+ return
+ if(mode == 1)
+ mode = 0
+ icon_state = "compression_c"
+ to_chat(user, "You switch the compressor to compress mode. Usage will now reduce the size of objects.")
+ return
+ else
+ mode = 0
+ icon_state = "compression_c"
+ to_chat(user, "Some coder cocked up or an admin broke your compressor. It's been set back to compress mode..")
+
+/obj/item/compressionkit/proc/sparks()
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
+ s.set_up(5, 1, get_turf(src))
+ s.start()
+
+/obj/item/compressionkit/suicide_act(mob/living/carbon/M)
+ M.visible_message("[M] is sticking their head in [src] and turning it on! [M.p_theyre(TRUE)] going to compress their own skull!")
+ var/obj/item/bodypart/head = M.get_bodypart("head")
+ if(!head)
+ return
+ var/turf/T = get_turf(M)
+ var/list/organs = M.getorganszone("head") + M.getorganszone("eyes") + M.getorganszone("mouth")
+ for(var/internal_organ in organs)
+ var/obj/item/organ/I = internal_organ
+ I.Remove(M)
+ I.forceMove(T)
+ head.drop_limb()
+ qdel(head)
+ new M.gib_type(T,1,M.get_static_viruses())
+ M.add_splatter_floor(T)
+ playsound(M, 'sound/weapons/flash.ogg', 50, 1)
+ playsound(M, 'sound/effects/splat.ogg', 50, 1)
+
+ return OXYLOSS
+
+/obj/item/compressionkit/afterattack(atom/target, mob/user, proximity)
+ . = ..()
+ if(!proximity || !target)
+ return
+ else
+ if(charges == 0)
+ playsound(get_turf(src), 'sound/machines/buzz-two.ogg', 50, 1)
+ to_chat(user, "The bluespace compression kit is out of charges! Recharge it with bluespace crystals.")
+ return
+ if(istype(target, /obj/item))
+ var/obj/item/O = target
+ if(O.w_class == 1)
+ playsound(get_turf(src), 'sound/machines/buzz-two.ogg', 50, 1)
+ to_chat(user, "[target] cannot be compressed smaller!.")
+ return
+ if(O.GetComponent(/datum/component/storage))
+ to_chat(user, "You feel like compressing an item that stores other items would be counterproductive.")
+ return
+ if(O.w_class > 1)
+ playsound(get_turf(src), 'sound/weapons/flash.ogg', 50, 1)
+ user.visible_message("[user] is compressing [O] with their bluespace compression kit!")
+ if(do_mob(user, O, 40) && charges > 0 && O.w_class > 1)
+ playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 50, 1)
+ sparks()
+ flash_lighting_fx(3, 3, LIGHT_COLOR_CYAN)
+ O.w_class -= 1
+ // O.force_mult -= damage_multiplier
+ charges -= 1
+ to_chat(user, "You successfully compress [target]! The compressor now has [charges] charges.")
+ else
+ to_chat(user, "Anomalous error. Summon a coder.")
+
+ if(istype(target, /mob/living))
+ var/mob/living/victim = target
+ if(istype(victim, /mob/living/carbon/human))
+ if(user.zone_selected == "groin") // pp smol. There's probably a smarter way to do this but im retarded. If you have a simpler method let me know.
+ var/list/organs = victim.getorganszone("groin")
+ for(var/internal_organ in organs)
+ if(istype(internal_organ, /obj/item/organ/genital/penis))
+ var/obj/item/organ/genital/penis/O = internal_organ
+ playsound(get_turf(src), 'sound/weapons/flash.ogg', 50, 1)
+ victim.visible_message("[user] is preparing to shrink [victim]\'s [O.name] with their bluespace compression kit!")
+ if(do_mob(user, victim, 40) && charges > 0 && O.length > 0)
+ victim.visible_message("[user] has shrunk [victim]\'s [O.name]!")
+ playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 50, 1)
+ sparks()
+ flash_lighting_fx(3, 3, LIGHT_COLOR_CYAN)
+ charges -= 1
+ O.length -= 5
+ if(O.length < 1)
+ victim.visible_message("[user]\'s [O.name] vanishes!")
+ qdel(O) // no pp for you
+ else
+ O.update_size()
+ O.update_appearance()
+
+
+
+/obj/item/compressionkit/attackby(obj/item/I, mob/user, params)
+ ..()
+ if(istype(I, /obj/item/stack/ore/bluespace_crystal))
+ var/obj/item/stack/ore/bluespace_crystal/B = I
+ charges += 2
+ to_chat(user, "You insert [I] into [src]. It now has [charges] charges.")
+ if(B.amount > 1)
+ B.amount -= 1
+ else
+ qdel(I)
\ No newline at end of file
diff --git a/code/game/objects/items/devices/dogborg_sleeper.dm b/code/game/objects/items/devices/dogborg_sleeper.dm
index 9163fb0849..7f3c7f3bfc 100644
--- a/code/game/objects/items/devices/dogborg_sleeper.dm
+++ b/code/game/objects/items/devices/dogborg_sleeper.dm
@@ -17,7 +17,7 @@
var/eject_port = "ingestion"
var/escape_in_progress = FALSE
var/message_cooldown
- var/breakout_time = 300
+ var/breakout_time = 150
var/tmp/last_hearcheck = 0
var/tmp/list/hearing_mobs
var/list/items_preserved = list()
@@ -77,7 +77,7 @@
to_chat(user, "Your [src] is already occupied.")
return
user.visible_message("[hound.name] is carefully inserting [target.name] into their [src].", "You start placing [target] into your [src]...")
- if(!patient && iscarbon(target) && !target.buckled && do_after (user, 50, target = target))
+ if(!patient && iscarbon(target) && !target.buckled && do_after (user, 100, target = target))
if(!in_range(src, target)) //Proximity is probably old news by now, do a new check.
return //If they moved away, you can't eat them.
@@ -420,6 +420,7 @@
desc = "Equipment for medical hound. A mounted sleeper that stabilizes patients and can inject reagents in the borg's reserves."
icon = 'icons/mob/dogborg.dmi'
icon_state = "sleeper"
+ breakout_time = 30 //Medical sleepers should be designed to be as easy as possible to get out of.
/obj/item/dogborg/sleeper/K9 //The K9 portabrig
name = "Mobile Brig"
@@ -429,6 +430,7 @@
inject_amount = 0
min_health = -100
injection_chems = null //So they don't have all the same chems as the medihound!
+ breakout_time = 300
/obj/item/storage/attackby(obj/item/dogborg/sleeper/K9, mob/user, proximity)
if(istype(K9))
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index cbbd7a387a..722510dccb 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -13,7 +13,8 @@
actions_types = list(/datum/action/item_action/toggle_light)
var/on = FALSE
var/brightness_on = 4 //range of light when on
- var/flashlight_power = 1 //strength of the light when on
+ var/flashlight_power = 0.8 //strength of the light when on
+ light_color = "#FFCC66"
/obj/item/flashlight/Initialize()
. = ..()
@@ -52,7 +53,7 @@
add_fingerprint(user)
if(istype(M) && on && user.zone_selected in list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH))
- if((user.has_trait(TRAIT_CLUMSY) || user.has_trait(TRAIT_DUMB)) && prob(50)) //too dumb to use flashlight properly
+ if((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(50)) //too dumb to use flashlight properly
return ..() //just hit them in the head
if(!user.IsAdvancedToolUser())
@@ -63,7 +64,7 @@
to_chat(user, "[M] doesn't have a head!")
return
- if(flashlight_power < 1)
+ if(flashlight_power < 0.3)
to_chat(user, "\The [src] isn't bright enough to see anything! ")
return
@@ -86,7 +87,7 @@
else
user.visible_message("[user] directs [src] to [M]'s eyes.", \
"You direct [src] to [M]'s eyes.")
- if(M.stat == DEAD || (M.has_trait(TRAIT_BLIND)) || !M.flash_act(visual = 1)) //mob is dead or fully blind
+ if(M.stat == DEAD || (HAS_TRAIT(M, TRAIT_BLIND)) || !M.flash_act(visual = 1)) //mob is dead or fully blind
to_chat(user, "[M]'s pupils don't react to the light!")
else if(M.dna && M.dna.check_mutation(XRAY)) //mob has X-ray vision
to_chat(user, "[M]'s pupils give an eerie glow!")
@@ -168,6 +169,8 @@
item_state = ""
flags_1 = CONDUCT_1
brightness_on = 2
+ light_color = "#FFDDCC"
+ flashlight_power = 0.3
var/holo_cooldown = 0
/obj/item/flashlight/pen/afterattack(atom/target, mob/user, proximity_flag)
@@ -204,6 +207,8 @@
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
force = 9 // Not as good as a stun baton.
brightness_on = 5 // A little better than the standard flashlight.
+ light_color = "#CDDDFF"
+ flashlight_power = 0.9
hitsound = 'sound/weapons/genhit1.ogg'
// the desk lamps are a bit special
@@ -216,6 +221,7 @@
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
force = 10
brightness_on = 5
+ light_color = "#FFDDBB"
w_class = WEIGHT_CLASS_BULKY
flags_1 = CONDUCT_1
materials = list()
@@ -252,6 +258,7 @@
desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'."
w_class = WEIGHT_CLASS_SMALL
brightness_on = 7 // Pretty bright.
+ light_color = "#FA421A"
icon_state = "flare"
item_state = "flare"
actions_types = list()
@@ -325,6 +332,7 @@
desc = "A torch fashioned from some leaves and a log."
w_class = WEIGHT_CLASS_BULKY
brightness_on = 4
+ light_color = "#FAA44B"
icon_state = "torch"
item_state = "torch"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
@@ -341,6 +349,8 @@
righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
desc = "A mining lantern."
brightness_on = 6 // luminosity when on
+ light_color = "#FFAA44"
+ flashlight_power = 0.75
/obj/item/flashlight/slime
@@ -354,6 +364,8 @@
slot_flags = ITEM_SLOT_BELT
materials = list()
brightness_on = 6 //luminosity when on
+ light_color = "#FFEEAA"
+ flashlight_power = 0.6
/obj/item/flashlight/emp
var/emp_max_charges = 4
@@ -500,23 +512,13 @@
name = "pink glowstick"
color = LIGHT_COLOR_PINK
-/obj/item/flashlight/glowstick/random
- name = "random colored glowstick"
- icon_state = "random_glowstick"
- color = null
-
-/obj/item/flashlight/glowstick/random/Initialize()
- ..()
- var/T = pick(typesof(/obj/item/flashlight/glowstick) - /obj/item/flashlight/glowstick/random)
- new T(loc)
- return INITIALIZE_HINT_QDEL
-
/obj/item/flashlight/spotlight //invisible lighting source
name = "disco light"
desc = "Groovy..."
icon_state = null
light_color = null
brightness_on = 0
+ flashlight_power = 1
light_range = 0
light_power = 10
alpha = 0
@@ -538,7 +540,6 @@
name = "eyelight"
desc = "This shouldn't exist outside of someone's head, how are you seeing this?"
brightness_on = 15
- flashlight_power = 1
flags_1 = CONDUCT_1
item_flags = DROPDEL
actions_types = list()
diff --git a/code/game/objects/items/devices/glue.dm b/code/game/objects/items/devices/glue.dm
new file mode 100644
index 0000000000..2c57ede706
--- /dev/null
+++ b/code/game/objects/items/devices/glue.dm
@@ -0,0 +1,32 @@
+/obj/item/syndie_glue
+ name = "bottle of super glue"
+ desc = "A black market brand of high strength adhesive, rarely sold to the public. Do not ingest."
+ icon = 'icons/obj/tools.dmi'
+ icon_state = "glue"
+ w_class = WEIGHT_CLASS_SMALL
+ var/uses = 1
+
+/obj/item/syndie_glue/suicide_act(mob/living/carbon/M)
+ return //todo
+
+/obj/item/syndie_glue/afterattack(atom/target, mob/user, proximity)
+ . = ..()
+ if(!proximity || !target)
+ return
+ else
+ if(uses == 0)
+ to_chat(user, "The bottle of glue is empty!")
+ return
+ if(istype(target, /obj/item))
+ var/obj/item/I = target
+ if(HAS_TRAIT_FROM(I, TRAIT_NODROP, GLUED_ITEM_TRAIT))
+ to_chat(user, "[I] is already sticky!")
+ return
+ uses -= 1
+ ADD_TRAIT(I, TRAIT_NODROP, GLUED_ITEM_TRAIT)
+ I.desc += " It looks sticky."
+ to_chat(user, "You smear the [I] with glue, making it incredibly sticky!")
+ if(uses == 0)
+ icon_state = "glue_used"
+ name = "empty bottle of super glue"
+ return
\ No newline at end of file
diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm
index c362d9f7f2..637bb794d3 100644
--- a/code/game/objects/items/devices/gps.dm
+++ b/code/game/objects/items/devices/gps.dm
@@ -156,7 +156,10 @@ GLOBAL_LIST_EMPTY(GPS_list)
icon_state = "gps-b"
gpstag = "BORG0"
desc = "A mining cyborg internal positioning system. Used as a recovery beacon for damaged cyborg assets, or a collaboration tool for mining teams."
- item_flags = NODROP
+
+/obj/item/gps/cyborg/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, CYBORG_ITEM_TRAIT)
/obj/item/gps/internal
icon_state = null
diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm
index c5ed5fb601..5894b559ae 100644
--- a/code/game/objects/items/devices/instruments.dm
+++ b/code/game/objects/items/devices/instruments.dm
@@ -54,7 +54,7 @@
/obj/item/instrument/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/musicaltuner))
var/mob/living/carbon/human/H = user
- if (H.has_trait(TRAIT_MUSICIAN))
+ if (HAS_TRAIT(H, TRAIT_MUSICIAN))
if (!tune_time)
H.visible_message("[H] tunes the [src] to perfection!", "You tune the [src] to perfection!")
tune_time = 300
@@ -234,11 +234,18 @@
w_class = WEIGHT_CLASS_SMALL
actions_types = list(/datum/action/item_action/instrument)
-/obj/item/instrument/harmonica/speechModification(message)
+/obj/item/instrument/harmonica/proc/handle_speech(datum/source, list/speech_args)
if(song.playing && ismob(loc))
to_chat(loc, "You stop playing the harmonica to talk...")
song.playing = FALSE
- return message
+
+/obj/item/instrument/harmonica/equipped(mob/M, slot)
+ . = ..()
+ RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
+
+/obj/item/instrument/harmonica/dropped(mob/M)
+ . = ..()
+ UnregisterSignal(M, COMSIG_MOB_SAY)
/obj/item/instrument/bikehorn
name = "gilded bike horn"
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 632c2c4221..7baea7f488 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -69,7 +69,7 @@
if (!user.IsAdvancedToolUser())
to_chat(user, "You don't have the dexterity to do this!")
return
- if(user.has_trait(TRAIT_NOGUNS))
+ if(HAS_TRAIT(user, TRAIT_NOGUNS))
to_chat(user, "Your fingers can't press the button!")
return
if(ishuman(user))
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 4b244e3002..347bb6894d 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -17,13 +17,25 @@
user.say("AAAAAAAAAAAARGHHHHH", forced="megaphone suicide")//he must have died while coding this
return OXYLOSS
-/obj/item/megaphone/get_held_item_speechspans(mob/living/carbon/user)
- if(spamcheck > world.time)
- to_chat(user, "\The [src] needs to recharge!")
+/obj/item/megaphone/equipped(mob/M, slot)
+ . = ..()
+ if (slot == SLOT_HANDS)
+ RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
else
- playsound(loc, 'sound/items/megaphone.ogg', 100, 0, 1)
- spamcheck = world.time + 50
- return voicespan
+ UnregisterSignal(M, COMSIG_MOB_SAY)
+
+/obj/item/megaphone/dropped(mob/M)
+ . = ..()
+ UnregisterSignal(M, COMSIG_MOB_SAY)
+
+/obj/item/megaphone/proc/handle_speech(mob/living/carbon/user, list/speech_args)
+ if (user.get_active_held_item() == src)
+ if(spamcheck > world.time)
+ to_chat(user, "\The [src] needs to recharge!")
+ else
+ playsound(loc, 'sound/items/megaphone.ogg', 100, 0, 1)
+ spamcheck = world.time + 50
+ speech_args[SPEECH_SPANS] |= voicespan
/obj/item/megaphone/emag_act(mob/user)
if(obj_flags & EMAGGED)
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index 2f8b111b4b..b74b0fa3d4 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -38,7 +38,7 @@
/obj/item/electropack/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/clothing/head/helmet))
- var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user )
+ var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit(user)
A.icon = 'icons/obj/assemblies.dmi'
if(!user.transferItemToLoc(W, A))
@@ -53,8 +53,6 @@
user.put_in_hands(A)
A.add_fingerprint(user)
- if(item_flags & NODROP)
- A.item_flags |= NODROP
else
return ..()
@@ -106,8 +104,7 @@
if(shock_cooldown != 0)
return
shock_cooldown = 1
- spawn(100)
- shock_cooldown = 0
+ addtimer(VARSET_CALLBACK(src, shock_cooldown, 0), 100)
var/mob/living/L = loc
step(L, pick(GLOB.cardinals))
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 719fe6ddd8..1d51aabf86 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -16,7 +16,6 @@
var/on = TRUE
var/frequency = FREQ_COMMON
- var/traitor_frequency = 0 // If tuned to this frequency, uplink will be unlocked.
var/canhear_range = 3 // The range around the radio in which mobs can hear what it receives.
var/emped = 0 // Tracks the number of EMPs currently stacked.
@@ -190,7 +189,7 @@
/obj/item/radio/talk_into(atom/movable/M, message, channel, list/spans, datum/language/language)
if(!spans)
- spans = M.get_spans()
+ spans = list(M.speech_span)
if(!language)
language = M.get_default_language()
INVOKE_ASYNC(src, .proc/talk_into_impl, M, message, channel, spans.Copy(), language)
diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm
index 2f137861aa..20107373d3 100644
--- a/code/game/objects/items/devices/reverse_bear_trap.dm
+++ b/code/game/objects/items/devices/reverse_bear_trap.dm
@@ -49,7 +49,7 @@
if(iscarbon(user))
var/mob/living/carbon/C = user
if(C.get_item_by_slot(SLOT_HEAD) == src)
- if((item_flags & NODROP) && !struggling)
+ if(HAS_TRAIT_FROM(src, TRAIT_NODROP, REVERSE_BEAR_TRAP_TRAIT) && !struggling)
struggling = TRUE
var/fear_string
switch(time_left)
@@ -74,7 +74,7 @@
else
user.visible_message("The lock on [user]'s [name] pops open!", \
"You force open the padlock!", "You hear a single, pronounced click!")
- item_flags &= ~NODROP
+ REMOVE_TRAIT(src, TRAIT_NODROP, REVERSE_BEAR_TRAP_TRAIT)
struggling = FALSE
else
..()
@@ -116,7 +116,7 @@
/obj/item/reverse_bear_trap/proc/reset()
ticking = FALSE
- item_flags &= ~NODROP
+ REMOVE_TRAIT(src, TRAIT_NODROP, REVERSE_BEAR_TRAP_TRAIT)
soundloop.stop()
soundloop2.stop()
STOP_PROCESSING(SSprocessing, src)
@@ -125,7 +125,7 @@
ticking = TRUE
escape_chance = initial(escape_chance) //we keep these vars until re-arm, for tracking purposes
time_left = initial(time_left)
- item_flags |= NODROP
+ ADD_TRAIT(src, TRAIT_NODROP, REVERSE_BEAR_TRAP_TRAIT)
soundloop.start()
soundloop2.mid_length = initial(soundloop2.mid_length)
soundloop2.start()
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 79b04c771b..57b9e89af7 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -95,7 +95,7 @@ SLIME SCANNER
/obj/item/healthanalyzer/attack(mob/living/M, mob/living/carbon/human/user)
// Clumsiness/brain damage check
- if ((user.has_trait(TRAIT_CLUMSY) || user.has_trait(TRAIT_DUMB)) && prob(50))
+ if ((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(50))
to_chat(user, "You stupidly try to analyze the floor's vitals!")
user.visible_message("[user] has analyzed the floor's vitals!")
var/msg = "*---------*\nAnalyzing results for The floor:\n\tOverall status: Healthy\n"
@@ -127,7 +127,7 @@ SLIME SCANNER
var/brute_loss = M.getBruteLoss()
var/mob_status = (M.stat == DEAD ? "Deceased" : "[round(M.health/M.maxHealth,0.01)*100] % healthy")
- if(M.has_trait(TRAIT_FAKEDEATH) && !advanced)
+ if(HAS_TRAIT(M, TRAIT_FAKEDEATH) && !advanced)
mob_status = "Deceased"
oxy_loss = max(rand(1, 40), oxy_loss, (300 - (tox_loss + fire_loss + brute_loss))) // Random oxygen loss
@@ -199,10 +199,10 @@ SLIME SCANNER
msg += "\t==EAR STATUS==\n"
if(istype(ears))
var/healthy = TRUE
- if(C.has_trait(TRAIT_DEAF, GENETIC_MUTATION))
+ if(HAS_TRAIT_FROM(C, TRAIT_DEAF, GENETIC_MUTATION))
healthy = FALSE
msg += "\tSubject is genetically deaf.\n"
- else if(C.has_trait(TRAIT_DEAF))
+ else if(HAS_TRAIT(C, TRAIT_DEAF))
healthy = FALSE
msg += "\tSubject is deaf.\n"
else
@@ -220,10 +220,10 @@ SLIME SCANNER
msg += "\t==EYE STATUS==\n"
if(istype(eyes))
var/healthy = TRUE
- if(C.has_trait(TRAIT_BLIND))
+ if(HAS_TRAIT(C, TRAIT_BLIND))
msg += "\tSubject is blind.\n"
healthy = FALSE
- if(C.has_trait(TRAIT_NEARSIGHT))
+ if(HAS_TRAIT(C, TRAIT_NEARSIGHT))
msg += "\tSubject is nearsighted.\n"
healthy = FALSE
if(eyes.eye_damage > 30)
@@ -290,7 +290,7 @@ SLIME SCANNER
msg += "Body temperature: [round(M.bodytemperature-T0C,0.1)] °C ([round(M.bodytemperature*1.8-459.67,0.1)] °F)\n"
// Time of death
- if(M.tod && (M.stat == DEAD || ((M.has_trait(TRAIT_FAKEDEATH)) && !advanced)))
+ if(M.tod && (M.stat == DEAD || ((HAS_TRAIT(M, TRAIT_FAKEDEATH)) && !advanced)))
msg += "Time of Death: [M.tod]\n"
var/tdelta = round(world.time - M.timeofdeath)
if(tdelta < (DEFIB_TIME_LIMIT * 10))
@@ -341,9 +341,19 @@ SLIME SCANNER
if(M.reagents)
var/msg = "*---------*\n"
if(M.reagents.reagent_list.len)
- msg += "Subject contains the following reagents:\n"
+ var/list/datum/reagent/reagents = list()
for(var/datum/reagent/R in M.reagents.reagent_list)
- msg += "[R.volume] units of [R.name][R.overdosed == 1 ? " - OVERDOSING" : "."]\n"
+ if(R.invisible)
+ continue
+ reagents += R
+
+ if(length(reagents))
+ msg += "Subject contains the following reagents:\n"
+ for(var/datum/reagent/R in reagents)
+ msg += "[R.volume] units of [R.name][R.overdosed == 1 ? " - OVERDOSING" : "."]\n"
+ else
+ msg += "Subject contains no reagents.\n"
+
else
msg += "Subject contains no reagents.\n"
if(M.reagents.addiction_list.len)
@@ -428,39 +438,38 @@ SLIME SCANNER
if(total_moles)
var/list/env_gases = environment.gases
- environment.assert_gases(arglist(GLOB.hardcoded_gases))
- var/o2_concentration = env_gases[/datum/gas/oxygen][MOLES]/total_moles
- var/n2_concentration = env_gases[/datum/gas/nitrogen][MOLES]/total_moles
- var/co2_concentration = env_gases[/datum/gas/carbon_dioxide][MOLES]/total_moles
- var/plasma_concentration = env_gases[/datum/gas/plasma][MOLES]/total_moles
+ var/o2_concentration = env_gases[/datum/gas/oxygen]/total_moles
+ var/n2_concentration = env_gases[/datum/gas/nitrogen]/total_moles
+ var/co2_concentration = env_gases[/datum/gas/carbon_dioxide]/total_moles
+ var/plasma_concentration = env_gases[/datum/gas/plasma]/total_moles
if(abs(n2_concentration - N2STANDARD) < 20)
- to_chat(user, "Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/nitrogen][MOLES], 0.01)] mol)")
+ to_chat(user, "Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/nitrogen], 0.01)] mol)")
else
- to_chat(user, "Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/nitrogen][MOLES], 0.01)] mol)")
+ to_chat(user, "Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/nitrogen], 0.01)] mol)")
if(abs(o2_concentration - O2STANDARD) < 2)
- to_chat(user, "Oxygen: [round(o2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/oxygen][MOLES], 0.01)] mol)")
+ to_chat(user, "Oxygen: [round(o2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/oxygen], 0.01)] mol)")
else
- to_chat(user, "Oxygen: [round(o2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/oxygen][MOLES], 0.01)] mol)")
+ to_chat(user, "Oxygen: [round(o2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/oxygen], 0.01)] mol)")
if(co2_concentration > 0.01)
- to_chat(user, "CO2: [round(co2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/carbon_dioxide][MOLES], 0.01)] mol)")
+ to_chat(user, "CO2: [round(co2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/carbon_dioxide], 0.01)] mol)")
else
- to_chat(user, "CO2: [round(co2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/carbon_dioxide][MOLES], 0.01)] mol)")
+ to_chat(user, "CO2: [round(co2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/carbon_dioxide], 0.01)] mol)")
if(plasma_concentration > 0.005)
- to_chat(user, "Plasma: [round(plasma_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/plasma][MOLES], 0.01)] mol)")
+ to_chat(user, "Plasma: [round(plasma_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/plasma], 0.01)] mol)")
else
- to_chat(user, "Plasma: [round(plasma_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/plasma][MOLES], 0.01)] mol)")
+ to_chat(user, "Plasma: [round(plasma_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/plasma], 0.01)] mol)")
- environment.garbage_collect()
+ GAS_GARBAGE_COLLECT(environment.gases)
for(var/id in env_gases)
if(id in GLOB.hardcoded_gases)
continue
- var/gas_concentration = env_gases[id][MOLES]/total_moles
- to_chat(user, "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(env_gases[id][MOLES], 0.01)] mol)")
+ var/gas_concentration = env_gases[id]/total_moles
+ to_chat(user, "[GLOB.meta_gas_names[id]]: [round(gas_concentration*100, 0.01)] % ([round(env_gases[id], 0.01)] mol)")
to_chat(user, "Temperature: [round(environment.temperature-T0C, 0.01)] °C ([round(environment.temperature, 0.01)] K)")
/obj/item/analyzer/AltClick(mob/user) //Barometer output for measuring when the next storm happens
@@ -550,8 +559,8 @@ SLIME SCANNER
var/list/cached_gases = air_contents.gases
for(var/id in cached_gases)
- var/gas_concentration = cached_gases[id][MOLES]/total_moles
- to_chat(user, "[cached_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(cached_gases[id][MOLES], 0.01)] mol)")
+ var/gas_concentration = cached_gases[id]/total_moles
+ to_chat(user, "[GLOB.meta_gas_names[id]]: [round(gas_concentration*100, 0.01)] % ([round(cached_gases[id], 0.01)] mol)")
to_chat(user, "Temperature: [round(temperature - T0C,0.01)] °C ([round(temperature, 0.01)] K)")
else
@@ -622,7 +631,7 @@ SLIME SCANNER
to_chat(user, "Growth progress: [T.amount_grown]/[SLIME_EVOLUTION_THRESHOLD]")
if(T.effectmod)
to_chat(user, "Core mutation in progress: [T.effectmod]")
- to_chat(user, "Progress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]")
+ to_chat(user, "Progress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]")
to_chat(user, "========================")
diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm
index d5ac5d9c52..10c81e9dbb 100644
--- a/code/game/objects/items/dna_injector.dm
+++ b/code/game/objects/items/dna_injector.dm
@@ -31,7 +31,7 @@
/obj/item/dnainjector/proc/inject(mob/living/carbon/M, mob/user)
prepare()
- if(M.has_dna() && !M.has_trait(TRAIT_RADIMMUNE) && !M.has_trait(TRAIT_NOCLONE))
+ if(M.has_dna() && !HAS_TRAIT(M, TRAIT_RADIMMUNE) && !HAS_TRAIT(M, TRAIT_NOCLONE))
M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2))
var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
for(var/datum/mutation/human/HM in remove_mutations)
@@ -313,7 +313,7 @@
to_chat(user, "You can't modify [M]'s DNA while [M.p_theyre()] dead.")
return FALSE
- if(M.has_dna() && !(M.has_trait(TRAIT_NOCLONE)))
+ if(M.has_dna() && !(HAS_TRAIT(M, TRAIT_NOCLONE)))
M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2))
var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
var/endtime = world.time+duration
diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm
index ddbc668c05..9fb4206845 100644
--- a/code/game/objects/items/extinguisher.dm
+++ b/code/game/objects/items/extinguisher.dm
@@ -15,7 +15,6 @@
attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
dog_fashion = /datum/dog_fashion/back
resistance_flags = FIRE_PROOF
- container_type = AMOUNT_VISIBLE
var/max_water = 50
var/last_use = 1
var/chem = "water"
@@ -56,7 +55,7 @@
/obj/item/extinguisher/Initialize()
. = ..()
- create_reagents(max_water)
+ create_reagents(max_water, AMOUNT_VISIBLE)
reagents.add_reagent(chem, max_water)
@@ -111,7 +110,7 @@
to_chat(user, "The safety is [safety ? "on" : "off"].")
if(reagents.total_volume)
- to_chat(user, "Alt-click to empty it.")
+ to_chat(user, "You can loose its screws to empty it.")
/obj/item/extinguisher/proc/AttemptRefill(atom/target, mob/user)
if(istype(target, tanktype) && target.Adjacent(user))
@@ -245,7 +244,7 @@
var/turf/open/theturf = T
theturf.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS)
- user.visible_message("[user] empties out \the [src] onto the floor using the release valve.", "You quietly empty out \the [src] using its release valve.")
+ user.visible_message("[user] empties out \the [src] onto the floor using the release valve.", "You quietly empty out \the [src] by loosing the release valve's screws.")
//firebot assembly
/obj/item/extinguisher/attackby(obj/O, mob/user, params)
diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm
index 2635955a15..fd51ecf26b 100644
--- a/code/game/objects/items/flamethrower.dm
+++ b/code/game/objects/items/flamethrower.dm
@@ -205,7 +205,7 @@
//Transfer 5% of current tank air contents to turf
var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(release_amount)
if(air_transfer.gases[/datum/gas/plasma])
- air_transfer.gases[/datum/gas/plasma][MOLES] *= 5
+ air_transfer.gases[/datum/gas/plasma] *= 5
target.assume_air(air_transfer)
//Burn it based on transfered gas
target.hotspot_expose((ptank.air_contents.temperature*2) + 380,500)
diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm
index 8d0d8d020e..21f6961e5d 100644
--- a/code/game/objects/items/granters.dm
+++ b/code/game/objects/items/granters.dm
@@ -87,6 +87,33 @@
active = FALSE
UpdateButtonIcon()
+/obj/item/book/granter/action/origami
+ granted_action = /datum/action/innate/origami
+ name = "The Art of Origami"
+ desc = "A meticulously in-depth manual explaining the art of paper folding."
+ icon_state = "origamibook"
+ actionname = "origami"
+ oneuse = TRUE
+ remarks = list("Dead-stick stability...", "Symmetry seems to play a rather large factor...", "Accounting for crosswinds... really?", "Drag coefficients of various paper types...", "Thrust to weight ratios?", "Positive dihedral angle?", "Center of gravity forward of the center of lift...")
+
+/datum/action/innate/origami
+ name = "Origami Folding"
+ desc = "Toggles your ability to fold and catch robust paper airplanes."
+ button_icon_state = "origami_off"
+ check_flags = NONE
+
+/datum/action/innate/origami/Activate()
+ to_chat(owner, "You will now fold origami planes.")
+ button_icon_state = "origami_on"
+ active = TRUE
+ UpdateButtonIcon()
+
+/datum/action/innate/origami/Deactivate()
+ to_chat(owner, "You will no longer fold origami planes.")
+ button_icon_state = "origami_off"
+ active = FALSE
+ UpdateButtonIcon()
+
///SPELLS///
/obj/item/book/granter/spell
@@ -252,12 +279,8 @@
/obj/item/book/granter/spell/barnyard/recoil(mob/living/carbon/user)
if(ishuman(user))
to_chat(user,"HORSIE HAS RISEN")
- var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead
- magichead.item_flags |= NODROP //curses!
- magichead.flags_inv &= ~HIDEFACE //so you can still see their face
- magichead.voicechange = TRUE //NEEEEIIGHH
- if(!user.dropItemToGround(user.wear_mask))
- qdel(user.wear_mask)
+ var/obj/item/clothing/magichead = new /obj/item/clothing/mask/horsehead/cursed(user.drop_location())
+ user.dropItemToGround(user.wear_mask, TRUE)
user.equip_to_slot_if_possible(magichead, SLOT_WEAR_MASK, TRUE, TRUE)
qdel(src)
else
diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm
index 32e06eb9b4..28d8739369 100644
--- a/code/game/objects/items/grenades/grenade.dm
+++ b/code/game/objects/items/grenades/grenade.dm
@@ -33,7 +33,7 @@
qdel(src)
/obj/item/grenade/proc/clown_check(mob/living/carbon/human/user)
- var/clumsy = user.has_trait(TRAIT_CLUMSY)
+ var/clumsy = HAS_TRAIT(user, TRAIT_CLUMSY)
if(clumsy && (clumsy_check == GRENADE_CLUMSY_FUMBLE))
if(prob(50))
to_chat(user, "Huh? How does this thing work?")
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 1f3019fe65..5e19577b46 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -44,7 +44,7 @@
if(!istype(C))
return
- if(iscarbon(user) && (user.has_trait(TRAIT_CLUMSY) && prob(50)))
+ if(iscarbon(user) && (HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)))
to_chat(user, "Uh... how do those things work?!")
apply_cuffs(user,user)
return
diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm
index 49a5cfaf35..65a4bd542b 100644
--- a/code/game/objects/items/his_grace.dm
+++ b/code/game/objects/items/his_grace.dm
@@ -8,7 +8,7 @@
name = "artistic toolbox"
desc = "A toolbox painted bright green. Looking at it makes you feel uneasy."
icon_state = "his_grace"
- item_state = "artistic_toolbox"
+ item_state = "toolbox_green"
lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
@@ -90,7 +90,7 @@
do_attack_animation(master, null, src)
master.emote("scream")
master.remove_status_effect(STATUS_EFFECT_HISGRACE)
- item_flags &= ~NODROP
+ REMOVE_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT)
master.Knockdown(60)
master.adjustBruteLoss(master.maxHealth)
playsound(master, 'sound/effects/splat.ogg', 100, 0)
@@ -174,6 +174,7 @@
/obj/item/his_grace/proc/consume(mob/living/meal) //Here's your dinner, Mr. Grace.
if(!meal)
return
+ var/victims = 0
meal.visible_message("[src] swings open and devours [meal]!", "[src] consumes you!")
meal.adjustBruteLoss(200)
playsound(meal, 'sound/misc/desceration-02.ogg', 75, 1)
@@ -185,7 +186,10 @@
bloodthirst = max(LAZYLEN(contents), 1) //Never fully sated, and His hunger will only grow.
else
bloodthirst = HIS_GRACE_CONSUME_OWNER
- if(LAZYLEN(contents) >= victims_needed)
+ for(var/mob/living/C in contents)
+ if(C.mind)
+ victims++
+ if(victims >= victims_needed)
ascend()
update_stats()
@@ -198,20 +202,20 @@
update_stats()
/obj/item/his_grace/proc/update_stats()
- item_flags &= ~NODROP
+ REMOVE_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT)
var/mob/living/master = get_atom_on_turf(src, /mob/living)
switch(bloodthirst)
if(HIS_GRACE_CONSUME_OWNER to HIS_GRACE_FALL_ASLEEP)
if(HIS_GRACE_CONSUME_OWNER > prev_bloodthirst)
master.visible_message("[src] enters a frenzy!")
if(HIS_GRACE_STARVING to HIS_GRACE_CONSUME_OWNER)
- item_flags |= NODROP
+ ADD_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT)
if(HIS_GRACE_STARVING > prev_bloodthirst)
master.visible_message("[src] is starving!", "[src]'s bloodlust overcomes you. [src] must be fed, or you will become His meal.\
[force_bonus < 15 ? " And still, His power grows.":""]")
force_bonus = max(force_bonus, 15)
if(HIS_GRACE_FAMISHED to HIS_GRACE_STARVING)
- item_flags |= NODROP
+ ADD_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT)
if(HIS_GRACE_FAMISHED > prev_bloodthirst)
master.visible_message("[src] is very hungry!", "Spines sink into your hand. [src] must feed immediately.\
[force_bonus < 10 ? " His power grows.":""]")
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 3fda98e074..0e8a9fef9e 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -58,7 +58,7 @@
item_state = "radio"
/obj/item/holybeacon/attack_self(mob/user)
- if(user.mind && (user.mind.isholy) && !SSreligion.holy_armor_type)
+ if(user.mind && (user.mind.isholy) && !GLOB.holy_armor_type)
beacon_armor(user)
else
playsound(src, 'sound/machines/buzz-sigh.ogg', 40, 1)
@@ -71,13 +71,13 @@
display_names += list(initial(A.name) = A)
var/choice = input(M,"What holy armor kit would you like to order?","Holy Armor Theme") as null|anything in display_names
- if(QDELETED(src) || !choice || M.stat || !in_range(M, src) || M.restrained() || !M.canmove || SSreligion.holy_armor_type)
+ if(QDELETED(src) || !choice || M.stat || !in_range(M, src) || M.restrained() || !M.canmove || GLOB.holy_armor_type)
return
var/index = display_names.Find(choice)
var/A = holy_armor_list[index]
- SSreligion.holy_armor_type = A
+ GLOB.holy_armor_type = A
var/holy_armor_box = new A
SSblackbox.record_feedback("tally", "chaplain_armor", 1, "[choice]")
@@ -245,7 +245,7 @@
reskin_holy_weapon(user)
/obj/item/nullrod/proc/reskin_holy_weapon(mob/M)
- if(SSreligion.holy_weapon_type)
+ if(GLOB.holy_weapon_type)
return
var/obj/item/nullrod/holy_weapon
var/list/holy_weapons_list = typesof(/obj/item/nullrod) + list(
@@ -264,7 +264,7 @@
var/A = display_names[choice] // This needs to be on a separate var as list member access is not allowed for new
holy_weapon = new A
- SSreligion.holy_weapon_type = holy_weapon.type
+ GLOB.holy_weapon_type = holy_weapon.type
SSblackbox.record_feedback("tally", "chaplain_weapon", 1, "[choice]")
@@ -280,12 +280,19 @@
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
name = "god hand"
desc = "This hand of yours glows with an awesome power!"
- item_flags = ABSTRACT | NODROP | DROPDEL
+ item_flags = ABSTRACT | DROPDEL
w_class = WEIGHT_CLASS_HUGE
hitsound = 'sound/weapons/sear.ogg'
damtype = BURN
attack_verb = list("punched", "cross countered", "pummeled")
+
+/obj/item/nullrod/godhand/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
+
+
+
/obj/item/nullrod/staff
icon_state = "godstaff-red"
item_state = "godstaff-red"
@@ -525,13 +532,14 @@
lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi'
w_class = WEIGHT_CLASS_HUGE
- item_flags = NODROP | ABSTRACT
+ item_flags = ABSTRACT
sharpness = IS_SHARP
attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
hitsound = 'sound/weapons/chainsawhit.ogg'
/obj/item/nullrod/chainsaw/Initialize()
. = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
AddComponent(/datum/component/butchering, 30, 100, 0, hitsound)
/obj/item/nullrod/clown
@@ -546,6 +554,9 @@
/obj/item/nullrod/pride_hammer
icon_state = "pride"
+ item_state = "pride"
+ lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi'
name = "Pride-struck Hammer"
desc = "It resonates an aura of Pride."
force = 16
@@ -553,7 +564,7 @@
w_class = 4
slot_flags = ITEM_SLOT_BACK
attack_verb = list("attacked", "smashed", "crushed", "splattered", "cracked")
- hitsound = 'sound/weapons/blade1.ogg'
+ hitsound = 'sound/weapons/resonator_blast.ogg'
/obj/item/nullrod/pride_hammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
. = ..()
@@ -573,6 +584,7 @@
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
slot_flags = ITEM_SLOT_BELT
+ reach = 2
attack_verb = list("whipped", "lashed")
hitsound = 'sound/weapons/chainhit.ogg'
@@ -597,12 +609,13 @@
item_state = "arm_blade"
lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
- item_flags = ABSTRACT | NODROP
+ item_flags = ABSTRACT
w_class = WEIGHT_CLASS_HUGE
sharpness = IS_SHARP
/obj/item/nullrod/armblade/Initialize()
. = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
AddComponent(/datum/component/butchering, 80, 70)
/obj/item/nullrod/armblade/tentacle
diff --git a/code/game/objects/items/hot_potato.dm b/code/game/objects/items/hot_potato.dm
index db7f38ddf3..e7b05d7a01 100644
--- a/code/game/objects/items/hot_potato.dm
+++ b/code/game/objects/items/hot_potato.dm
@@ -134,7 +134,7 @@
return
update_icon()
if(sticky)
- item_flags |= NODROP
+ ADD_TRAIT(src, TRAIT_NODROP, HOT_POTATO_TRAIT)
name = "primed [name]"
activation_time = timer + world.time
detonation_timerid = addtimer(CALLBACK(src, .proc/detonate), delay, TIMER_STOPPABLE)
@@ -147,7 +147,7 @@
/obj/item/hot_potato/proc/deactivate()
update_icon()
name = initial(name)
- item_flags &= ~NODROP
+ REMOVE_TRAIT(src, TRAIT_NODROP, HOT_POTATO_TRAIT)
deltimer(detonation_timerid)
STOP_PROCESSING(SSfastprocess, src)
detonation_timerid = null
diff --git a/code/game/objects/items/implants/implant_chem.dm b/code/game/objects/items/implants/implant_chem.dm
index b9c85c0728..c6c8be1a83 100644
--- a/code/game/objects/items/implants/implant_chem.dm
+++ b/code/game/objects/items/implants/implant_chem.dm
@@ -2,7 +2,6 @@
name = "chem implant"
desc = "Injects things."
icon_state = "reagents"
- container_type = OPENCONTAINER
activated = FALSE
/obj/item/implant/chem/get_data()
@@ -23,7 +22,7 @@
/obj/item/implant/chem/Initialize()
. = ..()
- create_reagents(50)
+ create_reagents(50, OPENCONTAINER)
GLOB.tracked_chem_implants += src
/obj/item/implant/chem/Destroy()
diff --git a/code/game/objects/items/implants/implant_mindshield.dm b/code/game/objects/items/implants/implant_mindshield.dm
index ed930ee480..b9907cbfca 100644
--- a/code/game/objects/items/implants/implant_mindshield.dm
+++ b/code/game/objects/items/implants/implant_mindshield.dm
@@ -20,14 +20,14 @@
/obj/item/implant/mindshield/implant(mob/living/target, mob/user, silent = FALSE)
if(..())
if(!target.mind)
- target.add_trait(TRAIT_MINDSHIELD, "implant")
+ ADD_TRAIT(target, TRAIT_MINDSHIELD, "implant")
target.sec_hud_set_implants()
return TRUE
if(target.mind.has_antag_datum(/datum/antagonist/brainwashed))
target.mind.remove_antag_datum(/datum/antagonist/brainwashed)
- if(target.mind.has_antag_datum(/datum/antagonist/rev/head) || target.mind.unconvertable)
+ if(target.mind.has_antag_datum(/datum/antagonist/rev/head) || target.mind.unconvertable || target.mind.has_antag_datum(/datum/antagonist/gang/boss))
if(!silent)
target.visible_message("[target] seems to resist the implant!", "You feel something interfering with your mental conditioning, but you resist it!")
var/obj/item/implanter/I = loc
@@ -38,15 +38,18 @@
I.update_icon()
return FALSE
+ var/datum/antagonist/gang/gang = target.mind.has_antag_datum(/datum/antagonist/gang)
var/datum/antagonist/rev/rev = target.mind.has_antag_datum(/datum/antagonist/rev)
if(rev)
rev.remove_revolutionary(FALSE, user)
+ if(gang)
+ target.mind.remove_antag_datum(/datum/antagonist/gang)
if(!silent)
if(target.mind in SSticker.mode.cult)
to_chat(target, "You feel something interfering with your mental conditioning, but you resist it!")
else
to_chat(target, "You feel a sense of peace and security. You are now protected from brainwashing.")
- target.add_trait(TRAIT_MINDSHIELD, "implant")
+ ADD_TRAIT(target, TRAIT_MINDSHIELD, "implant")
target.sec_hud_set_implants()
return TRUE
return FALSE
@@ -55,7 +58,7 @@
if(..())
if(isliving(target))
var/mob/living/L = target
- L.remove_trait(TRAIT_MINDSHIELD, "implant")
+ REMOVE_TRAIT(L, TRAIT_MINDSHIELD, "implant")
L.sec_hud_set_implants()
if(target.stat != DEAD && !silent)
to_chat(target, "Your mind suddenly feels terribly vulnerable. You are no longer safe from brainwashing.")
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index 6db3699beb..3a4295c61e 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -33,24 +33,8 @@
/obj/item/implant/adrenalin/activate()
. = ..()
uses--
+ imp_in.do_adrenaline(150, TRUE, 0, 0, TRUE, list("inaprovaline" = 3, "synaptizine" = 10, "regen_jelly" = 10, "stimulants" = 10), "You feel a sudden surge of energy!")
to_chat(imp_in, "You feel a sudden surge of energy!")
- imp_in.SetSleeping(0)
- imp_in.SetStun(0)
- imp_in.SetKnockdown(0)
- imp_in.SetUnconscious(0)
- imp_in.adjustStaminaLoss(-150)
- imp_in.stuttering = 0
- imp_in.updatehealth()
- imp_in.update_stamina()
- imp_in.resting = 0
- imp_in.lying = 0
- imp_in.update_canmove()
-
- imp_in.reagents.add_reagent("inaprovaline", 3) //let's give another chance to dumb fucks who forget to breathe
- imp_in.reagents.add_reagent("synaptizine", 10)
- imp_in.reagents.add_reagent("omnizine", 10)
- imp_in.reagents.add_reagent("stimulants", 10)
-
if(!uses)
qdel(src)
diff --git a/code/game/objects/items/implants/implant_stealth.dm b/code/game/objects/items/implants/implant_stealth.dm
index 84f9f5f454..eb58d76d1b 100644
--- a/code/game/objects/items/implants/implant_stealth.dm
+++ b/code/game/objects/items/implants/implant_stealth.dm
@@ -9,6 +9,7 @@
name = "inconspicious box"
desc = "It's so normal that you didn't notice it before."
icon_state = "agentbox"
+ max_integrity = 1
use_mob_movespeed = TRUE
/obj/structure/closet/cardboard/agent/proc/go_invisible()
diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm
index 36c79bd454..781e1fa562 100644
--- a/code/game/objects/items/implants/implantchair.dm
+++ b/code/game/objects/items/implants/implantchair.dm
@@ -185,7 +185,7 @@
objective = stripped_input(usr,"What order do you want to imprint on [C]?","Enter the order","",120)
message_admins("[ADMIN_LOOKUPFLW(user)] set brainwash machine objective to '[objective]'.")
log_game("[key_name(user)] set brainwash machine objective to '[objective]'.")
- if(C.has_trait(TRAIT_MINDSHIELD))
+ if(HAS_TRAIT(C, TRAIT_MINDSHIELD))
return FALSE
brainwash(C, objective)
message_admins("[ADMIN_LOOKUPFLW(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.")
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index 6194c4d9ca..02d0a1c36a 100644
--- a/code/game/objects/items/manuals.dm
+++ b/code/game/objects/items/manuals.dm
@@ -37,7 +37,7 @@
It really is that easy! Good luck!
-
+