The [G.name] Gang:
" - len_before_addition = round_credits.len - for(var/datum/mind/boss in G.leaders) - round_credits += "[boss.name] as a [G.name] Gang leader
" - for(var/datum/mind/gangster in (G.members - G.leaders)) - round_credits += "[gangster.name] as a [G.name] gangster
" - if(len_before_addition == round_credits.len) - round_credits += list("The [G.name] Gang was wiped out!
", "The competition was too tough!
") - round_credits += "" - - round_credits += ..() - return round_credits diff --git a/code/game/gamemodes/gangs/gangtool.dm b/code/game/gamemodes/gangs/gangtool.dm deleted file mode 100644 index 70774feb7ec8c..0000000000000 --- a/code/game/gamemodes/gangs/gangtool.dm +++ /dev/null @@ -1,254 +0,0 @@ -//gangtool device -/obj/item/device/gangtool - name = "suspicious device" - desc = "A strange device of sorts. Hard to really make out what it actually does if you don't know how to operate it." - icon = 'icons/obj/device.dmi' - icon_state = "gangtool" - item_state = "radio" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' - throwforce = 0 - w_class = WEIGHT_CLASS_TINY - throw_speed = 3 - throw_range = 7 - flags_1 = CONDUCT_1 - var/datum/team/gang/gang //Which gang uses this? - var/recalling = 0 - var/outfits = 2 - var/free_pen = 0 - var/promotable = FALSE - var/static/list/buyable_items = list() - var/list/tags = list() - -/obj/item/device/gangtool/Initialize(mapload) - ..() - update_icon() - for(var/i in subtypesof(/datum/gang_item)) - var/datum/gang_item/G = i - var/id = initial(G.id) - var/cat = initial(G.category) - if(id) - if(!islist(buyable_items[cat])) - buyable_items[cat] = list() - buyable_items[cat][id] = new G - -/obj/item/device/gangtool/Destroy() - if(gang) - gang.gangtools -= src - return ..() - -/obj/item/device/gangtool/attack_self(mob/user) - ..() - if (!can_use(user)) - return - var/datum/antagonist/gang/boss/L = user.mind.has_antag_datum(/datum/antagonist/gang/boss) - var/dat - if(!gang) - dat += "This device is not registered.
" - if(L) - if(promotable && L.gang.leaders.len < L.gang.max_leaders) - dat += "Give this device to another member of your organization to use to promote them to Lieutenant.
" - dat += "If this is meant as a spare device for yourself:
" - dat += "Register Device as Spare
" - else if(promotable) - var/datum/antagonist/gang/sweet = user.mind.has_antag_datum(/datum/antagonist/gang) - if(sweet.gang.leaders.len < sweet.gang.max_leaders) - dat += "You have been selected for a promotion!
" - dat += "Accept Promotion
" - else - dat += "No promotions available: All positions filled.
" - else - dat += "This device is not authorized to promote.
" - else - dat += "Registration: [gang.name] Gang Boss
" - dat += "Organization Size: [gang.members.len] | Station Control: [gang.territories.len] territories under control. | Influence: [gang.influence]
" - dat += "Time until Influence grows: [time2text(gang.next_point_time - world.time, "mm:ss")]
" - dat += "Send message to Gang
" - dat += "Recall shuttle
" - dat += "
" - for(var/cat in buyable_items) - dat += "[cat]
" - for(var/id in buyable_items[cat]) - var/datum/gang_item/G = buyable_items[cat][id] - if(!G.can_see(user, gang, src)) - continue - - var/cost = G.get_cost_display(user, gang, src) - if(cost) - dat += cost + " " - - var/toAdd = G.get_name_display(user, gang, src) - if(G.can_buy(user, gang, src)) - toAdd = "[toAdd]" - dat += toAdd - var/extra = G.get_extra_info(user, gang, src) - if(extra) - dat += "
[extra]" - dat += "
" - dat += "
" - - dat += "Refresh
" - - var/datum/browser/popup = new(user, "gangtool", "Welcome to GangTool v4.0", 340, 625) - popup.set_content(dat) - popup.open() - -/obj/item/device/gangtool/Topic(href, href_list) - if(!can_use(usr)) - return - - add_fingerprint(usr) - - if(href_list["register"]) - register_device(usr) - - else if(!gang) //Gangtool must be registered before you can use the functions below - return - - if(href_list["purchase"]) - if(islist(buyable_items[href_list["cat"]])) - var/list/L = buyable_items[href_list["cat"]] - var/datum/gang_item/G = L[href_list["id"]] - if(G && G.can_buy(usr, gang, src)) - G.purchase(usr, gang, src, FALSE) - - if(href_list["commute"]) - ping_gang(usr) - if(href_list["recall"]) - recall(usr) - attack_self(usr) - -/obj/item/device/gangtool/update_icon() - overlays.Cut() - var/image/I = new(icon, "[icon_state]-overlay") - if(gang) - I.color = gang.color - overlays.Add(I) - -/obj/item/device/gangtool/proc/ping_gang(mob/user) - if(!can_use(user)) - return - var/message = stripped_input(user,"Discreetly send a gang-wide message.","Send Message") - if(!message || !can_use(user)) - return - if(!is_station_level(user.z)) - to_chat(user, "[icon2html(src, user)]Error: Station out of range.") - return - if(gang.members.len) - var/datum/antagonist/gang/G = user.mind.has_antag_datum(/datum/antagonist/gang) - if(!G) - return - var/ping = "[gang.name] [G.message_name] [user.real_name]: [message]" - for(var/datum/mind/ganger in gang.members) - if(ganger.current && is_station_level(ganger.current.z) && (ganger.current.stat == CONSCIOUS)) - to_chat(ganger.current, ping) - for(var/mob/M in GLOB.dead_mob_list) - var/link = FOLLOW_LINK(M, user) - to_chat(M, "[link] [ping]") - user.log_talk(message,LOG_SAY, tag="[gang.name] gangster") - -/obj/item/device/gangtool/proc/register_device(mob/user) - if(gang) //It's already been registered! - return - var/datum/antagonist/gang/G = user.mind.has_antag_datum(/datum/antagonist/gang) - if(G) - gang = G.gang - gang.gangtools += src - update_icon() - if(!(user.mind in gang.leaders) && promotable) - G.promote() - free_pen = TRUE - gang.message_gangtools("[user] has been promoted to Lieutenant.") - to_chat(user, "The Gangtool you registered will allow you to purchase weapons and equipment, and send messages to your gang.") - to_chat(user, "Unlike regular gangsters, you may use recruitment pens to add recruits to your gang. Use them on unsuspecting crew members to recruit them. Don't forget to get your one free pen from the gangtool.") - else - to_chat(user, "ACCESS DENIED: Unauthorized user.") - -/obj/item/device/gangtool/proc/recall(mob/user) - if(!recallchecks(user)) - return - if(recalling) - to_chat(user, "Error: Recall already in progress.") - return - gang.message_gangtools("[user] is attempting to recall the emergency shuttle.") - recalling = TRUE - to_chat(user, "[icon2html(src, loc)]Generating shuttle recall order with codes retrieved from last call signal...") - addtimer(CALLBACK(src, PROC_REF(recall2), user), rand(100,300)) - -/obj/item/device/gangtool/proc/recall2(mob/user) - if(!recallchecks(user)) - return - to_chat(user, "[icon2html(src, loc)]Shuttle recall order generated. Accessing station long-range communication arrays...") - addtimer(CALLBACK(src, PROC_REF(recall3), user), rand(100,300)) - -/obj/item/device/gangtool/proc/recall3(mob/user) - if(!recallchecks(user)) - return - var/list/living_crew = list()//shamelessly copied from mulligan code, there should be a helper for this - living_crew = get_living_station_crew() - var/malc = CONFIG_GET(number/midround_antag_life_check) - if(living_crew.len / GLOB.joined_player_list.len <= malc) //Shuttle cannot be recalled if too many people died - to_chat(user, "[icon2html(src, user)]Error: Station communication systems compromised. Unable to establish connection.") - recalling = FALSE - return - to_chat(user, "[icon2html(src, loc)]Comm arrays accessed. Broadcasting recall signal...") - addtimer(CALLBACK(src, PROC_REF(recallfinal), user), rand(100,300)) - -/obj/item/device/gangtool/proc/recallfinal(mob/user) - if(!recallchecks(user)) - return - recalling = FALSE - log_game("[key_name(user)] has tried to recall the shuttle with a gangtool.") - message_admins("[key_name_admin(user)] has tried to recall the shuttle with a gangtool.", 1) - if(SSshuttle.cancelEvac(user)) - gang.recalls-- - return TRUE - - to_chat(user, "[icon2html(src, loc)]No response received. Emergency shuttle cannot be recalled at this time.") - return - -/obj/item/device/gangtool/proc/recallchecks(mob/user) - if(!can_use(user)) - return - if(SSshuttle.emergencyNoRecall) - return - if(!gang.recalls) - to_chat(user, "Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts.") - return - if(SSshuttle.emergency.mode != SHUTTLE_CALL) //Shuttle can only be recalled when it's moving to the station - to_chat(user, "[icon2html(src, user)]Emergency shuttle cannot be recalled at this time.") - recalling = FALSE - return - if(!is_station_level(user.z)) //Shuttle can only be recalled while on station - to_chat(user, "[icon2html(src, user)]Error: Device out of range of station communication arrays.") - recalling = FALSE - return - return TRUE - -/obj/item/device/gangtool/proc/can_use(mob/living/carbon/human/user) - if(!istype(user)) - return - if(user.incapacitated()) - return - if(!(src in user.contents)) - return - if(!user.mind) - return - var/datum/antagonist/gang/G = user.mind.has_antag_datum(/datum/antagonist/gang) - if(!G) - to_chat(user, "Huh, what's this?") - return - if(!isnull(gang) && G.gang != gang) - to_chat(user, "You cannot use gang tools owned by enemy gangs!") - return - else if(!G.gang.check_gangster_swag(user)>1) - to_chat(user, "You cannot use gang tools while undercover!") - return - return TRUE - - -/obj/item/device/gangtool/spare - outfits = TRUE - -/obj/item/device/gangtool/spare/lt - promotable = TRUE diff --git a/code/game/gamemodes/gangs/implant_gang.dm b/code/game/gamemodes/gangs/implant_gang.dm deleted file mode 100644 index 0cab2aa4b9baf..0000000000000 --- a/code/game/gamemodes/gangs/implant_gang.dm +++ /dev/null @@ -1,67 +0,0 @@ -/obj/item/implant/gang - name = "gang implant" - desc = "Makes you a gangster or such." - activated = 0 - var/datum/team/gang/gang - -CREATION_TEST_IGNORE_SUBTYPES(/obj/item/implant/gang) - -/obj/item/implant/gang/Initialize(mapload, loc, setgang) - ..() - gang = setgang - -/obj/item/implant/gang/get_data() - var/dat = {"Implant Specifications:
- Name: Criminal brainwash implant
- Life: A few seconds after injection.
- Important Notes: Illegal
-
- Implant Details:
- Function: Contains a small pod of nanobots that change the host's brain to be loyal to a certain organization.
- Notice: Latest NT Mindshield implants counteract the effect of this implant.
- Integrity: Latest NT Mindshield will neutralize this implant."} - return dat - -/obj/item/implant/gang/implant(mob/living/target, mob/user, silent = 0) - if(!target || !target.mind || target.stat == DEAD || !ishuman(target) || !..()) - return FALSE - if (HAS_TRAIT(target, TRAIT_MINDSHIELD)) - target.visible_message("[target] seems to resist the implant!", "You resist the gang implant. You are reminded of the anti-gang PSA instead.") - return FALSE - - var/datum/antagonist/gang/G = target.mind.has_antag_datum(/datum/antagonist/gang) - if(G) - if(G.gang == G || istype(G, /datum/antagonist/gang/boss)) - return FALSE - target.mind.remove_antag_datum(/datum/antagonist/gang) - target.mind.add_antag_datum(/datum/antagonist/gang, gang) - qdel(src) - return TRUE - -/obj/item/implanter/gang - name = "implanter (gang)" - -CREATION_TEST_IGNORE_SUBTYPES(/obj/item/implanter/gang) - -/obj/item/implanter/gang/Initialize(mapload, loc, gang) - if(!gang) - qdel(src) - return - imp = new /obj/item/implant/gang(src,gang) - ..() - - - -/obj/item/implant/mindshield/implant(mob/living/target, mob/user, silent = FALSE) //putting this here, pls no bulli. - qwerty - if(..()) - if(!target.mind) - return TRUE - if(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!") - removed(target, 1) - qdel(src) - return FALSE - target.mind.remove_antag_datum(/datum/antagonist/gang) - return TRUE - return FALSE diff --git a/code/game/gamemodes/gangs/outfits.dm b/code/game/gamemodes/gangs/outfits.dm deleted file mode 100644 index 1b3d43e466416..0000000000000 --- a/code/game/gamemodes/gangs/outfits.dm +++ /dev/null @@ -1,32 +0,0 @@ -/datum/outfit/crook - name = "Level 1 - Crook" - uniform = /obj/item/clothing/under/color/grey - id = /obj/item/card/id - ears = /obj/item/radio/headset - back = /obj/item/storage/backpack - shoes = /obj/item/clothing/shoes/sneakers/black - - l_pocket = /obj/item/switchblade - r_pocket = /obj/item/crowbar/red - - backpack_contents = list( /obj/item/storage/box/survival=1,\ - /obj/item/toy/crayon/spraycan/gang = 1) - -/datum/outfit/boss - name = "Level 50 - Boss" - uniform = /obj/item/clothing/under/color/grey - id = /obj/item/card/id - belt = /obj/item/storage/belt/military/gang - gloves = /obj/item/clothing/gloves/gang - neck = /obj/item/clothing/neck/necklace/dope - shoes = /obj/item/clothing/shoes/gang - ears = /obj/item/radio/headset - back = /obj/item/storage/backpack - mask = /obj/item/clothing/mask/gskull - - l_pocket = /obj/item/pen/gang - r_pocket = /obj/item/switchblade - - backpack_contents = list( /obj/item/storage/box/survival=1,\ - /obj/item/device/gangtool/spare=1,\ - /obj/item/restraints/legcuffs/bola/energy = 1) diff --git a/code/game/gamemodes/legacy_gang_outfits.dm b/code/game/gamemodes/legacy_gang_outfits.dm new file mode 100644 index 0000000000000..2ac89491ad5d7 --- /dev/null +++ b/code/game/gamemodes/legacy_gang_outfits.dm @@ -0,0 +1,176 @@ +//Thead's how mafia works (too funny for me to not keep in game) + +/datum/outfit/crook + name = "Level 1 - Crook" + uniform = /obj/item/clothing/under/color/grey + id = /obj/item/card/id + ears = /obj/item/radio/headset + back = /obj/item/storage/backpack + shoes = /obj/item/clothing/shoes/sneakers/black + l_pocket = /obj/item/switchblade + r_pocket = /obj/item/crowbar/red + + backpack_contents = list( /obj/item/storage/box/survival=1,\ + /obj/item/toy/crayon/spraycan = 1) + +/datum/outfit/boss + name = "Level 50 - Boss" + uniform = /obj/item/clothing/under/color/grey + id = /obj/item/card/id + belt = /obj/item/storage/belt/military/gang + gloves = /obj/item/clothing/gloves/gang + neck = /obj/item/clothing/neck/necklace/dope + shoes = /obj/item/clothing/shoes/gang + ears = /obj/item/radio/headset + back = /obj/item/storage/backpack + mask = /obj/item/clothing/mask/gskull + + r_pocket = /obj/item/switchblade + + backpack_contents = list( /obj/item/storage/box/survival=1,\ + /obj/item/restraints/legcuffs/bola/energy = 1) + + +/datum/outfit/clandestine + name = "Clandestine" + head = /obj/item/clothing/head/beanie/black + uniform = /obj/item/clothing/under/syndicate/combat + suit = /obj/item/clothing/suit/jacket/bomber + +/datum/outfit/prima + name = "Prima" + head = /obj/item/clothing/head/costume/chicken + uniform = /obj/item/clothing/under/color/yellow + suit = /obj/item/clothing/suit/costume/chickensuit + +/datum/outfit/zerog + name = "Zero-G" + uniform = /obj/item/clothing/under/color/blue + suit = /obj/item/clothing/suit/apron + head = /obj/item/clothing/head/beanie/stripedblue + +/datum/outfit/max + name = "Max" + head = /obj/item/clothing/head/hats/tophat + uniform = /obj/item/clothing/under/costume/joker + suit = /obj/item/clothing/suit/costume/joker + +/datum/outfit/blasto + name = "Blasto" + head = /obj/item/clothing/head/beret/navy + uniform = /obj/item/clothing/under/suit/navy + suit = /obj/item/clothing/suit/jacket/miljacket + +/datum/outfit/waffle + name = "Waffle" + head = /obj/item/clothing/head/costume/sombrero/green + uniform = /obj/item/clothing/under/suit/green + suit = /obj/item/clothing/suit/costume/poncho/green + +/datum/outfit/north + name = "North" + head = /obj/item/clothing/head/costume/snowman + uniform = /obj/item/clothing/under/suit/white + suit = /obj/item/clothing/suit/costume/snowman + +/datum/outfit/omni + name = "Omni" + head = /obj/item/clothing/head/soft/blue + uniform = /obj/item/clothing/under/color/teal + suit = /obj/item/clothing/suit/apron/overalls + +/datum/outfit/newton + name = "Newton" + head = /obj/item/clothing/head/costume/griffin + uniform = /obj/item/clothing/under/color/brown + suit = /obj/item/clothing/suit/toggle/owlwings/griffinwings + +/datum/outfit/cyber + name = "Cyber" + head = /obj/item/clothing/head/helmet/rus_ushanka + uniform = /obj/item/clothing/under/color/darkblue + suit = /obj/item/clothing/suit/jacket/officer/tan + +/datum/outfit/donk + name = "Donk" + head = /obj/item/clothing/head/beret/black + uniform = /obj/item/clothing/under/color/green + suit = /obj/item/clothing/suit/jacket/puffer/vest + +/datum/outfit/gene + name = "Gene" + head = /obj/item/clothing/head/soft/green + uniform = /obj/item/clothing/under/color/green + suit = /obj/item/clothing/suit/toggle/labcoat/mad + +/datum/outfit/gib + name = "Gib" + uniform = /obj/item/clothing/under/color/black + suit = /obj/item/clothing/suit/toggle/lawyer/black + head = /obj/item/clothing/head/hats/bowler + +/datum/outfit/diablo + name = "Diablo" + uniform = /obj/item/clothing/under/color/red + suit = /obj/item/clothing/suit/jacket/leather + head = /obj/item/clothing/head/beret + +/datum/outfit/psyke + name = "Psyke" + head = /obj/item/clothing/head/soft/rainbow + suit = /obj/item/clothing/suit/costume/poncho/ponchoshame + uniform = /obj/item/clothing/under/color/rainbow + +/datum/outfit/osiron + name = "Osiron" + uniform = /obj/item/clothing/under/costume/roman + head = /obj/item/clothing/head/helmet/roman/legionnaire/fake + suit = /obj/item/clothing/suit/toggle/owlwings + +/datum/outfit/sirius + name = "Sirius" + head = /obj/item/clothing/head/fedora + uniform = /obj/item/clothing/under/color/white + suit = /obj/item/clothing/suit/costume/nerdshirt + +/datum/outfit/sleepingcarp + name = "Sleeping Carp" + uniform = /obj/item/clothing/under/color/lightpurple + suit = /obj/item/clothing/suit/toggle/lawyer/purple + head = /obj/item/clothing/head/hooded/carp_hood + +/datum/outfit/rigatonifamily + name = "Rigatoni family" + uniform = /obj/item/clothing/under/rank/civilian/chef + suit = /obj/item/clothing/suit/apron/chef + head = /obj/item/clothing/head/utility/chefhat + +/datum/outfit/weed + name = "Weed" + head = /obj/item/clothing/head/beanie/rasta + uniform = /obj/item/clothing/under/color/green + suit = /obj/item/clothing/suit/costume/vapeshirt + +// Item path defines for icon states and such + +/obj/item/clothing/shoes/gang + name = "blinged-out boots" + desc = "Stand aside peasants." + icon_state = "bling" + +/obj/item/storage/belt/military/gang + name = "badass belt" + icon_state = "gangbelt" + item_state = "gang" + desc = "The belt buckle simply reads 'BAMF'." + +/obj/item/clothing/mask/gskull + name = "golden death mask" + icon_state = "gskull" + desc = "Strike terror, and envy, into the hearts of your enemies." + +/obj/item/clothing/gloves/gang + name = "braggadocio's brass knuckles" + desc = "Purely decorative, don't find out the hard way." + icon_state = "knuckles" + w_class = 3 diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm deleted file mode 100644 index 14dacc54017f0..0000000000000 --- a/code/game/gamemodes/meteor/meteor.dm +++ /dev/null @@ -1,61 +0,0 @@ -/datum/game_mode/meteor - name = "meteor" - config_tag = "meteor" - report_type = "meteor" - false_report_weight = 1 - var/meteordelay = 2000 - var/nometeors = 0 - var/rampupdelta = 5 - required_players = 0 - - announce_span = "danger" - announce_text = "A major meteor shower is bombarding the station! The crew needs to evacuate or survive the onslaught." - - title_icon = "meteor" - -/datum/game_mode/meteor/process() - if(nometeors || meteordelay > world.time - SSticker.round_start_time) - return - - var/list/wavetype = GLOB.meteors_normal - var/meteorminutes = (world.time - SSticker.round_start_time - meteordelay) / 600 - - - if (prob(meteorminutes)) - wavetype = GLOB.meteors_threatening - - if (prob(meteorminutes/2)) - wavetype = GLOB.meteors_catastrophic - - var/ramp_up_final = clamp(round(meteorminutes/rampupdelta), 1, 10) - - spawn_meteors(ramp_up_final, wavetype) - - -/datum/game_mode/meteor/special_report() - var/survivors = 0 - var/list/survivor_list = list() - - for(var/mob/living/player in GLOB.player_list) - if(player.stat != DEAD) - ++survivors - - if(player.onCentCom()) - survivor_list += "[player.real_name] escaped to the safety of CentCom." - else if(player.onSyndieBase()) - survivor_list += "[player.real_name] escaped to the (relative) safety of Syndicate Space." - else - survivor_list += "[player.real_name] survived but is stranded without any hope of rescue." - - if(survivors) - return "
The following survived the meteor storm:
[survivor_list.Join("
")]
"
- else
- return "[survivor_list.Join("
")]
Nobody survived the meteor storm!
"
-
-/datum/game_mode/meteor/set_round_result()
- ..()
- SSticker.mode_result = "end - evacuation"
-
-/datum/game_mode/meteor/generate_report()
- return "[pick("Asteroids have", "Meteors have", "Large rocks have", "Stellar minerals have", "Space hail has", "Debris has")] been detected near your station, and a collision is possible, \
- though unlikely. Be prepared for largescale impacts and destruction. Please note that the debris will prevent the escape shuttle from arriving quickly."
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index c601d2943920c..5b20f01310cde 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -125,7 +125,7 @@
l_pocket = /obj/item/modular_computer/tablet/nukeops
id = /obj/item/card/id/syndicate
belt = /obj/item/gun/ballistic/automatic/pistol
- backpack_contents = list(/obj/item/storage/box/syndie=1,\
+ backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
/obj/item/knife/combat/survival)
var/tc = 25
@@ -173,7 +173,7 @@
internals_slot = ITEM_SLOT_RPOCKET
belt = /obj/item/storage/belt/military
r_hand = /obj/item/gun/ballistic/shotgun/automatic/bulldog
- backpack_contents = list(/obj/item/storage/box/syndie=1,\
+ backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
/obj/item/tank/jetpack/oxygen/harness=1,\
/obj/item/gun/ballistic/automatic/pistol=1,\
/obj/item/knife/combat/survival)
diff --git a/code/game/gamemodes/objectives/_objective.dm b/code/game/gamemodes/objectives/_objective.dm
index 4f6ebea4e7ec0..35c943dce172d 100644
--- a/code/game/gamemodes/objectives/_objective.dm
+++ b/code/game/gamemodes/objectives/_objective.dm
@@ -126,10 +126,10 @@ GLOBAL_LIST(admin_objective_list) //Prefilled admin assignable objective list
/datum/objective/proc/get_crewmember_minds()
. = list()
- for(var/datum/data/record/R as() in GLOB.data_core.locked)
- var/datum/mind/M = R.fields["mindref"]
- if(M)
- . += M
+ for(var/datum/record/locked/target in GLOB.manifest.locked)
+ var/datum/mind/mind = target.weakref_mind.resolve()
+ if(mind)
+ . += mind
//dupe_search_range is a list of antag datums / minds / teams
/datum/objective/proc/find_target(list/dupe_search_range, list/blacklist)
diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm
deleted file mode 100644
index 4990b81131ab8..0000000000000
--- a/code/game/gamemodes/sandbox/h_sandbox.dm
+++ /dev/null
@@ -1,298 +0,0 @@
-
-
-GLOBAL_VAR_INIT(hsboxspawn, TRUE)
-
-/mob/var/datum/hSB/sandbox = null
-
-/mob/proc/CanBuild()
- sandbox = new/datum/hSB
- sandbox.owner = src.ckey
- if(src.client.holder)
- sandbox.admin = 1
-
- add_verb(/mob/proc/sandbox_panel)
-/mob/proc/sandbox_panel()
- set name = "Sandbox Panel"
- set category = "Sandbox"
- if(sandbox)
- sandbox.update()
-
-/datum/hSB
- var/owner = null
- var/admin = 0
-
- var/static/clothinfo = null
- var/static/reaginfo = null
- var/static/objinfo = null
- var/canisterinfo = null
- var/hsbinfo = null
- //items that shouldn't spawn on the floor because they would bug or act weird
- var/static/list/spawn_forbidden = list(
- /obj/item/tk_grab, /obj/item/implant, // not implanter, the actual thing that is inside you
- /obj/item/assembly, /obj/item/robot_module,
- /obj/item/small_delivery, /obj/projectile,
- /obj/item/borg/sight, /obj/item/borg/stun
- )
-
-/datum/hSB/proc/update()
- var/static/list/hrefs = list(
- "Space Gear",
- "Suit Up (Space Travel Gear)" = "hsbsuit",
- "Spawn Gas Mask" = "hsbspawn&path=[/obj/item/clothing/mask/gas]",
- "Spawn Emergency Air Tank" = "hsbspawn&path=[/obj/item/tank/internals/emergency_oxygen/double]",
-
- "Standard Tools",
- "Spawn Flashlight" = "hsbspawn&path=[/obj/item/flashlight]",
- "Spawn Toolbox" = "hsbspawn&path=[/obj/item/storage/toolbox/mechanical]",
- "Spawn Tier 4 BSRPED" = "hsbspawn&path=[/obj/item/storage/part_replacer/bluespace/tier4]",
- "Spawn Toolbelt" = "hsbspawn&path=[/obj/item/storage/belt/utility/chief/full]",
- "Spawn Light Replacer" = "hsbspawn&path=[/obj/item/lightreplacer]",
- "Spawn Medical Kit" = "hsbspawn&path=[/obj/item/storage/firstaid/regular]",
- "Spawn All-Access ID" = "hsbaaid",
-
- "Building Supplies",
- "Spawn 50 Wood" = "hsbwood",
- "Spawn 50 Iron" = "hsbiron",
- "Spawn 50 Plasteel" = "hsbplasteel",
- "Spawn 50 Reinforced Glass" = "hsbrglass",
- "Spawn 50 Glass" = "hsbglass",
- "Spawn Full Cable Coil" = "hsbspawn&path=[/obj/item/stack/cable_coil]",
- "Spawn Hyper Capacity Power Cell" = "hsbspawn&path=[/obj/item/stock_parts/cell/hyper]",
- "Spawn Inf. Capacity Power Cell" = "hsbspawn&path=[/obj/item/stock_parts/cell/infinite]",
- "Spawn Rapid Construction Device" = "hsbrcd",
- "Spawn RCD Ammo" = "hsb_safespawn&path=[/obj/item/rcd_ammo]",
-
- "Miscellaneous",
- "Spawn Air Scrubber" = "hsbscrubber",
- "Spawn Debug Tech Disk" = "hsbspawn&path=[/obj/item/disk/tech_disk/debug]",
- "Spawn All Materials" = "hsbspawn&path=[/obj/structure/closet/syndicate/resources/everything]",
- "Spawn Water Tank" = "hsbspawn&path=[/obj/structure/reagent_dispensers/watertank]",
-
- "Bots",
- "Spawn Cleanbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/cleanbot]",
- "Spawn Floorbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/floorbot]",
- "Spawn Medbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/medbot]",
-
- "Canisters",
- "Spawn O2 Canister" = "hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/oxygen]",
- "Spawn Air Canister" = "hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/air]")
-
-
- if(!hsbinfo)
- hsbinfo = "" - if(admin) - hsbinfo += "Administration
" - hsbinfo += "- Toggle Object Spawning
" - hsbinfo += "- Toggle Item Spawn Panel Auto-close
" - hsbinfo += "Canister Spawning
" - hsbinfo += "- Spawn Plasma Canister
" - hsbinfo += "- Spawn CO2 Canister
" - hsbinfo += "- Spawn Nitrogen Canister
" - hsbinfo += "- Spawn N2O Canister
" - else - hsbinfo += "Some item spawning may be disabled by the administrators.
" - hsbinfo += "Only administrators may spawn dangerous canisters.
" - for(var/T in hrefs) - var/href = hrefs[T] - if(href) - hsbinfo += "- [T]
" - else - hsbinfo += "
[T]
" - hsbinfo += "
" - hsbinfo += "- Spawn Clothing...
" - hsbinfo += "- Spawn Reagent Container...
" - hsbinfo += "- Spawn Other Item...
" - - usr << browse(hsbinfo, "window=hsbpanel") - -/datum/hSB/Topic(href, href_list) - if(!usr || !src || !(src.owner == usr.ckey)) - if(usr) - usr << browse(null,"window=sandbox") - return - - if(href_list["hsb"]) - switch(href_list["hsb"]) - // - // Admin: toggle spawning - // - if("hsbtobj") - if(!admin) return - if(GLOB.hsboxspawn) - to_chat(world, "Sandbox: \black[usr.key] has disabled object spawning!") - GLOB.hsboxspawn = FALSE - return - else - to_chat(world, "Sandbox: \black[usr.key] has enabled object spawning!") - GLOB.hsboxspawn = TRUE - return - // - // Admin: Toggle auto-close - // - if("hsbtac") - if(!admin) return - var/sbac = CONFIG_GET(flag/sandbox_autoclose) - if(sbac) - to_chat(world, "Sandbox: \black [usr.key] has removed the object spawn limiter.") - else - to_chat(world, "Sandbox: \black [usr.key] has added a limiter to object spawning. The window will now auto-close after use.") - CONFIG_SET(flag/sandbox_autoclose, !sbac) - return - // - // Spacesuit with full air jetpack set as internals - // - if("hsbsuit") - var/mob/living/carbon/human/P = usr - if(!istype(P)) return - if(P.wear_suit) - P.wear_suit.forceMove(P.drop_location()) - P.wear_suit.layer = initial(P.wear_suit.layer) - P.wear_suit.plane = initial(P.wear_suit.plane) - P.wear_suit = null - P.wear_suit = new/obj/item/clothing/suit/space(P) - P.wear_suit.plane = ABOVE_HUD_PLANE - P.update_inv_wear_suit() - if(P.head) - P.head.forceMove(P.drop_location()) - P.head.layer = initial(P.head.layer) - P.head.plane = initial(P.head.plane) - P.head = null - P.head = new/obj/item/clothing/head/helmet/space(P) - P.head.plane = ABOVE_HUD_PLANE - P.update_inv_head() - if(P.wear_mask) - P.wear_mask.forceMove(P.drop_location()) - P.wear_mask.layer = initial(P.wear_mask.layer) - P.wear_mask.plane = initial(P.wear_mask.plane) - P.wear_mask = null - P.wear_mask = new/obj/item/clothing/mask/gas(P) - P.wear_mask.plane = ABOVE_HUD_PLANE - P.update_inv_wear_mask() - if(P.back) - P.back.forceMove(P.drop_location()) - P.back.layer = initial(P.back.layer) - P.back.plane = initial(P.back.plane) - P.back = null - P.back = new/obj/item/tank/jetpack/oxygen(P) - P.back.plane = ABOVE_HUD_PLANE - P.update_inv_back() - P.internal = P.back - P.update_internals_hud_icon(1) - - if("hsbscrubber") // This is beyond its normal capability but this is sandbox and you spawned one, I assume you need it - var/obj/hsb = new/obj/machinery/portable_atmospherics/scrubber{volume_rate=50*ONE_ATMOSPHERE;on=1}(usr.loc) - hsb.update_icon() // hackish but it wasn't meant to be spawned I guess? - - // - // Stacked Materials - // - - if("hsbrglass") - new/obj/item/stack/sheet/rglass{amount=50}(usr.loc) - - if("hsbiron") - new/obj/item/stack/sheet/iron{amount=50}(usr.loc) - - if("hsbplasteel") - new/obj/item/stack/sheet/plasteel{amount=50}(usr.loc) - - if("hsbglass") - new/obj/item/stack/sheet/glass{amount=50}(usr.loc) - - if("hsbwood") - new/obj/item/stack/sheet/wood{amount=50}(usr.loc) - - // - // All access ID - // - if("hsbaaid") - var/obj/item/card/id/gold/ID = new(usr.loc) - ID.registered_name = usr.real_name - ID.assignment = "Sandbox" - ID.access = get_all_accesses() - ID.update_label() - - // - // RCD - starts with full clip - // Spawn check due to grief potential (destroying floors, walls, etc) - // - if("hsbrcd") - if(!GLOB.hsboxspawn) return - - new/obj/item/construction/rcd/combat(usr.loc) - - // - // Object spawn window - // - - // Clothing - if("hsbcloth") - if(!GLOB.hsboxspawn) return - - if(!clothinfo) - clothinfo = "Clothing (Reagent Containers) (Other Items)
" - var/list/all_items = subtypesof(/obj/item/clothing) - for(var/typekey in spawn_forbidden) - all_items -= typesof(typekey) - for(var/O in reverse_range(all_items)) - clothinfo += "[O]
" - - usr << browse(clothinfo,"window=sandbox") - - // Reagent containers - if("hsbreag") - if(!GLOB.hsboxspawn) return - - if(!reaginfo) - reaginfo = "Reagent Containers (Clothing) (Other Items)
" - var/list/all_items = subtypesof(/obj/item/reagent_containers) - for(var/typekey in spawn_forbidden) - all_items -= typesof(typekey) - for(var/O in reverse_range(all_items)) - reaginfo += "[O]
" - - usr << browse(reaginfo,"window=sandbox") - - // Other items - if("hsbobj") - if(!GLOB.hsboxspawn) return - - if(!objinfo) - objinfo = "Other Items (Clothing) (Reagent Containers)
" - var/list/all_items = subtypesof(/obj/item/) - typesof(/obj/item/clothing) - typesof(/obj/item/reagent_containers) - for(var/typekey in spawn_forbidden) - all_items -= typesof(typekey) - - for(var/O in reverse_range(all_items)) - objinfo += "[O]
" - - usr << browse(objinfo,"window=sandbox") - - // - // Safespawn checks to see if spawning is disabled. - // - if("hsb_safespawn") - if(!GLOB.hsboxspawn) - usr << browse(null,"window=sandbox") - return - - var/typepath = text2path(href_list["path"]) - if(!typepath) - to_chat(usr, "Bad path: \"[href_list["path"]]\"") - return - new typepath(usr.loc) - - if(CONFIG_GET(flag/sandbox_autoclose)) - usr << browse(null,"window=sandbox") - // - // For everything else in the href list - // - if("hsbspawn") - var/typepath = text2path(href_list["path"]) - if(!typepath) - to_chat(usr, "Bad path: \"[href_list["path"]]\"") - return - new typepath(usr.loc) - - if(CONFIG_GET(flag/sandbox_autoclose)) - usr << browse(null,"window=sandbox") diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm deleted file mode 100644 index afc5e2b1f344d..0000000000000 --- a/code/game/gamemodes/sandbox/sandbox.dm +++ /dev/null @@ -1,25 +0,0 @@ -/datum/game_mode/sandbox - name = "sandbox" - config_tag = "sandbox" - report_type = "sandbox" - required_players = 0 - - announce_span = "info" - announce_text = "Build your own station... or just shoot each other!" - - allow_persistence_save = FALSE - -/datum/game_mode/sandbox/pre_setup() - - CONFIG_SET(flag/allow_random_events, FALSE) //stops harmful events - - for(var/mob/M in GLOB.player_list) - M.CanBuild() - return 1 - -/datum/game_mode/sandbox/post_setup() - ..() - SSshuttle.registerHostileEnvironment(src) - -/datum/game_mode/sandbox/generate_report() - return "Sensors indicate that crewmembers have been all given psychic powers from which they can manifest various objects.
This can only end poorly." diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index fcda0cd57525b..b167b50532b3d 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -189,7 +189,7 @@ storedid.hud_state = get_hud_by_jobname(newidskin) // QoL to correct the system behavior - GLOB.data_core.manifest_modify(storedid.registered_name, storedid.assignment, storedid.hud_state) // update crew manifest + GLOB.manifest.modify(storedid.registered_name, storedid.assignment, storedid.hud_state) // update crew manifest // There are the same code lines in `card.dm` ejectid() else diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index baf6b9033b728..3608ff1f2d458 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -5,7 +5,6 @@ icon_state = "doorctrl" var/skin = "doorctrl" layer = ABOVE_WINDOW_LAYER - power_channel = AREA_USAGE_ENVIRON var/obj/item/assembly/device var/obj/item/electronics/airlock/board var/device_type = null diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index a36ef8d6d95ed..67f098cb93210 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -46,8 +46,10 @@ /// A copy of the last paper object that was shown to this camera. var/obj/item/paper/last_shown_paper - ///Represents a signal source of camera alarms about movement or camera tampering + ///Represents a signel source of camera alarms about movement or camera tampering var/datum/alarm_handler/alarm_manager + ///Proximity monitor associated with this atom, for motion sensitive cameras. + var/datum/proximity_monitor/proximity_monitor MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera, 0) MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/emp_proof, 0) @@ -134,7 +136,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/camera) SIGNAL_HANDLER update_camera(null, FALSE) -/obj/machinery/proc/create_prox_monitor() +/obj/machinery/camera/proc/create_prox_monitor() if(!proximity_monitor) proximity_monitor = new(src, 1) diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm index bbaa56dbab460..6bd0c9a6bb12c 100644 --- a/code/game/machinery/camera/motion.dm +++ b/code/game/machinery/camera/motion.dm @@ -82,7 +82,7 @@ /obj/machinery/camera/motion/thunderdome/Initialize(mapload) . = ..() - proximity_monitor.SetRange(7) + proximity_monitor.set_range(7) /obj/machinery/camera/motion/thunderdome/HasProximity(atom/movable/AM as mob|obj) if (!isliving(AM) || get_area(AM) != get_area(src)) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index a61e6ce240743..79e5ffd68661b 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -124,7 +124,7 @@ name = "cloning data disk" icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk. var/list/genetic_makeup_buffer = list() - var/list/fields = list() + var/datum/record/cloning/data var/list/mutations = list() var/max_mutations = 6 var/read_only = FALSE //Well,it's still a floppy disk @@ -180,7 +180,7 @@ . = (100 * ((mob_occupant.health + 100) / (heal_level + 100))) //Start growing a human clone in the pod! -/obj/machinery/clonepod/proc/growclone(clonename, ui, mutation_index, mindref, last_death, datum/species/mrace, list/features, factions, datum/bank_account/insurance, list/traumas, body_only, experimental) +/obj/machinery/clonepod/proc/growclone(clonename, ui, mutation_index, given_mind, last_death, datum/species/mrace, list/features, factions, datum/bank_account/insurance, list/traumas, body_only, experimental) var/result = CLONING_SUCCESS if(!reagents.has_reagent(/datum/reagent/medicine/synthflesh, fleshamnt)) connected_message("Cannot start cloning: Not enough synthflesh.") @@ -193,7 +193,7 @@ return ERROR_MISSING_EXPERIMENTAL_POD if(!body_only && !(experimental && experimental_pod)) - clonemind = locate(mindref) in SSticker.minds + clonemind = given_mind if(!istype(clonemind)) //not a mind return ERROR_NOT_MIND if(last_death<0) //presaved clone is not clonable diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 4f121b443a7e0..a93f78d53e534 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -489,12 +489,6 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( gamers[gamer] = -1 - if(!isnull(GLOB.data_core.general)) - for(var/datum/data/record/R in GLOB.data_core.general) - if(R.fields["name"] == gamer.name) - R.fields["m_stat"] = "*Unstable*" - return - /obj/machinery/computer/arcade/orion_trail/ui_interact(mob/user) . = ..() @@ -708,7 +702,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( if(isliving(usr)) var/mob/living/L = usr L.Stun(200, ignore_canstun = TRUE) //you can't run :^) - var/S = new /obj/anomaly/singularity/academy(usr.loc) + var/S = new /obj/anomaly/singularity/stationary(usr.loc) addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, say), "[S] winks out, just as suddenly as it appeared."), 50) QDEL_IN(S, 50) else diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 8144aa115344c..f51f057c762d8 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -181,7 +181,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) return TRUE /obj/machinery/computer/card/proc/update_modify_manifest() - GLOB.data_core.manifest_modify(inserted_modify_id.registered_name, inserted_modify_id.assignment, inserted_modify_id.hud_state) + GLOB.manifest.modify(inserted_modify_id.registered_name, inserted_modify_id.assignment, inserted_modify_id.hud_state) /obj/machinery/computer/card/AltClick(mob/user) ..() @@ -206,9 +206,9 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) return if (mode == 1) // accessing crew manifest var/crew = "" - for(var/datum/data/record/t in sort_record(GLOB.data_core.general)) - crew += t.fields["name"] + " - " + t.fields["rank"] + "
" - dat = "Crew Manifest:
Please use security record computer to modify entries.
[crew]Print
Return
" + for(var/datum/record/crew/record in sort_record(GLOB.manifest.general)) + crew += record.name + " - " + record.rank + "
" + dat = "Crew Manifest:
[crew]Print
Return
" - for(var/datum/data/record/t in sort_record(GLOB.data_core.general)) - t1 += t.fields["name"] + " - " + t.fields["rank"] + "
" + for(var/datum/record/crew/t in sort_record(GLOB.manifest.general)) + t1 += t.name + " - " + t.rank + "
" P.default_raw_text = t1 P.name = "paper- 'Crew Manifest'" printing = null diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 809e76965bef5..cfc91fb1bcd21 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -17,7 +17,6 @@ var/menu = 1 //Which menu screen to display var/use_records = TRUE //set this to false if you don't want the console to use records var/list/records = list() - var/datum/data/record/active_record var/obj/item/disk/data/diskette //Incompatible format to genetics machine //select which parts of the diskette to load var/include_se = FALSE //mutations @@ -37,15 +36,14 @@ /obj/machinery/computer/cloning/Destroy() if(pods) - for(var/P in pods) - DetachCloner(P) + for(var/pod in pods) + DetachCloner(pod) pods = null return ..() /obj/machinery/computer/cloning/proc/GetAvailablePod(mind = null) if(pods) - for(var/P in pods) - var/obj/machinery/clonepod/pod = P + for(var/obj/machinery/clonepod/pod as anything in pods) if(pod.occupant && pod.clonemind == mind) return null if(pod.is_operational && !(pod.occupant || pod.mess)) @@ -53,22 +51,20 @@ /obj/machinery/computer/cloning/proc/HasEfficientPod() if(pods) - for(var/P in pods) - var/obj/machinery/clonepod/pod = P + for(var/obj/machinery/clonepod/pod as anything in pods) if(pod.is_operational && pod.efficiency > 5) return TRUE /obj/machinery/computer/cloning/proc/GetAvailableEfficientPod(mind = null) if(pods) - for(var/P in pods) - var/obj/machinery/clonepod/pod = P + for(var/obj/machinery/clonepod/pod as anything in pods) if(pod.occupant && pod.clonemind == mind) return pod else if(!. && pod.is_operational && !(pod.occupant || pod.mess) && pod.efficiency > 5) . = pod -/proc/grow_clone_from_record(obj/machinery/clonepod/pod, datum/data/record/R, experimental) - return pod.growclone(R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mindref"], R.fields["last_death"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["bank_account"], R.fields["traumas"], R.fields["body_only"], experimental) +/proc/grow_clone_from_record(obj/machinery/clonepod/pod, datum/record/cloning/cloning_record, experimental) + return pod.growclone(cloning_record.name, cloning_record.uni_identity, cloning_record.SE, cloning_record.resolve_mind(), cloning_record.last_death, cloning_record.species, cloning_record.resolve_dna_features(), cloning_record.factions, cloning_record.resolve_mind_account_id(), cloning_record.traumas, cloning_record.body_only, experimental) /obj/machinery/computer/cloning/process() if(!(scanner && LAZYLEN(pods) && autoprocess)) @@ -78,8 +74,8 @@ scan_occupant(scanner.occupant) ui_update() - for(var/datum/data/record/R in records) - var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(R.fields["mindref"]) + for(var/datum/record/cloning/cloning_record in records) + var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(cloning_record.resolve_mind()) if(!pod) return @@ -87,13 +83,13 @@ if(pod.occupant) break - var/result = grow_clone_from_record(pod, R, experimental) + var/result = grow_clone_from_record(pod, cloning_record, experimental) if(result & CLONING_SUCCESS) - temp = "[R.fields["name"]] => Cloning cycle in progress..." - log_cloning("Cloning of [key_name(R.fields["mindref"])] automatically started via autoprocess - [src] at [AREACOORD(src)]. Pod: [pod] at [AREACOORD(pod)].") + temp = "[cloning_record.name] => Cloning cycle in progress..." + log_cloning("Cloning of [key_name(cloning_record.resolve_mind())] automatically started via autoprocess - [src] at [AREACOORD(src)]. Pod: [pod] at [AREACOORD(pod)].") SStgui.update_uis(src) if(result & CLONING_DELETE_RECORD) - records -= R + records -= cloning_record ui_update() @@ -156,13 +152,13 @@ pod.connected = null LAZYREMOVE(pods, pod) -/obj/machinery/computer/cloning/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/disk/data)) //INSERT SOME DISKETTES +/obj/machinery/computer/cloning/attackby(obj/item/used_item, mob/user, params) + if(istype(used_item, /obj/item/disk/data)) //INSERT SOME DISKETTES if (!diskette) - if (!user.transferItemToLoc(W,src)) + if (!user.transferItemToLoc(used_item,src)) return - diskette = W - to_chat(user, "You insert [W].") + diskette = used_item + to_chat(user, "You insert [used_item].") playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else return ..() @@ -195,20 +191,20 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) if(diskette) scantemp = "Disk Ejected" diskette.forceMove(drop_location()) - usr.put_in_active_hand(diskette) + user.put_in_active_hand(diskette) diskette = null playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) . = TRUE /obj/machinery/computer/cloning/proc/Save(mob/user, target) - var/datum/data/record/GRAB = null - for(var/datum/data/record/record in records) - if(record.fields["id"] == target) - GRAB = record + var/datum/record/cloning/cloning_record_copy = null + for(var/datum/record/cloning/record in records) + if(record.id == target) + cloning_record_copy = record break else continue - if(!GRAB || !GRAB.fields) + if(!cloning_record_copy) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) scantemp = "Failed saving to disk: Data Corruption" return FALSE @@ -216,29 +212,32 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) scantemp = !diskette ? "Failed saving to disk: No disk." : "Failed saving to disk: Disk refuses override attempt." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) return - diskette.fields = GRAB.fields.Copy() - diskette.name = "data disk - '[src.diskette.fields["name"]]'" + + diskette.data = new() + diskette.data.copy_to(cloning_record_copy) + + diskette.name = "data disk - '[src.diskette.data.name]'" scantemp = "Saved to disk successfully." playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) return TRUE /obj/machinery/computer/cloning/proc/DeleteRecord(mob/user, target) - var/datum/data/record/GRAB = null - for(var/datum/data/record/record in records) - if(record.fields["id"] == target) - GRAB = record + var/datum/record/cloning/cloning_record_copy = null + for(var/datum/record/cloning/record in records) + if(record.id == target) + cloning_record_copy = record break else continue - if(!GRAB) + if(!cloning_record_copy) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) scantemp = "Cannot delete: Data Corrupted." return FALSE var/obj/item/card/id/C = usr.get_idcard(hand_first = TRUE) if(istype(C) || istype(C, /obj/item/modular_computer/tablet)) if(check_access(C)) - scantemp = "[GRAB.fields["name"]] => Record deleted." - records.Remove(GRAB) + scantemp = "[cloning_record_copy.name] => Record deleted." + records.Remove(cloning_record_copy) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) var/obj/item/circuitboard/computer/cloning/board = circuit board.records = records @@ -247,19 +246,18 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) /obj/machinery/computer/cloning/proc/Load(mob/user) - if(!diskette || !istype(diskette.fields) || !diskette.fields["name"] || !diskette.fields) + if(!diskette || !diskette.data.name || !diskette.data) scantemp = "Failed loading: Load error." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) return - for(var/datum/data/record/R in records) - if(R.fields["id"] == diskette.fields["id"]) + for(var/datum/record/cloning/cloning_record in records) + if(cloning_record.id == diskette.data.id) scantemp = "Failed loading: Data already exists!" return FALSE - var/datum/data/record/R = new(src) - for(var/each in diskette.fields) - R.fields[each] = diskette.fields[each] + var/datum/record/cloning/cloning_record = new() + diskette.data.copy_to(cloning_record) - records += R + records += cloning_record scantemp = "Loaded into internal storage successfully." var/obj/item/circuitboard/computer/cloning/board = circuit board.records = records @@ -267,9 +265,12 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) return TRUE /obj/machinery/computer/cloning/proc/Clone(mob/user, target) - var/datum/data/record/C = find_record("id", target, records) + var/datum/record/cloning/clone_record + for(var/datum/record/cloning/record in records) + if(record.id == target) + clone_record = record //Look for that player! They better be dead! - if(C) + if(clone_record) var/obj/machinery/clonepod/pod = GetAvailablePod() //Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs. if(!LAZYLEN(pods)) @@ -285,15 +286,16 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) temp = "Warning: Cloning cycle already in progress." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) else - switch(pod.growclone(C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mindref"], C.fields["last_death"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["bank_account"], C.fields["traumas"], C.fields["body_only"], experimental)) + var/cloning_attempt_result = pod.growclone(clone_record.name, clone_record.uni_identity, clone_record.SE, clone_record.resolve_mind(), clone_record.last_death, clone_record.species, clone_record.resolve_dna_features(), clone_record.factions, clone_record.resolve_mind_account_id(), clone_record.traumas, clone_record.body_only, experimental) + switch(cloning_attempt_result) if(CLONING_SUCCESS) - temp = "Notice: [C.fields["name"]] => Cloning cycle in progress..." + temp = "Notice: [clone_record.name] => Cloning cycle in progress..." playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - if(!C.fields["body_only"]) - records.Remove(C) + if(!clone_record.body_only) + records.Remove(clone_record) return TRUE if(CLONING_SUCCESS_EXPERIMENTAL) - temp = "Notice: [C.fields["name"]] => Experimental cloning cycle in progress..." + temp = "Notice: [clone_record.name] => Experimental cloning cycle in progress..." playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) return TRUE if(ERROR_NO_SYNTHFLESH) @@ -309,30 +311,30 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) temp = "Error [ERROR_MISSING_EXPERIMENTAL_POD]: Experimental pod is not detected." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) if(ERROR_NOT_MIND) - temp = "Error [ERROR_NOT_MIND]: [C.fields["name"]]'s lack of their mind." + temp = "Error [ERROR_NOT_MIND]: [clone_record.name]'s lack of their mind." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) if(ERROR_PRESAVED_CLONE) - temp = "Error [ERROR_PRESAVED_CLONE]: [C.fields["name"]]'s clone record is presaved." + temp = "Error [ERROR_PRESAVED_CLONE]: [clone_record.name]'s clone record is presaved." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) if(ERROR_OUTDATED_CLONE) - temp = "Error [ERROR_OUTDATED_CLONE]: [C.fields["name"]]'s clone record is outdated." + temp = "Error [ERROR_OUTDATED_CLONE]: [clone_record.name]'s clone record is outdated." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) if(ERROR_ALREADY_ALIVE) - temp = "Error [ERROR_ALREADY_ALIVE]: [C.fields["name"]] already alive." + temp = "Error [ERROR_ALREADY_ALIVE]: [clone_record.name] already alive." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) if(ERROR_COMMITED_SUICIDE) - temp = "Error [ERROR_COMMITED_SUICIDE]: [C.fields["name"]] commited a suicide." + temp = "Error [ERROR_COMMITED_SUICIDE]: [clone_record.name] commited a suicide." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) if(ERROR_SOUL_DEPARTED) - temp = "Error [ERROR_SOUL_DEPARTED]: [C.fields["name"]]'s soul had departed." + temp = "Error [ERROR_SOUL_DEPARTED]: [clone_record.name]'s soul had departed." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) if(ERROR_SUICIDED_BODY) - temp = "Error [ERROR_SUICIDED_BODY]: Failed to capture [C.fields["name"]]'s mind from a suicided body." + temp = "Error [ERROR_SUICIDED_BODY]: Failed to capture [clone_record.name]'s mind from a suicided body." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) if(ERROR_SOUL_DAMNED) temp = "Err#^ [ERROR_SOUL_DAMNED]: #$%SGFG$#their@soul&is$mine@#%# => 1(i*i@%i$(t!0n $A!l^r#." if(ERROR_UNCLONABLE) - temp = "Error [ERROR_UNCLONABLE]: [C.fields["name"]] is not clonable." + temp = "Error [ERROR_UNCLONABLE]: [clone_record.name] is not clonable." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) else temp = "Error unknown => Initialisation failure." @@ -383,33 +385,33 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) if(scanner && HasEfficientPod() && scanner.scan_level >= AUTOCLONING_MINIMAL_LEVEL) data["hasAutoprocess"] = TRUE if(length(records)) - for(var/datum/data/record/R in records) + for(var/datum/record/cloning/cloning_record in records) var/list/record_entry = list() - record_entry["name"] = "[R.fields["name"]]" - record_entry["id"] = "[R.fields["id"]]" - var/obj/item/implant/health/H = locate(R.fields["imp"]) + record_entry["name"] = "[cloning_record.name]" + record_entry["id"] = "[cloning_record.id]" + var/obj/item/implant/health/H = cloning_record.implant if(H && istype(H)) record_entry["damages"] = H.sensehealth(TRUE) else record_entry["damages"] = FALSE - record_entry["UI"] = "[R.fields["UI"]]" - record_entry["UE"] = "[R.fields["UE"]]" - record_entry["blood_type"] = "[R.fields["blood_type"]]" - record_entry["last_death"] = R.fields["last_death"] - record_entry["body_only"] = R.fields["body_only"] + record_entry["UI"] = "[cloning_record.uni_identity]" + record_entry["UE"] = "[cloning_record.dna_string]" + record_entry["blood_type"] = "[cloning_record.blood_type]" + record_entry["last_death"] = cloning_record.last_death + record_entry["body_only"] = cloning_record.body_only records_to_send += list(record_entry) data["records"] = records_to_send else data["records"] = list() - if(diskette && diskette.fields) + if(diskette && diskette.data) var/list/disk_data = list() - disk_data["name"] = "[diskette.fields["name"]]" - disk_data["id"] = "[diskette.fields["id"]]" - disk_data["UI"] = "[diskette.fields["UI"]]" - disk_data["UE"] = "[diskette.fields["UE"]]" - disk_data["blood_type"] = "[diskette.fields["blood_type"]]" - disk_data["last_death"] = diskette.fields["last_death"] - disk_data["body_only"] = diskette.fields["body_only"] + disk_data["name"] = "[diskette.data.name]" + disk_data["id"] = "[diskette.data.id]" + disk_data["UI"] = "[diskette.data.uni_identity]" + disk_data["UE"] = "[diskette.data.dna_string]" + disk_data["blood_type"] = "[diskette.data.blood_type]" + disk_data["last_death"] = diskette.data.last_death + disk_data["body_only"] = diskette.data.body_only data["diskData"] = disk_data else data["diskData"] = list() @@ -438,6 +440,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) data["hasOccupant"] = scanner?.occupant data["recordsLength"] = "View Records ([length(records)])" data["experimental"] = experimental + data["diskette"] = diskette return data /obj/machinery/computer/cloning/ui_act(action, params) @@ -480,14 +483,14 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) ui.open() ui.set_autoupdate(TRUE) -/obj/machinery/computer/cloning/proc/finish_scan(mob/living/L, mob/user, prev_locked, body_only) - if(!scanner || !L) +/obj/machinery/computer/cloning/proc/finish_scan(mob/living/carbon_mob, mob/user, prev_locked, body_only) + if(!scanner || !carbon_mob) return - src.add_fingerprint(usr) + add_fingerprint(user) if(use_records) - scan_occupant(L, user, body_only) + scan_occupant(carbon_mob, user, body_only) else - clone_occupant(L, user) + clone_occupant(carbon_mob, user) loading = FALSE scanner.locked = prev_locked @@ -499,11 +502,11 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) var/mob/living/mob_occupant = get_mob_or_brainmob(occupant) var/datum/dna/dna if(ishuman(mob_occupant)) - var/mob/living/carbon/C = mob_occupant - dna = C.has_dna() + var/mob/living/carbon/carbon_mob = mob_occupant + dna = carbon_mob.has_dna() if(isbrain(mob_occupant)) - var/mob/living/brain/B = mob_occupant - dna = B.stored_dna + var/mob/living/brain/human_brain = mob_occupant + dna = human_brain.stored_dna if(!can_scan(dna, mob_occupant)) return var/clone_species @@ -568,79 +571,79 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) var/datum/bank_account/has_bank_account // Do not use unless you know what they are. - var/mob/living/carbon/C = mob_occupant - var/mob/living/brain/B = mob_occupant + var/mob/living/carbon/human/human_mob = mob_occupant + var/mob/living/brain/human_brain = mob_occupant if(ishuman(mob_occupant)) - dna = C.has_dna() - var/obj/item/card/id/I = C.get_idcard(TRUE) - if(I) - has_bank_account = I.registered_account + dna = human_mob.has_dna() + var/obj/item/card/id/human_id_card = human_mob.get_idcard(TRUE) + if(human_id_card) + has_bank_account = human_id_card.registered_account if(isbrain(mob_occupant)) - dna = B.stored_dna + dna = human_brain.stored_dna if(!can_scan(dna, mob_occupant, has_bank_account, body_only)) return - var/datum/data/record/R = new() + var/datum/record/cloning/cloning_record = new(null, 18, dna.blood_type, dna.unique_enzymes, md5(dna.uni_identity), mob_occupant.gender, mob_occupant.mind.assigned_role, mob_occupant.real_name, null, WEAKREF(dna), dna.uni_identity, dna.mutation_index, WEAKREF(mob_occupant.mind), FALSE, mob_occupant.faction, list(), body_only, null, dna.unique_enzymes, has_bank_account) + if(dna.species) // We store the instance rather than the path, because some // species (abductors, slimepeople) store state in their // species datums dna.delete_species = FALSE - R.fields["mrace"] = dna.species + cloning_record.species = dna.species else return //no dna info for species? you're not allowed to clone them. Don't harass xeno, don't try xeno farm. //Note: if you want to clone unusual species, you need to check 'carbon/human' rather than 'dna.species' - R.fields["name"] = mob_occupant.real_name + cloning_record.name = mob_occupant.real_name if(experimental) //even if you have the same identity, this will give you different id based on your mind. body_only gets β at their id. - R.fields["id"] = copytext_char(rustg_hash_string(RUSTG_HASH_MD5, mob_occupant.real_name), 3, 10)+"β+" //beta plus + cloning_record.id = copytext_char(rustg_hash_string(RUSTG_HASH_MD5, mob_occupant.real_name), 3, 10)+"β+" //beta plus else if(body_only) - R.fields["id"] = copytext_char(rustg_hash_string(RUSTG_HASH_MD5, mob_occupant.real_name), 3, 10)+"β" //beta + cloning_record.id = copytext_char(rustg_hash_string(RUSTG_HASH_MD5, mob_occupant.real_name), 3, 10)+"β" //beta else - R.fields["id"] = copytext_char(rustg_hash_string(RUSTG_HASH_MD5, mob_occupant.real_name), 3, 7)+copytext_char(rustg_hash_string(RUSTG_HASH_MD5, mob_occupant.mind), -4) - R.fields["UE"] = dna.unique_enzymes - R.fields["UI"] = dna.uni_identity - R.fields["SE"] = dna.mutation_index - R.fields["blood_type"] = dna.blood_type - R.fields["features"] = dna.features - R.fields["factions"] = mob_occupant.faction - R.fields["traumas"] = list() + cloning_record.id = copytext_char(rustg_hash_string(RUSTG_HASH_MD5, mob_occupant.real_name), 3, 7)+copytext_char(rustg_hash_string(RUSTG_HASH_MD5, mob_occupant.mind), -4) if(isbrain(mob_occupant)) //We'll detect the brain first because trauma is from the brain, not from the body. - R.fields["traumas"] = B.get_traumas() + cloning_record.traumas = human_brain.get_traumas() else if(ishuman(mob_occupant)) - R.fields["traumas"] = C.get_traumas() + cloning_record.traumas = human_mob.get_traumas() //Traumas will be overriden if the brain transplant is made because '/obj/item/organ/brain/Insert' does that thing. This should be done since we want a monkey yelling to people with 'God voice syndrome' - R.fields["bank_account"] = has_bank_account + cloning_record.bank_account = has_bank_account if(!experimental) - R.fields["mindref"] = "[REF(mob_occupant.mind)]" - R.fields["last_death"] = (mob_occupant.stat == DEAD && mob_occupant.mind) ? mob_occupant.mind.last_death : -1 - R.fields["body_only"] = body_only + cloning_record.weakref_mind = WEAKREF(mob_occupant.mind) + cloning_record.last_death = (mob_occupant.stat == DEAD && mob_occupant.mind) ? mob_occupant.mind.last_death : -1 + cloning_record.body_only = body_only else - R.fields["last_death"] = 0 - R.fields["body_only"] = 0 + cloning_record.last_death = FALSE + cloning_record.body_only = FALSE if(!body_only || experimental && mob_occupant.stat != DEAD) //Add an implant if needed - var/obj/item/implant/health/imp - for(var/obj/item/implant/health/HI in mob_occupant.implants) - imp = HI + var/obj/item/implant/health/implant + for(var/obj/item/implant/health/health_implant in mob_occupant.implants) + implant = health_implant break - if(!imp) - imp = new /obj/item/implant/health(mob_occupant) - imp.implant(mob_occupant) - R.fields["imp"] = "[REF(imp)]" - - var/datum/data/record/old_record = find_record("id", R.fields["id"], records) - if(old_record) - records -= old_record + if(!implant) + implant = new /obj/item/implant/health(mob_occupant) + implant.implant(mob_occupant) + cloning_record.implant = "[REF(implant)]" + + var/found_old_record = null + for(var/datum/record/cloning/old_record as anything in records) + if(old_record.id == cloning_record.id) + found_old_record = old_record + + + if(found_old_record) + records -= found_old_record scantemp = "Record updated." else scantemp = "Subject successfully scanned." - records += R + + records += cloning_record if(!experimental) log_cloning("[user ? key_name(user) : "Autoprocess"] added the [body_only ? "body-only " : ""]record of [key_name(mob_occupant)] to [src] at [AREACOORD(src)].") diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm deleted file mode 100644 index 346d88f890581..0000000000000 --- a/code/game/machinery/computer/medical.dm +++ /dev/null @@ -1,618 +0,0 @@ - - -/obj/machinery/computer/med_data//TODO:SANITY - name = "medical records console" - desc = "This can be used to check medical records." - icon_screen = "medcomp" - icon_keyboard = "med_key" - req_one_access = list(ACCESS_MEDICAL, ACCESS_FORENSICS_LOCKERS) - circuit = /obj/item/circuitboard/computer/med_data - var/rank = null - var/screen = null - var/datum/data/record/active1 - var/datum/data/record/active2 - var/a_id = null - var/temp = null - var/printing = null - //Sorting Variables - var/sortBy = "name" - var/order = 1 // -1 = Descending - 1 = Ascending - - light_color = LIGHT_COLOR_BLUE - -/obj/machinery/computer/med_data/syndie - icon_keyboard = "syndie_key" - -/obj/machinery/computer/med_data/ui_interact(mob/user) - . = ..() - if(isliving(user)) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) - var/dat - if(temp) - dat = "[temp]
Clear Screen" - else - if(authenticated) - switch(screen) - if(1) - dat += {" -Search Records -
List Records -
-
Virus Database -
Medbot Tracking -
-
Record Maintenance -
{Log Out}
-"} - if(2) - dat += {" - -
| Records: | -
|---|
| Name | -ID | -Fingerprints (F) | DNA (D) | -Blood Type | -Physical Status | -Mental Status | -
|---|---|---|---|---|---|
| [R.fields["name"]] | " - dat += "[R.fields["id"]] | " - dat += "F: [R.fields["fingerprint"]] D: [b_dna] | "
- dat += "[blood_type] | " - dat += "[R.fields["p_stat"]] | " - dat += "[R.fields["m_stat"]] |
" - dat += "
Back" - if(3) - dat += "Records Maintenance
\nBackup To Disk
\nUpload From Disk
\nDelete All Records
\n
\nBack" - if(4) - - dat += "
| Medical Record | |||
| Name: | [active1.fields["name"]] | " - dat += "||
| ID: | [active1.fields["id"]] | ||
| Gender: | [active1.fields["gender"]] | ||
| Age: | [active1.fields["age"]] | ||
| Species: | [active1.fields["species"]] | ||
| Fingerprint: | [active1.fields["fingerprint"]] | ||
| Physical Status: | [active1.fields["p_stat"]] | ||
| Mental Status: | [active1.fields["m_stat"]] | ||
| General Record Lost! | |||
Medical Data | |||
| Blood Type: | [active2.fields["blood_type"]] | ||
| DNA: | [active2.fields["b_dna"]] | ||
Minor Disabilities: | [active2.fields["mi_dis"]] | ||
| Details: | [active2.fields["mi_dis_d"]] | ||
Major Disabilities: | [active2.fields["ma_dis"]] | ||
| Details: | [active2.fields["ma_dis_d"]] | ||
Allergies: | [active2.fields["alg"]] | ||
| Details: | [active2.fields["alg_d"]] | ||
Current Diseases: | [active2.fields["cdi"]] | ||
| Details: | [active2.fields["cdi_d"]] | ||
Important Notes: | [active2.fields["notes"]] | ||
Comments/Log | |||
| [active2.fields["com_[counter]"]] | |||
| Delete Entry | |||
| Add Entry | |||
Delete Record (Medical Only) | |||
| Medical Record Lost! | |||
New Record | |||
| Print Record | |||
| Back |
[Dis.name]" - dat += "
Back" - if(6) - dat += "
Medical Robots:" - var/bdat = null - for(var/mob/living/simple_animal/bot/medbot/M in GLOB.alive_mob_list) - if(M.get_virtual_z_level() != src.get_virtual_z_level()) - continue //only find medibots on the same z-level as the computer - var/turf/bl = get_turf(M) - if(bl) //if it can't find a turf for the medibot, then it probably shouldn't be showing up - bdat += "[M.name] - \[[bl.x],[bl.y]\] - [M.on ? "Online" : "Offline"]
" - if(!isnull(M.reagent_glass)) - bdat += "Reservoir: \[[M.reagent_glass.reagents.total_volume]/[M.reagent_glass.reagents.maximum_volume]\]
" - if(!bdat) - dat += "
[bdat]" - - else - else - dat += "{Log In}" - var/datum/browser/popup = new(user, "med_rec", "Medical Records Console", 600, 400) - popup.set_content(dat) - popup.open() - -/obj/machinery/computer/med_data/Topic(href, href_list) - . = ..() - if(.) - return . - if(!(active1 in GLOB.data_core.general)) - src.active1 = null - if(!(active2 in GLOB.data_core.medical)) - src.active2 = null - - if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)) || issilicon(usr) || IsAdminGhost(usr)) - usr.set_machine(src) - if(href_list["temp"]) - src.temp = null - else if(href_list["logout"]) - src.authenticated = null - src.screen = null - src.active1 = null - src.active2 = null - else if(href_list["choice"]) - // SORTING! - if(href_list["choice"] == "Sorting") - // Reverse the order if clicked twice - if(sortBy == href_list["sort"]) - if(order == 1) - order = -1 - else - order = 1 - else - // New sorting order! - sortBy = href_list["sort"] - order = initial(order) - else if(href_list["login"]) - var/mob/M = usr - var/obj/item/card/id/I = M.get_idcard(TRUE) - if(issilicon(M)) - active1 = null - active2 = null - authenticated = 1 - rank = JOB_NAME_AI - screen = 1 - else if(IsAdminGhost(M)) - active1 = null - active2 = null - authenticated = 1 - rank = JOB_CENTCOM_CENTRAL_COMMAND - screen = 1 - else if(istype(I) && check_access(I)) - active1 = null - active2 = null - authenticated = I.registered_name - rank = I.assignment - screen = 1 - else - to_chat(usr, "Unauthorized access.") - playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE) - if(src.authenticated) - - if(href_list["screen"]) - src.screen = text2num(href_list["screen"]) - if(src.screen < 1) - src.screen = 1 - - src.active1 = null - src.active2 = null - - else if(href_list["vir"]) - var/href_type = text2path(href_list["vir"]) - if(ispath(href_type, /datum/disease)) - var/datum/disease/type = href_type - src.temp = {"Name: [initial(type.name)] -
Number of stages: [initial(type.max_stages)] -
Spread: [initial(type.spread_text)] Transmission -
Possible Cure: [(initial(type.cure_text)||"none")] -
-
Notes: [initial(type.desc)] -
-
Danger: [initial(type.danger)]"} - - else if(href_list["del_all"]) - src.temp = "Are you sure you wish to delete all records?
\n\tYes
\n\tNo
" - - else if(href_list["del_all2"]) - usr.investigate_log("has deleted all medical records.", INVESTIGATE_RECORDS) - GLOB.data_core.medical.Cut() - src.temp = "All records deleted." - - else if(href_list["field"]) - var/a1 = src.active1 - var/a2 = src.active2 - switch(href_list["field"]) - if("fingerprint") - if(active1) - var/t1 = stripped_input(usr, "Please input fingerprint hash:", "Med. records", src.active1.fields["fingerprint"]) - if(!canUseMedicalRecordsConsole(usr, t1, a1)) - return - usr.investigate_log(" has changed [active1.fields["name"]]'s medical records fingerprint from '[src.active1.fields["fingerprint"]]' to '[t1]'.", INVESTIGATE_RECORDS) - src.active1.fields["fingerprint"] = t1 - if("gender") - if(active1) - var/t1 = input(usr, "Select gender", "Med. records", src.active1.fields["gender"]) as null|anything in list(MALE, FEMALE, "other") - if(!canUseMedicalRecordsConsole(usr, t1, a1)) - return - src.active1.fields["gender"] = capitalize(t1) - usr.investigate_log(" has changed [active1.fields["name"]]'s medical records to indicate they are now '[capitalize(t1)]' gender.", INVESTIGATE_RECORDS) - if("age") - if(active1) - var/t1 = input("Please input age:", "Med. records", src.active1.fields["age"], null) as num - if(!canUseMedicalRecordsConsole(usr, t1, a1)) - return - src.active1.fields["age"] = t1 - usr.investigate_log(" has changed [active1.fields["name"]]'s medical records to indicate they are now '[t1]' old.", INVESTIGATE_RECORDS) - if("species") - if(active1) - var/t1 = stripped_input(usr, "Please input species name", "Med. records", src.active1.fields["species"], null) - if(!canUseMedicalRecordsConsole(usr, t1, a1)) - return - usr.investigate_log(" has changed [active1.fields["name"]]'s medical records species from '[active1.fields["species"]]' to '[t1]'.", INVESTIGATE_RECORDS) - active1.fields["species"] = t1 - if("mi_dis") - if(active2) - var/t1 = stripped_input(usr, "Please input minor disabilities list:", "Med. records", src.active2.fields["mi_dis"], null) - if(!canUseMedicalRecordsConsole(usr, t1, null, a2)) - return - src.active2.fields["mi_dis"] = t1 - usr.investigate_log(" has set [active1.fields["name"]]'s medical records minor disabilities to '[t1]'.", INVESTIGATE_RECORDS) - if("mi_dis_d") - if(active2) - var/t1 = stripped_input(usr, "Please summarize minor dis.:", "Med. records", src.active2.fields["mi_dis_d"], null) - if(!canUseMedicalRecordsConsole(usr, t1, null, a2)) - return - src.active2.fields["mi_dis_d"] = t1 - usr.investigate_log(" has set [active1.fields["name"]]'s medical records minor disabilities summary to '[t1]'.", INVESTIGATE_RECORDS) - if("ma_dis") - if(active2) - var/t1 = stripped_input(usr, "Please input major disabilities list:", "Med. records", src.active2.fields["ma_dis"], null) - if(!canUseMedicalRecordsConsole(usr, t1, null, a2)) - return - src.active2.fields["ma_dis"] = t1 - usr.investigate_log(" has set [active1.fields["name"]]'s medical records major disabilities to '[t1]'.", INVESTIGATE_RECORDS) - if("ma_dis_d") - if(active2) - var/t1 = stripped_input(usr, "Please summarize major dis.:", "Med. records", src.active2.fields["ma_dis_d"], null) - if(!canUseMedicalRecordsConsole(usr, t1, null, a2)) - return - src.active2.fields["ma_dis_d"] = t1 - usr.investigate_log(" has set [active1.fields["name"]]'s medical records major disabilities summary to '[t1]'.", INVESTIGATE_RECORDS) - if("alg") - if(active2) - var/t1 = stripped_input(usr, "Please state allergies:", "Med. records", src.active2.fields["alg"], null) - if(!canUseMedicalRecordsConsole(usr, t1, null, a2)) - return - src.active2.fields["alg"] = t1 - usr.investigate_log(" has set [active1.fields["name"]]'s medical records allergies to '[t1]'.", INVESTIGATE_RECORDS) - if("alg_d") - if(active2) - var/t1 = stripped_input(usr, "Please summarize allergies:", "Med. records", src.active2.fields["alg_d"], null) - if(!canUseMedicalRecordsConsole(usr, t1, null, a2)) - return - src.active2.fields["alg_d"] = t1 - usr.investigate_log(" has set [active1.fields["name"]]'s medical records allergies summary to '[t1]'.", INVESTIGATE_RECORDS) - if("cdi") - if(active2) - var/t1 = stripped_input(usr, "Please state diseases:", "Med. records", src.active2.fields["cdi"], null) - if(!canUseMedicalRecordsConsole(usr, t1, null, a2)) - return - src.active2.fields["cdi"] = t1 - usr.investigate_log(" has set [active1.fields["name"]]'s medical records diseases to '[t1]'.", INVESTIGATE_RECORDS) - if("cdi_d") - if(active2) - var/t1 = stripped_input(usr, "Please summarize diseases:", "Med. records", src.active2.fields["cdi_d"], null) - if(!canUseMedicalRecordsConsole(usr, t1, null, a2)) - return - src.active2.fields["cdi_d"] = t1 - usr.investigate_log(" has set [active1.fields["name"]]'s medical records diseases summary to '[t1]'.", INVESTIGATE_RECORDS) - if("notes") - if(active2) - var/t1 = stripped_input(usr, "Please summarize notes:", "Med. records", src.active2.fields["notes"], null) - if(!canUseMedicalRecordsConsole(usr, t1, null, a2)) - return - src.active2.fields["notes"] = t1 - usr.investigate_log(" has set [active1.fields["name"]]'s medical records notes to '[t1]'.", INVESTIGATE_RECORDS) - if("p_stat") - if(active1) - src.temp = "Physical Condition:
\n\t*Deceased*
\n\t*Unconscious*
\n\tActive
\n\tPhysically Unfit
" - if("m_stat") - if(active1) - src.temp = "Mental Condition:
\n\t*Insane*
\n\t*Unstable*
\n\t*Watch*
\n\tStable
" - if("blood_type") - if(active2) - src.temp = "Blood Type:
\n\tA- A+
\n\tB- B+
\n\tAB- AB+
\n\tO- O+
" - if("b_dna") - if(active2) - var/t1 = stripped_input(usr, "Please input DNA hash:", "Med. records", src.active2.fields["b_dna"], null) - if(!canUseMedicalRecordsConsole(usr, t1, null, a2)) - return - usr.investigate_log(" has set [active1.fields["name"]]'s medical records dna from '[src.active2.fields["b_dna"]]' to '[t1]'.", INVESTIGATE_RECORDS) - src.active2.fields["b_dna"] = t1 - if("show_photo_front") - if(active1) - var/front_photo = active1.get_front_photo() - if(istype(front_photo, /obj/item/photo)) - var/obj/item/photo/photo = front_photo - photo.show(usr) - if("show_photo_side") - if(active1) - var/side_photo = active1.get_side_photo() - if(istype(side_photo, /obj/item/photo)) - var/obj/item/photo/photo = side_photo - photo.show(usr) - else - - else if(href_list["p_stat"]) - if(active1) - switch(href_list["p_stat"]) - if("deceased") - src.active1.fields["p_stat"] = "*Deceased*" - if("unconscious") - src.active1.fields["p_stat"] = "*Unconscious*" - if("active") - src.active1.fields["p_stat"] = "Active" - if("unfit") - src.active1.fields["p_stat"] = "Physically Unfit" - - else if(href_list["m_stat"]) - if(active1) - switch(href_list["m_stat"]) - if("insane") - src.active1.fields["m_stat"] = "*Insane*" - if("unstable") - src.active1.fields["m_stat"] = "*Unstable*" - if("watch") - src.active1.fields["m_stat"] = "*Watch*" - if("stable") - src.active1.fields["m_stat"] = "Stable" - - - else if(href_list["blood_type"]) - if(active2) - switch(href_list["blood_type"]) - if("an") - src.active2.fields["blood_type"] = "A-" - if("bn") - src.active2.fields["blood_type"] = "B-" - if("abn") - src.active2.fields["blood_type"] = "AB-" - if("on") - src.active2.fields["blood_type"] = "O-" - if("ap") - src.active2.fields["blood_type"] = "A+" - if("bp") - src.active2.fields["blood_type"] = "B+" - if("abp") - src.active2.fields["blood_type"] = "AB+" - if("op") - src.active2.fields["blood_type"] = "O+" - - - else if(href_list["del_r"]) - if(active2) - src.temp = "Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
" - - else if(href_list["del_r2"]) - usr.investigate_log(" has deleted the medical records for [active1.fields["name"]].", INVESTIGATE_RECORDS) - if(active2) - qdel(active2) - active2 = null - - else if(href_list["d_rec"]) - active1 = find_record("id", href_list["d_rec"], GLOB.data_core.general) - if(active1) - active2 = find_record("id", href_list["d_rec"], GLOB.data_core.medical) - if(!active2) - active1 = null - screen = 4 - - else if(href_list["new"]) - if((istype(src.active1, /datum/data/record) && !( istype(src.active2, /datum/data/record) ))) - var/datum/data/record/R = new /datum/data/record( ) - R.fields["name"] = src.active1.fields["name"] - R.fields["id"] = src.active1.fields["id"] - R.name = "Medical Record #[R.fields["id"]]" - R.fields["blood_type"] = "Unknown" - R.fields["b_dna"] = "Unknown" - R.fields["mi_dis"] = "None" - R.fields["mi_dis_d"] = "No minor disabilities have been diagnosed." - R.fields["ma_dis"] = "None" - R.fields["ma_dis_d"] = "No major disabilities have been diagnosed." - R.fields["alg"] = "None" - R.fields["alg_d"] = "No allergies have been detected in this patient." - R.fields["cdi"] = "None" - R.fields["cdi_d"] = "No diseases have been diagnosed at the moment." - R.fields["notes"] = "No notes." - GLOB.data_core.medical += R - src.active2 = R - src.screen = 4 - - else if(href_list["add_c"]) - if(!(active2 in GLOB.data_core.medical)) - return - var/a2 = src.active2 - var/t1 = stripped_multiline_input(usr, "Add Comment:", "Med. records", null, null) - if(!canUseMedicalRecordsConsole(usr, t1, null, a2)) - return - var/counter = 1 - while(src.active2.fields["com_[counter]"]) - counter++ - src.active2.fields["com_[counter]"] = "Made by [src.authenticated] ([src.rank]) on [station_time_timestamp()] [time2text(world.realtime, "MMM DD")], [GLOB.year_integer+YEAR_OFFSET]
[t1]" - - else if(href_list["del_c"]) - if((istype(src.active2, /datum/data/record) && src.active2.fields["com_[href_list["del_c"]]"])) - src.active2.fields["com_[href_list["del_c"]]"] = "Deleted" - - else if(href_list["search"]) - var/t1 = stripped_input(usr, "Search String: (Name, DNA, or ID)", "Med. records") - if(!canUseMedicalRecordsConsole(usr, t1)) - return - src.active1 = null - src.active2 = null - t1 = LOWER_TEXT(t1) - for(var/datum/data/record/R in GLOB.data_core.medical) - if((LOWER_TEXT(R.fields["name"]) == t1 || t1 == LOWER_TEXT(R.fields["id"]) || t1 == LOWER_TEXT(R.fields["b_dna"]))) - src.active2 = R - else - //Foreach continue //goto(3229) - if(!( src.active2 )) - src.temp = "Could not locate record [sanitize(t1)]." - else - for(var/datum/data/record/E in GLOB.data_core.general) - if((E.fields["name"] == src.active2.fields["name"] || E.fields["id"] == src.active2.fields["id"])) - src.active1 = E - else - //Foreach continue //goto(3334) - src.screen = 4 - - else if(href_list["print_p"]) - if(!( src.printing )) - src.printing = 1 - GLOB.data_core.medicalPrintCount++ - playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) - sleep(30) - var/obj/item/paper/printed_paper = new /obj/item/paper( src.loc ) - var/final_paper_text = "
" - if(active1 in GLOB.data_core.general) - final_paper_text += "Name: [src.active1.fields["name"]] ID: [src.active1.fields["id"]]
\nGender: [src.active1.fields["gender"]]
\nAge: [src.active1.fields["age"]]
" - final_paper_text += "\nSpecies: [active1.fields["species"]]
" - final_paper_text += "\nFingerprint: [src.active1.fields["fingerprint"]]
\nPhysical Status: [src.active1.fields["p_stat"]]
\nMental Status: [src.active1.fields["m_stat"]]
" - else - final_paper_text += "General Record Lost!
" - if(active2 in GLOB.data_core.medical) - final_paper_text += "
\n
\n \ - Blood Type: [src.active2.fields["blood_type"]]
\n \ - DNA: [src.active2.fields["b_dna"]]
\n \ -
\n \ - Minor Disabilities: [src.active2.fields["mi_dis"]]
\n \ - Details: [src.active2.fields["mi_dis_d"]]
\n \ -
\n \ - Major Disabilities: [src.active2.fields["ma_dis"]]
\n \ - Details: [src.active2.fields["ma_dis_d"]]
\n \ -
\n \ - Allergies: [src.active2.fields["alg"]]
\n \ - Details: [src.active2.fields["alg_d"]]
\n \ -
\n \ - Current Diseases: [src.active2.fields["cdi"]] (per disease info placed in log/comment section)
\n \ - Details: [src.active2.fields["cdi_d"]]
\n \ -
\n \ - Important Notes:
\n\t \ - [src.active2.fields["notes"]]
\n \ -
\n \ -
" - var/counter = 1 - while(src.active2.fields["com_[counter]"]) - final_paper_text += "[src.active2.fields["com_[counter]"]]
" - counter++ - printed_paper.name = "MR-[GLOB.data_core.medicalPrintCount] '[src.active1.fields["name"]]'" - else - final_paper_text += "Medical Record Lost!
" - printed_paper.name = "MR-[GLOB.data_core.medicalPrintCount] '["Record Lost"]'" - final_paper_text += "" - printed_paper.add_raw_text(final_paper_text) - printed_paper.update_appearance() - src.printing = null - - src.add_fingerprint(usr) - src.updateUsrDialog() - return - -/obj/machinery/computer/med_data/emp_act(severity) - . = ..() - if(!(machine_stat & (BROKEN|NOPOWER)) && !(. & EMP_PROTECT_SELF)) - for(var/datum/data/record/R in GLOB.data_core.medical) - if(prob(10/severity)) - switch(rand(1,6)) - if(1) - R.fields["name"] = random_unique_name(R.fields["gender"],1) - if(2) - R.fields["gender"] = pick("Male", "Female", "Other") - if(3) - R.fields["age"] = rand(AGE_MIN, AGE_MAX) - if(4) - R.fields["blood_type"] = random_blood_type() - if(5) - R.fields["p_stat"] = pick("*Unconscious*", "Active", "Physically Unfit") - if(6) - R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable") - continue - - else if(prob(1)) - qdel(R) - continue - -/obj/machinery/computer/med_data/proc/canUseMedicalRecordsConsole(mob/user, message = 1, record1, record2) - if(user) - if(message) - if(authenticated) - if(user.canUseTopic(src, !issilicon(user))) - if(!record1 || record1 == active1) - if(!record2 || record2 == active2) - return 1 - return 0 - -/obj/machinery/computer/med_data/laptop - name = "medical laptop" - desc = "A cheap Nanotrasen medical laptop, it functions as a medical records computer. It's bolted to the table." - icon_state = "laptop" - icon_screen = "medlaptop" - icon_keyboard = "laptop_key" - - //these muthafuckas arent supposed to smooth - base_icon_state = null - smoothing_flags = NONE - smoothing_groups = null - canSmoothWith = null - - clockwork = TRUE //it'd look weird - broken_overlay_emissive = TRUE - pass_flags = PASSTABLE diff --git a/code/game/machinery/computer/prisoner/gulag_teleporter.dm b/code/game/machinery/computer/prisoner/gulag_teleporter.dm index a8ac124b595ba..7b8d41e397b92 100644 --- a/code/game/machinery/computer/prisoner/gulag_teleporter.dm +++ b/code/game/machinery/computer/prisoner/gulag_teleporter.dm @@ -11,7 +11,7 @@ var/obj/machinery/gulag_teleporter/teleporter var/obj/structure/gulag_beacon/beacon var/mob/living/carbon/human/prisoner - var/datum/data/record/temporary_record + var/datum/record/crew/temporary_record /obj/machinery/computer/prisoner/gulag_teleporter_computer/Initialize(mapload) . = ..() @@ -38,12 +38,11 @@ prisoner_list["name"] = prisoner.real_name if(contained_id) can_teleport = TRUE - if(!isnull(GLOB.data_core.general)) - for(var/r in GLOB.data_core.security) - var/datum/data/record/R = r - if(R.fields["name"] == prisoner_list["name"]) - temporary_record = R - prisoner_list["crimstat"] = temporary_record.fields["criminal"] + for(var/manifests in GLOB.manifest.general) + var/datum/record/crew/crew_record = manifests + if(crew_record.name == prisoner_list["name"]) + temporary_record = crew_record + prisoner_list["crimstat"] = temporary_record.wanted_status data["prisoner"] = prisoner_list diff --git a/code/game/machinery/computer/records/medical.dm b/code/game/machinery/computer/records/medical.dm new file mode 100644 index 0000000000000..948bba84d5d2a --- /dev/null +++ b/code/game/machinery/computer/records/medical.dm @@ -0,0 +1,86 @@ +/obj/machinery/computer/records/medical + name = "medical records console" + desc = "This can be used to check medical records." + icon_screen = "medcomp" + icon_keyboard = "med_key" + req_one_access = list(ACCESS_MEDICAL, ACCESS_FORENSICS_LOCKERS) + circuit = /obj/item/circuitboard/computer/records/medical + light_color = LIGHT_COLOR_BLUE + +/obj/machinery/computer/records/medical/syndie + icon_keyboard = "syndie_key" + +/obj/machinery/computer/records/medical/laptop + name = "medical laptop" + desc = "A cheap Nanotrasen medical laptop, it functions as a medical records computer. It's bolted to the table." + icon_state = "laptop" + icon_screen = "medlaptop" + icon_keyboard = "laptop_key" + + pass_flags = PASSTABLE + //these muthafuckas arent supposed to smooth + base_icon_state = null + smoothing_flags = NONE + smoothing_groups = null + canSmoothWith = null + +/obj/machinery/computer/records/medical/ui_interact(mob/user, datum/tgui/ui) + . = ..() + if(.) + return + ui = SStgui.try_update_ui(user, src, ui) + if (!ui) + ui = new(user, src, "MedicalRecords") + ui.set_autoupdate(FALSE) + ui.open() + +/obj/machinery/computer/records/medical/ui_data(mob/user) + var/list/data = ..() + + var/list/records = list() + for(var/datum/record/crew/each_record in GLOB.manifest.general) + records += list(each_record.get_info_list()) + + data["records"] = records + + return data + +/obj/machinery/computer/records/medical/ui_static_data(mob/user) + var/list/data = list() + data["min_age"] = AGE_MIN + data["max_age"] = AGE_MAX + data["physical_statuses"] = PHYSICAL_STATUSES() + data["mental_statuses"] = MENTAL_STATUSES() + data["character_preview_view"] = character_preview_view.assigned_map + return data + +/obj/machinery/computer/records/medical/ui_act(action, list/params, datum/tgui/ui) + . = ..() + if(.) + return + + var/datum/record/crew/target_record + if(params["record_ref"]) + target_record = locate(params["record_ref"]) in GLOB.manifest.general + if(isnull(target_record)) + return FALSE + + switch(action) + if("add_note") + target_record.add_medical_note(params["content"], usr.name) + return TRUE + + if("delete_note") + target_record.delete_medical_note(params["note_ref"]) + return TRUE + + if("set_physical_status") + target_record.set_physical_status(params["physical_status"]) + return TRUE + + if("set_mental_status") + target_record.set_mental_status(params["mental_status"]) + return TRUE + + return FALSE + diff --git a/code/game/machinery/computer/records/records.dm b/code/game/machinery/computer/records/records.dm new file mode 100644 index 0000000000000..45d3506d78d3f --- /dev/null +++ b/code/game/machinery/computer/records/records.dm @@ -0,0 +1,190 @@ +/** + * Records subtype for the shared functionality between medical/security/warrant consoles. + */ +/obj/machinery/computer/records + /// The character preview view for the UI. + var/atom/movable/screen/map_view/character_preview_view/character_preview_view + +/obj/machinery/computer/records/Initialize(mapload) + . = ..() + character_preview_view = new(null, src) + +/obj/machinery/computer/records/ui_data(mob/user) + var/list/data = list() + + var/has_access = (authenticated && isliving(user)) || issiliconoradminghost(user) + data["authenticated"] = has_access + + return data + +/obj/machinery/computer/records/ui_close(mob/user) + . = ..() + character_preview_view.unregister_from_client(user.client) + +/obj/machinery/computer/records/ui_interact(mob/user, datum/tgui/ui) + . = ..() + if(.) + return + ui = SStgui.try_update_ui(user, src, ui) + // If you leave and come back, re-register the character preview. This also runs the first time it's opened + if (!isnull(character_preview_view) && istype(user.client) && !(character_preview_view in user.client.screen)) + character_preview_view.register_to_client(user.client) + +/obj/machinery/computer/records/ui_act(action, list/params, datum/tgui/ui) + . = ..() + if(.) + return + + var/mob/user = ui.user + + var/datum/record/crew/target_record + if(params["record_ref"]) + target_record = locate(params["record_ref"]) in GLOB.manifest.general + + switch(action) + if("edit_field") + target_record = locate(params["record_ref"]) in GLOB.manifest.general + var/field = params["field"] + if(!field || !(field in target_record?.vars)) + return FALSE + var/text = "[params["value"]]" //Converts the value to a string, due to fuckery in TGUI. + var/value = trim(text, MAX_BROADCAST_LEN) + target_record.vars[field] = value || null + update_all_security_huds() + return TRUE + + if("anonymize_record") + if(!target_record) + return FALSE + + target_record.anonymize_record_info() + balloon_alert(user, "record anonymized") + playsound(src, 'sound/machines/terminal_eject.ogg', 70, TRUE) + + return TRUE + + if("login") + authenticated = secure_login(user) + return TRUE + + if("logout") + balloon_alert(user, "logged out") + playsound(src, 'sound/machines/terminal_off.ogg', 70, TRUE) + authenticated = FALSE + + return TRUE + + if("purge_records") + ui.close() + balloon_alert(user, "purging records") + playsound(src, 'sound/machines/terminal_alert.ogg', 70, TRUE) + + if(do_after(user, 5 SECONDS)) + for(var/datum/record/crew/entry in GLOB.manifest.general) + entry.delete_security_record() + + update_all_security_huds() + balloon_alert(user, "records purged") + playsound(src, 'sound/machines/terminal_off.ogg', 70, TRUE) + + return TRUE + + if("view_record") + if(!target_record) + return FALSE + + playsound(src, "sound/machines/terminal_button0[rand(1, 8)].ogg", 50, TRUE) + update_preview(user, params["character_preview_view"], target_record) + return TRUE + + return FALSE + +/// Creates a character preview view for the UI. +/obj/machinery/computer/records/proc/create_character_preview_view(mob/user) + if(istype(character_preview_view)) + return + character_preview_view = new() + if(user.client) + character_preview_view.register_to_client(user.client) + if(isnull(character_preview_view.body)) //only want to run this once + if (isnull(character_preview_view.body)) + character_preview_view.create_body() + else + character_preview_view.body.wipe_state() + // Force map view to update as well + character_preview_view.name = character_preview_view.name == "character_preview" ? "character_preview_1" : "character_preview" + return character_preview_view + +/// Takes a record and updates the character preview view to match it. +/obj/machinery/computer/records/proc/update_preview(mob/user, character_preview_view, datum/record/crew/target) + var/mutable_appearance/preview = new(target.character_appearance) + preview.underlays += mutable_appearance('icons/effects/effects.dmi', "static_base", alpha = 20) + preview.add_overlay(mutable_appearance(generate_icon_alpha_mask('icons/effects/effects.dmi', "scanline"), alpha = 20)) + + var/atom/movable/screen/map_view/character_preview_view/old_view = user.client?.screen_maps[character_preview_view]?[1] + if(!old_view) + return + + old_view.appearance = preview.appearance + +/// Detects whether a user can use buttons on the machine +/obj/machinery/computer/records/proc/has_auth(mob/user) + if(issiliconoradminghost(user)) // Silicons don't need to authenticate + return TRUE + + if(!isliving(user)) + return FALSE + var/mob/living/player = user + + var/obj/item/card/auth = player.get_idcard(TRUE) + if(!auth) + return FALSE + var/list/access = auth.GetAccess() + if(!check_access_list(access)) + return FALSE + + return TRUE + +/// Inserts a new record into GLOB.manifest.general. Requires a photo to be taken. +/obj/machinery/computer/records/proc/insert_new_record(mob/user, obj/item/photo/mugshot) + if(!mugshot || !is_operational || !user.canUseTopic(src, be_close = !issilicon(user))) + return FALSE + + if(!authenticated && !has_auth(user)) + balloon_alert(user, "access denied") + playsound(src, 'sound/machines/terminal_error.ogg', 70, TRUE) + return FALSE + + if(mugshot.picture.psize_x > world.icon_size || mugshot.picture.psize_y > world.icon_size) + balloon_alert(user, "photo too large!") + playsound(src, 'sound/machines/terminal_error.ogg', 70, TRUE) + return FALSE + + var/trimmed = copytext(mugshot.name, 9, MAX_NAME_LEN) // Remove "photo - " + var/name = tgui_input_text(user, "Enter the name of the new record.", "New Record", trimmed, MAX_NAME_LEN) + if(!name || !is_operational || !user.canUseTopic(src, be_close = !issilicon(user)) || !mugshot || QDELETED(mugshot) || QDELETED(src)) + return FALSE + + new /datum/record/crew(name = name, character_appearance = mugshot.picture.picture_image) + + balloon_alert(user, "record created") + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 70, TRUE) + + qdel(mugshot) + + return TRUE + +/// Secure login +/obj/machinery/computer/records/proc/secure_login(mob/user) + if(!user.canUseTopic(src, be_close = !issilicon(user)) || !is_operational) + return FALSE + + if(!has_auth(user)) + balloon_alert(user, "access denied") + playsound(src, 'sound/machines/terminal_error.ogg', 70, TRUE) + return FALSE + + balloon_alert(user, "logged in") + playsound(src, 'sound/machines/terminal_on.ogg', 70, TRUE) + + return TRUE diff --git a/code/game/machinery/computer/records/security.dm b/code/game/machinery/computer/records/security.dm new file mode 100644 index 0000000000000..8e4386eadc981 --- /dev/null +++ b/code/game/machinery/computer/records/security.dm @@ -0,0 +1,407 @@ +#define COMP_SECURITY_ARREST_AMOUNT_TO_FLAG 10 +#define PRINTOUT_MISSING "Missing" +#define PRINTOUT_RAPSHEET "Rapsheet" +#define PRINTOUT_WANTED "Wanted" + + +/obj/machinery/computer/records/security + name = "security records console" + desc = "Used to view and edit personnel's security records." + icon_screen = "security" + icon_keyboard = "security_key" + req_one_access = list(ACCESS_SEC_RECORDS) + circuit = /obj/item/circuitboard/computer/records/security + light_color = LIGHT_COLOR_RED + + /// The current state of the printer + var/printing = FALSE + //How many posters to print for this record. Yes i am doing this for you, Ragantis. + var/amount = 1 + +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/computer/records/security) + +/obj/machinery/computer/records/security/syndie + icon_keyboard = "syndie_key" + req_one_access = list(ACCESS_SYNDICATE) + +/obj/machinery/computer/records/security/laptop + name = "security laptop" + desc = "A cheap Nanotrasen security laptop, it functions as a security records console. It's bolted to the table." + icon_state = "laptop" + icon_screen = "seclaptop" + icon_keyboard = "laptop_key" + +/obj/machinery/computer/records/security/laptop/syndie + desc = "A cheap, jailbroken security laptop. It functions as a security records console. It's bolted to the table." + req_one_access = list(ACCESS_SYNDICATE) + +/obj/machinery/computer/records/security/Initialize(mapload, obj/item/circuitboard/C) + . = ..() + AddComponent(/datum/component/usb_port, list( + /obj/item/circuit_component/arrest_console_data, + /obj/item/circuit_component/arrest_console_arrest, + )) + +/obj/machinery/computer/records/security/attacked_by(obj/item/attacking_item, mob/living/user) + . = ..() + if(!istype(attacking_item, /obj/item/photo)) + return + insert_new_record(user, attacking_item) + +/obj/machinery/computer/records/security/ui_interact(mob/user, datum/tgui/ui) + . = ..() + if(.) + return + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "SecurityRecords") + ui.set_autoupdate(FALSE) + ui.open() + +/obj/machinery/computer/records/security/ui_data(mob/user) + var/list/data = ..() + + data["available_statuses"] = WANTED_STATUSES() + data["current_user"] = user.name + data["higher_access"] = has_armory_access(user) + data["amount"] = amount + + var/list/records = list() + for(var/datum/record/crew/target in GLOB.manifest.general) + var/list/citations = list() + for(var/datum/crime_record/citation/warrant in target.citations) + citations += list(list( + author = warrant.author, + crime_ref = FAST_REF(warrant), + details = warrant.details, + fine = warrant.fine, + name = warrant.name, + paid = warrant.paid, + time = warrant.time, + valid = warrant.valid, + voider = warrant.voider, + )) + + var/list/crimes = list() + for(var/datum/crime_record/crime in target.crimes) + crimes += list(list( + author = crime.author, + crime_ref = FAST_REF(crime), + details = crime.details, + name = crime.name, + time = crime.time, + valid = crime.valid, + voider = crime.voider, + )) + + records += list(list( + age = target.age, + citations = citations, + record_ref = REF(target), + crimes = crimes, + fingerprint = target.fingerprint, + gender = target.gender, + name = target.name, + security_note = target.security_note, + rank = target.rank, + species = target.species, + wanted_status = target.wanted_status, + )) + + data["records"] = records + + return data + + +/obj/machinery/computer/records/security/ui_static_data(mob/user) + var/list/data = list() + data["min_age"] = AGE_MIN + data["max_age"] = AGE_MAX + data["character_preview_view"] = character_preview_view.assigned_map + return data + +/obj/machinery/computer/records/security/ui_act(action, list/params, datum/tgui/ui) + . = ..() + if(.) + return + + var/mob/user = ui.user + var/datum/record/crew/target_record + if(params["record_ref"]) + target_record = locate(params["record_ref"]) in GLOB.manifest.general + if(!target_record) + return FALSE + + switch(action) + if("add_crime") + target_record.add_crime(user, params["name"], params["fine"], params["details"], src) + return TRUE + + if("delete_record") + qdel(target_record) + return TRUE + + if("edit_crime") + target_record.edit_crime(user, params["name"], params["description"], params["crime_ref"]) + return TRUE + + if("invalidate_crime") + target_record.invalidate_crime(user, params["crime_ref"], target_record.crimes, target_record.citations) + return TRUE + + if("delete_crime") + target_record.delete_crime(user, params["crime_ref"], target_record.crimes, target_record.citations) + return TRUE + + if("print_record") + print_record(user, target_record, params["alias"], params["desc"], params["head"], params["type"]) + return TRUE + + if("set_note") + target_record.set_security_note(params["security_note"]) + return TRUE + + if("set_wanted") + target_record.set_wanted_status(params["status"]) + return TRUE + + if("set_amount") + set_print_amount(params["new_amount"]) + return TRUE + + return FALSE + + +// Changing how many posters to print. +/obj/machinery/computer/records/security/proc/set_print_amount(new_amount) + var/target = text2num(new_amount) + amount = target + return TRUE + +/// Finishes printing, resets the printer. +/obj/machinery/computer/records/security/proc/print_finish(list/to_print) + printing = FALSE + playsound(src, 'sound/machines/terminal_eject.ogg', 100, TRUE) + + for(var/obj/item/printable as anything in to_print) + printable.forceMove(loc) + + return TRUE + +/// Handles printing records via UI. Takes the params from UI_act. +/obj/machinery/computer/records/security/proc/print_record(mob/user, datum/record/crew/target, alias, description, header, type) + if(printing) + balloon_alert(user, "printer busy") + playsound(src, 'sound/machines/terminal_error.ogg', 100, TRUE) + return FALSE + + printing = TRUE + balloon_alert(user, "printing") + playsound(src, 'sound/items/taperecorder/taperecorder_print.ogg', 100, TRUE) + + var/list/to_print = new() + var/input_alias = trim(alias, MAX_NAME_LEN) || target.name + var/input_description = trim(description, MAX_BROADCAST_LEN) || "No further details." + var/input_header = trim(header, 8) || capitalize(type) + for(var/amount_to_print in 1 to amount) + switch(type) + if("missing") + var/obj/item/photo/mugshot = target.get_front_photo() + var/obj/item/poster/wanted/missing/missing_poster = new(null, mugshot.picture.picture_image, input_alias, input_description, input_header) + + to_print.Add(missing_poster) + + if("wanted") + var/list/crimes = target.crimes + if(!length(crimes)) + balloon_alert(user, "no crimes") + return FALSE + + input_description += "\n\nWANTED FOR:" + for(var/datum/crime_record/incident in crimes) + if(!incident.valid) + input_description += "--REDACTED--" + continue + input_description += "\n
Clear Screen" - else - dat = "" - if(authenticated) - switch(screen) - if(1) - - //body tag start + onload and onkeypress (onkeyup) javascript event calls - dat += "" - //search bar javascript - dat += {" - - - - - - - - "} - dat += {" -
"}
- dat += "New Record
"
- //search bar
- dat += {"
-
| - Search: - | -
| Records: | -
|---|
| Name | -ID | -Rank | -Fingerprints | -Criminal Status | -
|---|---|---|---|---|
| [R.fields["name"]] | " - dat += "[R.fields["id"]] | " - dat += "[R.fields["rank"]] | " - dat += "[R.fields["fingerprint"]] | " - dat += "[crimstat] |
"} - dat += "Record Maintenance
" - dat += "{Log Out}" - if(2) - dat += "Records Maintenance
" - dat += "
Delete All Records
Back" - if(3) - dat += "Security Record
" - if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)) - var/front_photo = active1.get_front_photo() - if(istype(front_photo, /datum/picture)) - var/datum/picture/photo_front = front_photo - user << browse_rsc(photo_front.picture_image, "photo_front") - var/side_photo = active1.get_side_photo() - if(istype(side_photo, /datum/picture)) - var/datum/picture/photo_side = side_photo - user << browse_rsc(photo_side.picture_image, "photo_side") - dat += {"
|
-
|
General Record Lost!
" - if((istype(active2, /datum/data/record) && GLOB.data_core.security.Find(active2))) - dat += "Security Data" - dat += "
Criminal Status: [active2.fields["criminal"]]" - dat += "
Citations: Add New" - - dat +={"
| Crime | -Fine | -Author | -Time Added | -Amount Due | -Del | -|
|---|---|---|---|---|---|---|
| [c.crimeName] | -[c.fine] cr | [c.author] | -[c.time] | "} - if(owed > 0) - dat += "[owed] cr \[Pay\] | " - else - dat += "All Paid Off | " - dat += {"- \[X\] - | -
Crimes: Add New" - - - dat +={"
| Crime | -Details | -Author | -Time Added | -Del | -|
|---|---|---|---|---|---|
| [c.crimeName] | " - if(!c.crimeDetails) - dat += "\[+\] | " - else - dat += "[c.crimeDetails] | " - dat += "[c.author] | " - dat += "[c.time] | " - dat += "\[X\] | " - dat += "
\nImportant Notes:
\n\t [active2.fields["notes"]] " - dat += "
Comments/Log
" - var/counter = 1 - while(active2.fields["com_[counter]"]) - dat += (active2.fields["com_[counter]"] + "
") - if(active2.fields["com_[counter]"] != "Deleted") - dat += "Delete Entry
" - counter++ - dat += "Add Entry
" - dat += "Delete Record (Security Only)
" - else - dat += "Security Record Lost!
" - dat += "New Security Record
" - dat += "Delete Record (ALL)
Print Record
Print Wanted Poster
Print Missing Persons Poster
Back
" - dat += "{Log Out}" - else - else - dat += "{Log In}" - var/datum/browser/popup = new(user, "secure_rec", "Security Records Console", 600, 400) - popup.set_content(dat) - popup.open() - return - -/*Revised /N -I can't be bothered to look more of the actual code outside of switch but that probably needs revising too. -What a mess.*/ -/obj/machinery/computer/secure_data/Topic(href, href_list) - . = ..() - if(.) - return . - if(!( GLOB.data_core.general.Find(active1) )) - active1 = null - if(!( GLOB.data_core.security.Find(active2) )) - active2 = null - if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)) || issilicon(usr) || IsAdminGhost(usr)) - usr.set_machine(src) - switch(href_list["choice"]) -// SORTING! - if("Sorting") - // Reverse the order if clicked twice - if(sortBy == href_list["sort"]) - if(order == 1) - order = -1 - else - order = 1 - else - // New sorting order! - sortBy = href_list["sort"] - order = initial(order) -//BASIC FUNCTIONS - if("Clear Screen") - temp = null - - if("Return") - screen = 1 - active1 = null - active2 = null - - if("Log Out") - authenticated = null - screen = null - active1 = null - active2 = null - playsound(src, 'sound/machines/terminal_off.ogg', 50, FALSE) - - if("Log In") - var/mob/M = usr - var/obj/item/card/id/I = M.get_idcard(TRUE) - if(issilicon(M)) - active1 = null - active2 = null - authenticated = M.name - rank = JOB_NAME_AI - screen = 1 - else if(IsAdminGhost(M)) - active1 = null - active2 = null - authenticated = M.client.holder.admin_signature - rank = JOB_CENTCOM_CENTRAL_COMMAND - screen = 1 - else if(I && check_access(I)) - active1 = null - active2 = null - authenticated = I.registered_name - rank = I.assignment - screen = 1 - else - to_chat(usr, "Unauthorized Access.") - playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE) - -//RECORD FUNCTIONS - if("Record Maintenance") - screen = 2 - active1 = null - active2 = null - - if("Browse Record") - var/datum/data/record/R = locate(href_list["d_rec"]) in GLOB.data_core.general - if(!R) - temp = "Record Not Found!" - else - active1 = active2 = R - for(var/datum/data/record/E in GLOB.data_core.security) - if((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - active2 = E - screen = 3 - - if("Pay") - for(var/datum/data/crime/p in active2.fields["citation"]) - if(p.dataId == text2num(href_list["cdataid"])) - var/obj/item/holochip/C = usr.is_holding_item_of_type(/obj/item/holochip) - if(C && istype(C)) - var/pay = C.get_item_credit_value() - if(!pay) - to_chat(usr, "[C] doesn't seem to be worth anything!") - else - var/diff = p.fine - p.paid - GLOB.data_core.payCitation(active2.fields["id"], text2num(href_list["cdataid"]), pay) - to_chat(usr, "You have paid [pay] credit\s towards your fine.") - if (pay == diff || pay > diff || pay >= diff) - usr.investigate_log(" paid off their citation for [p.crimeName] ([p.fine]).", INVESTIGATE_RECORDS) - to_chat(usr, "The fine has been paid in full.") - qdel(C) - playsound(src, "terminal_type", 25, FALSE) - else - to_chat(usr, "Fines can only be paid with holochips!") - - if("Print Record") - if(!( printing )) - printing = 1 - GLOB.data_core.securityPrintCount++ - playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) - sleep(30) - var/obj/item/paper/printed_paper = new /obj/item/paper( loc ) - var/final_paper_text = "
" - if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1))) - final_paper_text += "Name: [active1.fields["name"]] ID: [active1.fields["id"]]
\nGender: [active1.fields["gender"]]
\nAge: [active1.fields["age"]]
" - final_paper_text += "\nSpecies: [active1.fields["species"]]
" - final_paper_text += "\nFingerprint: [active1.fields["fingerprint"]]
\nPhysical Status: [active1.fields["p_stat"]]
\nMental Status: [active1.fields["m_stat"]]
" - else - final_paper_text += "General Record Lost!
" - if((istype(active2, /datum/data/record) && GLOB.data_core.security.Find(active2))) - final_paper_text += "
\n
\nCriminal Status: [active2.fields["criminal"]]" - - final_paper_text += "
\n
\nCrimes:
\n" - final_paper_text +={"
| Crime | -Details | -Author | -Time Added | -
|---|---|---|---|
| [c.crimeName] | " - final_paper_text += "[c.crimeDetails] | " - final_paper_text += "[c.author] | " - final_paper_text += "[c.time] | " - final_paper_text += "
\nImportant Notes:
\n\t[active2.fields["notes"]]
\n
\n
" - var/counter = 1 - while(active2.fields["com_[counter]"]) - final_paper_text += "[active2.fields["com_[counter]"]]
" - counter++ - printed_paper.name = "SR-[GLOB.data_core.securityPrintCount] '[active1.fields["name"]]'" - else - final_paper_text += "Security Record Lost!
" - printed_paper.name = "SR-[GLOB.data_core.securityPrintCount] 'Record Lost'" - final_paper_text += "" - printed_paper.add_raw_text(final_paper_text) - printed_paper.update_appearance() - printing = null - if("Print Poster") - if(!( printing )) - var/wanted_name = stripped_input(usr, "Please enter an alias for the criminal:", "Print Wanted Poster", active1.fields["name"]) - if(wanted_name) - var/default_description = "A poster declaring [wanted_name] to be a dangerous individual, wanted by Nanotrasen. Report any sightings to security immediately." - var/list/crimes = active2.fields["crim"] - if(crimes.len) - default_description += "\nCrimes:" - for(var/datum/data/crime/c in active2.fields["crim"]) - default_description += "\n[c.crimeName]\n" - default_description += "[c.crimeDetails]\n" - - var/headerText = stripped_input(usr, "Please enter Poster Heading (Max 7 Chars):", "Print Wanted Poster", "WANTED", 8) - var/posternum = clamp((input("Number of posters to print (Max 5):","Number:",1) as num|null), 1, 5) - var/info = stripped_multiline_input(usr, "Please input a description for the poster:", "Print Wanted Poster", default_description, null) - if(info) - printing = 1 - for(var/i in 1 to posternum) - playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) - - sleep(30) - if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists. - var/obj/item/photo/photo = active1.get_front_photo() - new /obj/item/poster/wanted(loc, photo.picture.picture_image, wanted_name, info, headerText) - printing = 0 - if("Print Missing") - if(!( printing )) - var/missing_name = stripped_input(usr, "Please enter an alias for the missing person:", "Print Missing Persons Poster", active1.fields["name"]) - if(missing_name) - var/default_description = "A poster declaring [missing_name] to be a missing individual, missed by Nanotrasen. Report any sightings to security immediately." - - var/headerText = stripped_input(usr, "Please enter Poster Heading (Max 7 Chars):", "Print Missing Persons Poster", "MISSING", 8) - var/posternum = clamp((input("Number of posters to print (Max 5):","Number:",1) as num|null), 1, 5) - var/info = stripped_multiline_input(usr, "Please input a description for the poster:", "Print Missing Persons Poster", default_description, null) - if(info) - printing = 1 - for(var/i in 1 to posternum) - playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) - sleep(30) - if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists. - var/obj/item/photo/photo = active1.get_front_photo() - new /obj/item/poster/wanted/missing(loc, photo.picture.picture_image, missing_name, info, headerText) - printing = 0 - -//RECORD DELETE - if("Delete All Records") - temp = "" - temp += "Are you sure you wish to delete all Security records?
" - temp += "Yes
" - temp += "No" - - if("Purge All Records") - usr.investigate_log(" has purged all the security records.", INVESTIGATE_RECORDS) - for(var/datum/data/record/R in GLOB.data_core.security) - qdel(R) - GLOB.data_core.security.Cut() - temp = "All Security records deleted." - - if("Add Entry") - if(!( istype(active2, /datum/data/record) )) - return - var/a2 = active2 - var/t1 = stripped_multiline_input(usr, "Add Comment:", "Secure. records") - if(!canUseSecurityRecordsConsole(usr, t1, null, a2)) - return - var/counter = 1 - while(active2.fields["com_[counter]"]) - counter++ - active2.fields["com_[counter]"] = "Made by [src.authenticated] ([src.rank]) on [station_time_timestamp()] [time2text(world.realtime, "MMM DD")], [GLOB.year_integer+YEAR_OFFSET]
[t1]" - - if("Delete Record (ALL)") - if(active1) - temp = "
Are you sure you wish to delete the record (ALL)?
" - temp += "Yes" - temp += "No" - - if("Delete Record (Security)") - if(active2) - temp = "
Are you sure you wish to delete the record (Security Portion Only)?
" - temp += "Yes" - temp += "No" - - if("Delete Entry") - if((istype(active2, /datum/data/record) && active2.fields["com_[href_list["del_c"]]"])) - active2.fields["com_[href_list["del_c"]]"] = "Deleted" -//RECORD CREATE - if("New Record (Security)") - if((istype(active1, /datum/data/record) && !( istype(active2, /datum/data/record) ))) - var/datum/data/record/R = new /datum/data/record() - R.fields["name"] = active1.fields["name"] - R.fields["id"] = active1.fields["id"] - R.name = "Security Record #[R.fields["id"]]" - R.fields["criminal"] = "None" - R.fields["crim"] = list() - R.fields["notes"] = "No notes." - GLOB.data_core.security += R - active2 = R - screen = 3 - - if("New Record (General)") - //General Record - var/datum/data/record/G = new /datum/data/record() - G.fields["name"] = "New Record" - G.fields["id"] = "[num2hex(rand(1, 1.6777215E7), 6)]" - G.fields["rank"] = "Unassigned" - G.fields["hud"] = JOB_HUD_UNKNOWN - G.fields["active_dept"] = NONE - G.fields["gender"] = "Male" - G.fields["age"] = "Unknown" - G.fields["species"] = "Human" - G.fields["photo_front"] = new /icon() - G.fields["photo_side"] = new /icon() - G.fields["fingerprint"] = "?????" - G.fields["p_stat"] = "Active" - G.fields["m_stat"] = "Stable" - GLOB.data_core.general += G - active1 = G - - //Security Record - var/datum/data/record/R = new /datum/data/record() - R.fields["name"] = active1.fields["name"] - R.fields["id"] = active1.fields["id"] - R.name = "Security Record #[R.fields["id"]]" - R.fields["criminal"] = "None" - R.fields["crim"] = list() - R.fields["notes"] = "No notes." - GLOB.data_core.security += R - active2 = R - - //Medical Record - var/datum/data/record/M = new /datum/data/record() - M.fields["id"] = active1.fields["id"] - M.fields["name"] = active1.fields["name"] - M.fields["blood_type"] = "?" - M.fields["b_dna"] = "?????" - M.fields["mi_dis"] = "None" - M.fields["mi_dis_d"] = "No minor disabilities have been declared." - M.fields["ma_dis"] = "None" - M.fields["ma_dis_d"] = "No major disabilities have been diagnosed." - M.fields["alg"] = "None" - M.fields["alg_d"] = "No allergies have been detected in this patient." - M.fields["cdi"] = "None" - M.fields["cdi_d"] = "No diseases have been diagnosed at the moment." - M.fields["notes"] = "No notes." - GLOB.data_core.medical += M - - - -//FIELD FUNCTIONS - if("Edit Field") - var/a1 = active1 - var/a2 = active2 - - switch(href_list["field"]) - if("name") - if(istype(active1, /datum/data/record) || istype(active2, /datum/data/record)) - var/t1 = stripped_input(usr, "Please input name:", "Secure. records", active1.fields["name"]) - if(!canUseSecurityRecordsConsole(usr, t1, a1)) - return - if(istype(active1, /datum/data/record)) - active1.fields["name"] = t1 - if(istype(active2, /datum/data/record)) - active2.fields["name"] = t1 - if("id") - if(istype(active2, /datum/data/record) || istype(active1, /datum/data/record)) - var/t1 = stripped_input(usr, "Please input id:", "Secure. records", active1.fields["id"]) - if(!canUseSecurityRecordsConsole(usr, t1, a1)) - return - if(istype(active1, /datum/data/record)) - active1.fields["id"] = t1 - if(istype(active2, /datum/data/record)) - active2.fields["id"] = t1 - if("fingerprint") - if(istype(active1, /datum/data/record)) - var/t1 = stripped_input(usr, "Please input fingerprint hash:", "Secure. records", active1.fields["fingerprint"], null) - if(!canUseSecurityRecordsConsole(usr, t1, a1)) - return - active1.fields["fingerprint"] = t1 - if("gender") - if(istype(active1, /datum/data/record)) - var/t1 = input(usr, "Select gender", "Secure. records", active1.fields["gender"]) as null|anything in list(MALE, FEMALE, "other") - if(!canUseSecurityRecordsConsole(usr, t1, a1)) - return - active1.fields["gender"] = capitalize(t1) - if("age") - if(istype(active1, /datum/data/record)) - var/t1 = input("Please input age:", "Secure. records", active1.fields["age"], null) as num - if(!isnum_safe(t1) || !canUseSecurityRecordsConsole(usr, "age", a1)) - return - active1.fields["age"] = t1 - if("species") - if(istype(active1, /datum/data/record)) - var/t1 = input("Select a species", "Species Selection") as null|anything in get_selectable_species() - if(!canUseSecurityRecordsConsole(usr, t1, a1)) - return - active1.fields["species"] = t1 - if("upd_photo_front") - var/datum/picture/picture = get_picture(usr) - if(picture) - qdel(active1.fields["photo_front"]) - //Lets center it to a 32x32. - var/icon/I = picture.picture_image - var/w = I.Width() - var/h = I.Height() - var/dw = w - 32 - var/dh = w - 32 - I.Crop(dw/2, dh/2, w - dw/2, h - dh/2) - var/obj/item/photo/new_photo = new - new_photo.picture = picture - active1.fields["photo_front"] = new_photo - if("print_photo_front") - if(active1.fields["photo_front"]) - if(istype(active1.fields["photo_front"], /datum/picture)) - var/datum/picture/P = active1.fields["photo_front"] - print_photo(P.picture_image, active1.fields["name"]) - if("upd_photo_side") - var/datum/picture/picture = get_picture(usr) - if(picture) - qdel(active1.fields["photo_side"]) - //Lets center it to a 32x32. - var/icon/I = picture.picture_image - var/w = I.Width() - var/h = I.Height() - var/dw = w - 32 - var/dh = w - 32 - I.Crop(dw/2, dh/2, w - dw/2, h - dh/2) - active1.fields["photo_side"] = picture - if("print_photo_side") - if(active1.fields["photo_side"]) - if(istype(active1.fields["photo_side"], /datum/picture)) - var/datum/picture/P = active1.fields["photo_side"] - print_photo(P.picture_image, active1.fields["name"]) - if("crim_add") - if(istype(active1, /datum/data/record)) - var/t1 = stripped_input(usr, "Please input crime name:", "Secure. records", "", null) - var/t2 = stripped_input(usr, "Please input crime details:", "Secure. records", "", null) - if(!canUseSecurityRecordsConsole(usr, t1, null, a2)) - return - var/crime = GLOB.data_core.createCrimeEntry(t1, t2, authenticated, station_time_timestamp()) - GLOB.data_core.addCrime(active1.fields["id"], crime) - usr.investigate_log(" has added a crime '[t1]': '[t2]' to [active1.fields["name"]] via security records.", INVESTIGATE_RECORDS) - if("crim_delete") - if(istype(active1, /datum/data/record)) - if(href_list["cdataid"]) - if(!canUseSecurityRecordsConsole(usr, "delete", null, a2)) - return - GLOB.data_core.removeCrime(active1.fields["id"], href_list["cdataid"]) - if("add_details") - if(istype(active1, /datum/data/record)) - if(href_list["cdataid"]) - var/t1 = stripped_input(usr, "Please input crime details:", "Secure. records", "", null) - if(!canUseSecurityRecordsConsole(usr, t1, null, a2)) - return - GLOB.data_core.addCrimeDetails(active1.fields["id"], href_list["cdataid"], t1) - usr.investigate_log(" has set crime details ([t1]) to [active1.fields["name"]] via security records.", INVESTIGATE_RECORDS) - if("citation_add") - if(istype(active1, /datum/data/record)) - var/maxFine = CONFIG_GET(number/maxfine) - - var/t1 = stripped_input(usr, "Please input citation crime:", "Secure. records", "", null) - var/fine = FLOOR(input(usr, "Please input citation fine, up to [maxFine]:", "Secure. records", 50) as num|null, 1) - - if (isnull(fine)) - return - fine = min(fine, maxFine) - - if(fine < 0) - to_chat(usr, "You're pretty sure that's not how money works.") - return - - if(!canUseSecurityRecordsConsole(usr, t1, null, a2)) - return - var/datum/data/crime/crime = GLOB.data_core.createCrimeEntry(t1, "", authenticated, station_time_timestamp(), fine) - for (var/obj/item/modular_computer/tablet in GLOB.TabletMessengers) - if(tablet.saved_identification == active1.fields["name"]) - var/message = "You have been fined [fine] credits for '[t1]'. Fines may be paid at security." - var/datum/signal/subspace/messaging/tablet_msg/signal = new(src, list( - "name" = "Security Citation", - "job" = "Citation Server", - "message" = message, - "targets" = list(tablet), - "automated" = TRUE - )) - signal.send_to_receivers() - usr.log_message("(PDA: Citation Server) sent \"[message]\" to [signal.format_target()]", LOG_PDA) - GLOB.data_core.addCitation(active1.fields["id"], crime) - usr.investigate_log(" has added a citation '[t1]' ([fine] credits) to [active1.fields["name"]] via security records.", INVESTIGATE_RECORDS) - if("citation_delete") - if(istype(active1, /datum/data/record)) - if(href_list["cdataid"]) - if(!canUseSecurityRecordsConsole(usr, "delete", null, a2)) - return - usr.investigate_log(" has deleted [active1.fields["name"]]'s citation '[active1.fields["id"]]'.", INVESTIGATE_RECORDS) - GLOB.data_core.removeCitation(active1.fields["id"], href_list["cdataid"]) - if("notes") - if(istype(active2, /datum/data/record)) - var/t1 = stripped_input(usr, "Please summarize notes:", "Secure. records", active2.fields["notes"], null) - if(!canUseSecurityRecordsConsole(usr, t1, null, a2)) - return - active2.fields["notes"] = t1 - usr.investigate_log(" has set [active1.fields["name"]]'s security records important notes to '[t1]'.", INVESTIGATE_RECORDS) - if("criminal") - if(istype(active2, /datum/data/record)) - temp = "
Criminal Status:
" - temp += "- "
- temp += "
- None " - temp += "
- Arrest " - temp += "
- Search " - temp += "
- Monitor " - temp += "
- Incarcerated " - temp += "
- Paroled " - temp += "
- Discharged " - temp += "
Rank:
" - temp += "- "
- for(var/rank in get_all_jobs())
- temp += "
- [rank] " - temp += "
"} - if(current) - var/background - var/notice = "" - switch(current.fields["criminal"]) - if("Arrest") - background = "background-color:#990000;" - notice = "
**REPORT TO THE BRIG**" - if("Incarcerated") - background = "background-color:#CD6500;" - if("Search") - background = "'background-color:#9B13EB;'" - if("Monitor") - background = "'background-color:#990000;'" - if("Paroled") - background = "background-color:#CD6500;" - if("Discharged") - background = "background-color:#006699;" - if("None") - background = "background-color:#4F7529;" - if("") - background = "''" //"'background-color:#FFFFFF;'" - dat += "Warrant Data" - dat += {"
| Name: | [current.fields["name"]] |
| ID: | [current.fields["id"]] |
-
- [current.fields["criminal"]][notice]
-
"}
-
- dat += "Citations:" - - dat +={"
| Crime | -Fine | -Author | -Time Added | -Amount Due | -Make Payment | -||
|---|---|---|---|---|---|---|---|
| [c.crimeName] | -$[c.fine] | -[c.author] | -[c.time] | "} - if(owed > 0) - dat += {"$[owed] | -\[Pay\] | "} - else - dat += "All Paid Off | " - dat += "|
Crimes:" - dat +={"
| Crime | -Details | -Author | -Time Added | -
|---|---|---|---|
| [c.crimeName] | -[c.crimeDetails] | -[c.author] | -[c.time] | -
"} - - var/datum/browser/popup = new(user, "warrant", "Security Warrant Console", 600, 400) - popup.set_content(dat.Join()) - popup.open() - -/obj/machinery/computer/warrant/Topic(href, href_list) - if(..()) - return - var/mob/M = usr - switch(href_list["choice"]) - if("Login") - if(iscyborg(M)) //cyborgs cannot be set to arrest - return - var/obj/item/card/id/scan = M.get_idcard(TRUE) - if(scan) - authenticated = scan.registered_name - if(authenticated) - for(var/datum/data/record/R in GLOB.data_core.security) - if(R.fields["name"] == authenticated) - current = R - playsound(src, 'sound/machines/terminal_on.ogg', 50, 0) - if("Logout") - current = null - authenticated = null - playsound(src, 'sound/machines/terminal_off.ogg', 50, 0) - - if("Pay") - for(var/datum/data/crime/p in current.fields["citation"]) - if(p.dataId == text2num(href_list["cdataid"])) - var/obj/item/holochip/C = M.is_holding_item_of_type(/obj/item/holochip) - if(C && istype(C)) - var/pay = C.get_item_credit_value() - if(!pay) - to_chat(M, "[C] doesn't seem to be worth anything!") - else - var/diff = p.fine - p.paid - GLOB.data_core.payCitation(current.fields["id"], text2num(href_list["cdataid"]), pay) - to_chat(M, "You have paid [pay] credit\s towards your fine.") - if (pay == diff || pay > diff || pay >= diff) - usr.investigate_log(" paid off their citation for [p.crimeName] ([p.fine]).", INVESTIGATE_RECORDS) - to_chat(M, "The fine has been paid in full.") - qdel(C) - playsound(src, "terminal_type", 25, 0) - else - to_chat(M, "Fines can only be paid with holochips.") - updateUsrDialog() - add_fingerprint(M) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "WarrantConsole", name) + ui.set_autoupdate(FALSE) + ui.open() + +/obj/machinery/computer/warrant/ui_data(mob/user) + var/list/data = list() + + var/list/records = list() + + for(var/datum/record/crew/target in GLOB.manifest.general) + if(!length(target.citations)) + continue + + var/list/citations = list() + + for(var/datum/crime_record/citation/warrant as anything in target.citations) + var/list/entry = list(list( + author = warrant.author, + details = warrant.details, + fine = warrant.fine, + fine_name = warrant.name, + fine_ref = REF(warrant), + paid = warrant.paid, + time = warrant.time, + )) + citations += entry + + var/list/record = list(list( + citations = citations, + crew_name = target.name, + record_ref = REF(target), + notes = target.security_note, + rank = target.rank, + )) + records += record + + data["records"] = records + + return data + +/obj/machinery/computer/warrant/ui_act(action, list/params, datum/tgui/ui) + . = ..() + if(.) + return FALSE + + switch(action) + if("pay") + pay_fine(usr, params) + return TRUE + + if("print") + ui.close() + print_bounty(usr, params) + return TRUE + + if("refresh") + return TRUE + + return FALSE + +/// Pays towards a listed fine. +/obj/machinery/computer/warrant/proc/pay_fine(mob/user, list/params) + var/datum/record/crew/target = locate(params["record_ref"]) in GLOB.manifest.general + if(!target) + return FALSE + + var/datum/crime_record/citation/warrant = locate(params["fine_ref"]) in target.citations + if(!warrant) + return FALSE + + if(!isliving(user) || issilicon(user)) + to_chat(user, "ACCESS DENIED") + playsound(src, 'sound/machines/terminal_error.ogg', 100, TRUE) + return FALSE + + var/mob/living/player = user + var/obj/item/card/id/auth = player.get_idcard(TRUE) + if(!auth) + to_chat(user, "ACCESS DENIED: No ID card detected.") + playsound(src, 'sound/machines/terminal_error.ogg', 100, TRUE) + return FALSE + + var/datum/bank_account/account = auth.registered_account + if(!account?.account_holder || account.account_holder == "Unassigned") + to_chat(user, "ACCESS DENIED: No account linked to ID.") + playsound(src, 'sound/machines/terminal_error.ogg', 100, TRUE) + return FALSE + + var/amount = params["amount"] + if(!amount || !isnum(amount) || amount > warrant.fine || !account.adjust_money(-amount, "Paid fine for [target.name]")) + to_chat(user, "ACCESS DENIED: Invalid amount.") + playsound(src, 'sound/machines/terminal_error.ogg', 100, TRUE) + return FALSE + + account.bank_card_talk("You have paid [amount]cr towards [target.name]'s fine of [warrant.fine]cr.") + log_econ("[amount]cr was transferred from [user]'s transaction to [target.name]'s [warrant.fine]cr fine") + SSblackbox.record_feedback("amount", "credits_transferred", amount) + warrant.pay_fine(amount) + + if(amount >= 100 && target?.name != user) + var/list/titles = list( + "An anonymous benefactor", + "A generous citizen", + "A kind soul", + "A good samaritan", + "A friendly face", + "A helpful stranger", + ) + warrant.alert_owner(user, src, target.name, "[pick(titles)] has paid [amount]cr towards your fine.") + + var/datum/bank_account/sec_account = SSeconomy.get_budget_account(ACCOUNT_SEC_ID) + sec_account.adjust_money(amount) + + if(warrant.fine != 0 || target.name == user) + return TRUE + + warrant.alert_owner(user, src, target.name, "One of your outstanding warrants has been completely paid.") + warrant.valid = FALSE + return TRUE + +/// Finishes printing, resets the printer. +/obj/machinery/computer/warrant/proc/print_finish(obj/item/paper/bounty) + printing = FALSE + playsound(src, 'sound/machines/terminal_eject.ogg', 100, TRUE) + bounty.forceMove(loc) + + return TRUE + +/// Prints a bounty for a listed fine. +/obj/machinery/computer/warrant/proc/print_bounty(mob/user, list/params) + if(printing) + balloon_alert(user, "printer busy") + playsound(src, 'sound/machines/terminal_error.ogg', 100, TRUE) + return FALSE + + var/datum/record/crew/target = locate(params["record_ref"]) in GLOB.manifest.general + if(!target) + return FALSE + + var/datum/crime_record/citation/warrant = locate(params["fine_ref"]) in target.citations + if(!warrant?.fine) + return FALSE + + var/bounty_text = "
Bounty for [target.name]
" + bounty_text += "
" + bounty_text += "Details:
[warrant.details]
" + bounty_text += "Issued to:
[usr]
" + bounty_text += "Issued on:
[warrant.time]
" + bounty_text += "Comments:
[!target.security_note ? "None." : target.security_note]
" + bounty_text += "
" dat += "
| Name | Position |
|---|---|
| [t.fields["name"]] | [t.fields["rank"]] |
| [t.name] | [t.rank] |
[report.Join("
")]
"
-
-/datum/team/gang/proc/greet_gangster(datum/mind/gangster)//THIS NEEDS REVISION
- to_chat(gangster, "You are now a member of the [name] Gang!")
- to_chat(gangster, "Help your bosses take over the station by claiming territory with special spraycans only they can provide. Simply spray on any unclaimed area of the station.")
- to_chat(gangster, "Your objective is to take over as many territories as possible, and expand the influence of your gang.")
- to_chat(gangster, "You can identify your mates by their large, bright \[G\] icon.")
- gangster.store_memory("You are a member of the [name] Gang!")
-
-/datum/team/gang/proc/handle_territories() //influence is counted here
- next_point_time = world.time + INFLUENCE_INTERVAL
- if(!leaders.len)
- return
- var/added_names = ""
- var/lost_names = ""
-
- //Re-add territories that were reclaimed, so if they got tagged over, they can still earn income if they tag it back before the next status report
- var/list/reclaimed_territories = new_territories & lost_territories
- territories |= reclaimed_territories
- new_territories -= reclaimed_territories
- lost_territories -= reclaimed_territories
-
- //Process lost territories
- for(var/area in lost_territories)
- if(lost_names != "")
- lost_names += ", "
- lost_names += "[lost_territories[area]]"
- territories -= area
-
- //Calculate and report influence growth
-
- //Process new territories
- for(var/area in new_territories)
- if(added_names != "")
- added_names += ", "
- added_names += "[new_territories[area]]"
- territories += area
-
- //Report territory changes
- var/message = "[src] Gang Status Report:.")]
*---------*
" - message += "[new_territories.len] new territories:
[added_names]
" - message += "[lost_territories.len] territories lost:
[lost_names]
" - //Clear the lists - new_territories = list() - lost_territories = list() - var/total_territories = total_claimable_territories() - var/control = round((territories.len/total_territories)*100, 1) - var/uniformed = count_gang_swag() - message += "Your gang now has [control]% control of the station.
*---------*
" - - var/new_influence = update_influence() - influence = min(999,influence+new_influence) - victory_points += new_influence - if(new_influence > 0) - message += "Gang influence has increased by [new_influence] for defending [territories.len] territories and [uniformed] swag.
" - message += "Your gang now has [influence] influence.
" - - message_gangtools(message) - addtimer(CALLBACK(src, PROC_REF(handle_territories)), INFLUENCE_INTERVAL) - - -/datum/team/gang/proc/total_claimable_territories() - var/list/valid_territories = list() - for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION)) //First, collect all area types on the station zlevel - for(var/ar in SSmapping.areas_in_z["[z]"]) - var/area/A = ar - if(!(A.type in valid_territories) && A.area_flags & VALID_TERRITORY) - valid_territories |= A.type - return valid_territories.len - -/datum/team/gang/proc/update_influence() - return min(999,influence + INFLUENCE_BASE + (count_gang_swag()) + LAZYLEN(territories) * INFLUENCE_TERRITORY) - -/datum/team/gang/proc/count_gang_swag() - //Count swag on gangsters - var/swag = 0 - for(var/datum/mind/gangmind in members) - if(ishuman(gangmind.current)) - swag+=check_gangster_swag(gangmind.current) - return swag - -/datum/team/gang/proc/check_gangster_swag(var/mob/living/carbon/human/gangster) - //Gangster must be alive and on station - var/swag = 1 - if((gangster.stat == DEAD) || !(is_station_level(gangster.z))) - return FALSE - if (gangster.w_uniform?.type == outfit) - swag *= INFLUENCE_SWAG - if (gangster.wear_suit?.type == suit) - swag *= INFLUENCE_SWAG - if (gangster.head?.type == hat) - swag *= INFLUENCE_SWAG - return swag - -/datum/team/gang/proc/adjust_influence(value) - influence = max(0, influence + value) - -/datum/team/gang/proc/message_gangtools(message) - if(!gangtools.len || !message) - return - for(var/i in gangtools) - var/obj/item/device/gangtool/tool = i - var/mob/living/mob = get(tool.loc, /mob/living) - if(mob && mob.mind && mob.stat == CONSCIOUS) - var/datum/antagonist/gang/gangster = mob.mind.has_antag_datum(/datum/antagonist/gang) - if(gangster.gang == src) - to_chat(mob, "[icon2html(tool, mob)] [message]") - playsound(mob.loc, 'sound/machines/twobeep.ogg', 50, 1) - return - -#undef MAXIMUM_RECALLS -#undef INFLUENCE_INTERVAL -#undef INFLUENCE_SWAG -#undef INFLUENCE_TERRITORY -#undef INFLUENCE_BASE diff --git a/code/modules/antagonists/gang/gang_datums.dm b/code/modules/antagonists/gang/gang_datums.dm deleted file mode 100644 index 25122e3d55976..0000000000000 --- a/code/modules/antagonists/gang/gang_datums.dm +++ /dev/null @@ -1,146 +0,0 @@ -// Gang datums go here. If you want to create a new gang, you must be sure to edit: -// name -// color (must be a hex, "blue" isn't acceptable due to how spraycans are handled) -// hat/outfit/suit is the type of items that will count towards the points/scoring. Lists are nice and all, but they weren't really used at all... ever. And were just expensive -// You also need to make a gang graffiti, that will go in crayondecal.dmi inside our icons(not tg's), with the same name of the gang it's assigned to. Nothing else,just the icon. -// Those are all required. If one is missed, stuff could break. - -/datum/team/gang/clandestine - name = "Clandestine" - color = "#FF0000" - hat = /obj/item/clothing/head/beanie/black - outfit = /obj/item/clothing/under/syndicate/combat - suit = /obj/item/clothing/suit/jacket/bomber - -/datum/team/gang/prima - name = "Prima" - color = "#FFFF00" //cluck cluck clan - hat = /obj/item/clothing/head/costume/chicken - outfit = /obj/item/clothing/under/color/yellow - suit = /obj/item/clothing/suit/costume/chickensuit - -/datum/team/gang/zerog - name = "Zero-G" - color = "#00FFFF" - outfit = /obj/item/clothing/under/color/blue - suit = /obj/item/clothing/suit/apron - hat = /obj/item/clothing/head/beanie/stripedblue - -/datum/team/gang/max - name = "Max" - color = "#800000" - hat = /obj/item/clothing/head/hats/tophat - outfit = /obj/item/clothing/under/costume/joker - suit = /obj/item/clothing/suit/costume/joker - -/datum/team/gang/blasto - name = "Blasto" - color = "#000080" - hat = /obj/item/clothing/head/beret/navy - outfit = /obj/item/clothing/under/suit/navy - suit = /obj/item/clothing/suit/jacket/miljacket - -/datum/team/gang/waffle - name = "Waffle" - color = "#808000" - hat = /obj/item/clothing/head/costume/sombrero/green - outfit = /obj/item/clothing/under/suit/green - suit = /obj/item/clothing/suit/costume/poncho/green - -/datum/team/gang/north - name = "North" - color = "#C0C0C0" - hat = /obj/item/clothing/head/costume/snowman - outfit = /obj/item/clothing/under/suit/white - suit = /obj/item/clothing/suit/costume/snowman - -/datum/team/gang/omni - name = "Omni" - color = "#008080" - hat = /obj/item/clothing/head/soft/blue - outfit = /obj/item/clothing/under/color/teal - suit = /obj/item/clothing/suit/apron/overalls - -/datum/team/gang/newton - name = "Newton" - color = "#A52A2A" - hat = /obj/item/clothing/head/costume/griffin - outfit = /obj/item/clothing/under/color/brown - suit = /obj/item/clothing/suit/toggle/owlwings/griffinwings - -/datum/team/gang/cyber - name = "Cyber" - color = "#0000FF" - hat = /obj/item/clothing/head/helmet/rus_ushanka - outfit = /obj/item/clothing/under/color/darkblue - suit = /obj/item/clothing/suit/jacket/officer/tan - -/datum/team/gang/donk - name = "Donk" - color = "#808000" - hat = /obj/item/clothing/head/beret/black - outfit = /obj/item/clothing/under/color/green - suit = /obj/item/clothing/suit/jacket/puffer/vest - -/datum/team/gang/gene - name = "Gene" - color = "#00FF00" - hat = /obj/item/clothing/head/soft/green - outfit = /obj/item/clothing/under/color/green - suit = /obj/item/clothing/suit/toggle/labcoat/mad - -/datum/team/gang/gib - name = "Gib" - color = "#000000" - outfit = /obj/item/clothing/under/color/black - suit = /obj/item/clothing/suit/toggle/lawyer/black - hat = /obj/item/clothing/head/hats/bowler - -/datum/team/gang/diablo - name = "Diablo" - color = "#FF0000" - outfit = /obj/item/clothing/under/color/red - suit = /obj/item/clothing/suit/jacket/leather - hat = /obj/item/clothing/head/beret - -/datum/team/gang/psyke - name = "Psyke" - color = "#808080" - hat = /obj/item/clothing/head/soft/rainbow - suit = /obj/item/clothing/suit/costume/poncho/ponchoshame - outfit = /obj/item/clothing/under/color/rainbow - -/datum/team/gang/osiron - name = "Osiron" - color = "#FFFFFF" - outfit = /obj/item/clothing/under/costume/roman - hat = /obj/item/clothing/head/helmet/roman/legionnaire/fake - suit = /obj/item/clothing/suit/toggle/owlwings - -/datum/team/gang/sirius - name = "Sirius" - color = "#FFC0CB" - hat = /obj/item/clothing/head/fedora - outfit = /obj/item/clothing/under/color/white - suit = /obj/item/clothing/suit/costume/nerdshirt - -/datum/team/gang/sleepingcarp - name = "Sleeping Carp" - color = "#800080" - outfit = /obj/item/clothing/under/color/lightpurple - suit = /obj/item/clothing/suit/toggle/lawyer/purple - hat = /obj/item/clothing/head/hooded/carp_hood - -/datum/team/gang/rigatonifamily - name = "Rigatoni family" - color = "#cc9900" // p a s t a colored - outfit = /obj/item/clothing/under/rank/civilian/chef - suit = /obj/item/clothing/suit/apron/chef - hat = /obj/item/clothing/head/utility/chefhat - -/datum/team/gang/weed - name = "Weed" - color = "#66ff33" - hat = /obj/item/clothing/head/beanie/rasta - outfit = /obj/item/clothing/under/color/green - suit = /obj/item/clothing/suit/costume/vapeshirt diff --git a/code/modules/antagonists/gang/gang_hud.dm b/code/modules/antagonists/gang/gang_hud.dm deleted file mode 100644 index 825d361ab06c9..0000000000000 --- a/code/modules/antagonists/gang/gang_hud.dm +++ /dev/null @@ -1,34 +0,0 @@ -/datum/atom_hud/antag/gang - var/color = null - -/datum/atom_hud/antag/gang/add_to_hud(atom/A) - if(!A) - return - var/image/holder = A.hud_list[ANTAG_HUD] - if(holder) - holder.color = color - ..() - -/datum/atom_hud/antag/gang/remove_from_hud(atom/A) - if(!A) - return - var/image/holder = A.hud_list[ANTAG_HUD] - if(holder) - holder.color = null - ..() - -/datum/atom_hud/antag/gang/join_hud(mob/M) - if(!istype(M)) - CRASH("join_hud(): [M] ([M.type]) is not a mob!") - var/image/holder = M.hud_list[ANTAG_HUD] - if(holder) - holder.color = color - ..() - -/datum/atom_hud/antag/gang/leave_hud(mob/M) - if(!istype(M)) - CRASH("leave_hud(): [M] ([M.type]) is not a mob!") - var/image/holder = M.hud_list[ANTAG_HUD] - if(holder) - holder.color = null - ..() diff --git a/code/modules/antagonists/role_preference/role_antagonists.dm b/code/modules/antagonists/role_preference/role_antagonists.dm index d1390e4711c4c..55c885ceb53a0 100644 --- a/code/modules/antagonists/role_preference/role_antagonists.dm +++ b/code/modules/antagonists/role_preference/role_antagonists.dm @@ -286,19 +286,6 @@ head = /obj/item/clothing/head/costume/ushanka mask = null -/datum/role_preference/antagonist/gangster - name = "Gangster" - description = "Convince people to join your gang, wear your uniform, tag turf for the gang, and accomplish your gang's goals." - antag_datum = /datum/antagonist/gang - preview_outfit = /datum/outfit/gangster_preview - category = ROLE_PREFERENCE_CATEGORY_LEGACY - -/datum/outfit/gangster_preview - name = "Gangster (Preview only)" - head = /obj/item/clothing/head/beanie/black - uniform = /obj/item/clothing/under/syndicate/combat - suit = /obj/item/clothing/suit/jacket/bomber - /datum/role_preference/antagonist/nuclear_operative name = "Nuclear Operative" description = "Congratulations, agent. You have been chosen to join the Syndicate \ diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 9dcce22ebcd5e..503cd4d13a7e6 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -42,7 +42,8 @@ var/playstyle_string = "You are a slaughter demon, a terrible creature from another realm. You have a single desire: To kill. \ You may use the \"Blood Crawl\" ability near blood pools to travel through them, appearing and disappearing from the station at will. \ Pulling a dead or unconscious mob while you enter a pool will pull them in with you, allowing you to feast and regain your health. \ - You move quickly upon leaving a pool of blood, but the material world will soon sap your strength and leave you sluggish. " + You move quickly upon leaving a pool of blood, but the material world will soon sap your strength and leave you sluggish. \ + You cannot re-enter the living world until you've rested for five seconds in the sea of blood. \ " mobchatspan = "cultmobsay" @@ -53,6 +54,11 @@ deathmessage = "screams in anger as it collapses into a puddle of viscera!" discovery_points = 3000 + // Keep the people we hug! + var/list/consumed_mobs = list() + + var/revive_eject = FALSE + /mob/living/simple_animal/slaughter/Initialize(mapload) . = ..() var/obj/effect/proc_holder/spell/bloodcrawl/bloodspell = new @@ -60,6 +66,24 @@ if(istype(loc, /obj/effect/dummy/phased_mob/slaughter)) bloodspell.phased = TRUE +/mob/living/simple_animal/slaughter/Destroy() + var/turf/cur_loc = get_turf(src) + playsound(cur_loc, feast_sound, 50, 1, -1) + for(var/mob/living/stored_mob in consumed_mobs) + stored_mob.forceMove(cur_loc) + + if(!revive_eject) + continue + if(!stored_mob.revive(full_heal = TRUE, admin_revive = TRUE)) + continue + stored_mob.grab_ghost(force = TRUE) + to_chat(stored_mob, "You leave [src]'s warm embrace, and feel ready to take on the world.") + + consumed_mobs.Cut() + consumed_mobs = null + + return ..() + /obj/effect/decal/cleanable/blood/innards name = "pile of viscera" desc = "A repulsive pile of guts and gore." @@ -73,6 +97,18 @@ add_movespeed_modifier(/datum/movespeed_modifier/slaughter) addtimer(CALLBACK(src, PROC_REF(remove_movespeed_modifier), /datum/movespeed_modifier/slaughter, TRUE), 6 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) +/mob/living/simple_animal/slaughter/bloodcrawl_swallow(var/mob/living/victim) + if(consumed_mobs) + // Keep their corpse so rescue is possible + consumed_mobs += victim + else + // Be safe and just eject the corpse + victim.forceMove(get_turf(victim)) + victim.exit_blood_effect() + victim.visible_message("[victim] falls out of the air, covered in blood, looking highly confused. And dead.") + + +/mob/living/simple_animal/slaughter/proc/release_friends() //The loot from killing a slaughter demon - can be consumed to allow the user to blood crawl /obj/item/organ/heart/demon @@ -136,14 +172,12 @@ prison of hugs." loot = list(/mob/living/simple_animal/pet/cat/kitten{name = "Laughter"}) - // Keep the people we hug! - var/list/consumed_mobs = list() - playstyle_string = "You are a laughter \ demon, a wonderful creature from another realm. You have a single \ desire: To hug and tickle.
\ You may use the \"Blood Crawl\" ability near blood pools to travel \ through them, appearing and disappearing from the station at will. \ + You cannot re-enter the living world until you've rested for five seconds in the sea of blood. \ Pulling a dead or unconscious mob while you enter a pool will pull \ them in with you, allowing you to hug them and regain your health.
\ You move quickly upon leaving a pool of blood, but the material world \ @@ -153,9 +187,7 @@ released and fully healed, because in the end it's just a jape, \ sibling!" -/mob/living/simple_animal/slaughter/laughter/Destroy() - release_friends() - . = ..() + revive_eject = TRUE /mob/living/simple_animal/slaughter/laughter/ex_act(severity) switch(severity) @@ -166,29 +198,3 @@ adjustBruteLoss(60) if(EXPLODE_LIGHT) adjustBruteLoss(30) - -/mob/living/simple_animal/slaughter/laughter/proc/release_friends() - if(!consumed_mobs) - return - - for(var/mob/living/M in consumed_mobs) - if(!M) - continue - var/turf/T = find_safe_turf() - if(!T) - T = get_turf(src) - M.forceMove(T) - if(M.revive(full_heal = TRUE, admin_revive = TRUE)) - M.grab_ghost(force = TRUE) - playsound(T, feast_sound, 50, 1, -1) - to_chat(M, "You leave [src]'s warm embrace, and feel ready to take on the world.") - -/mob/living/simple_animal/slaughter/laughter/bloodcrawl_swallow(var/mob/living/victim) - if(consumed_mobs) - // Keep their corpse so rescue is possible - consumed_mobs += victim - else - // Be safe and just eject the corpse - victim.forceMove(get_turf(victim)) - victim.exit_blood_effect() - victim.visible_message("[victim] falls out of the air, covered in blood, looking highly confused. And dead.") diff --git a/code/modules/antagonists/space_dragon/carp_rift.dm b/code/modules/antagonists/space_dragon/carp_rift.dm index b8c4054f0de39..869dd05f33666 100644 --- a/code/modules/antagonists/space_dragon/carp_rift.dm +++ b/code/modules/antagonists/space_dragon/carp_rift.dm @@ -24,7 +24,7 @@ return var/area/A = get_area(S) if(!(A in dragon.chosen_rift_areas)) - to_chat(S, "You can't summon a rift here!") + owner.balloon_alert(owner, "can't summon a rift here, check your objectives!") return for(var/obj/structure/carp_rift/rift in dragon.rift_list) var/area/RA = get_area(rift) diff --git a/code/modules/antagonists/traitor/equipment/contractor.dm b/code/modules/antagonists/traitor/equipment/contractor.dm index 546326d67e3b8..9999011e4febb 100644 --- a/code/modules/antagonists/traitor/equipment/contractor.dm +++ b/code/modules/antagonists/traitor/equipment/contractor.dm @@ -74,8 +74,8 @@ ) //What the fuck - if(length(to_generate) > length(GLOB.data_core.locked)) - to_generate.Cut(1, length(GLOB.data_core.locked)) + if(length(to_generate) > length(GLOB.manifest.locked)) + to_generate.Cut(1, length(GLOB.manifest.locked)) // We don't want the sum of all the payouts to be under this amount var/lowest_TC_threshold = 30 diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm index 64174961c4add..ff6cdfa418775 100644 --- a/code/modules/antagonists/traitor/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/syndicate_contract.dm @@ -18,12 +18,12 @@ /datum/syndicate_contract/proc/generate(blacklist) contract.find_target(null, blacklist) - var/datum/data/record/record + var/datum/record/crew/record if (contract.target) - record = find_record("name", contract.target.name, GLOB.data_core.general) + record = find_record(contract.target.name, GLOB.manifest.general) if (record) - target_rank = record.fields["rank"] + target_rank = record.rank else target_rank = "Unknown" diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index 7e87d5571ec8c..4f9d06ddf1d0d 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -170,7 +170,7 @@ /datum/spellbook_entry/timestop name = "Time Stop" desc = "Stops time for everyone except for you, allowing you to move freely while your enemies and even projectiles are frozen." - spell_type = /obj/effect/proc_holder/spell/aoe_turf/conjure/timestop + spell_type = /obj/effect/proc_holder/spell/aoe_turf/timestop category = "Defensive" /datum/spellbook_entry/smoke diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 21bb1675add2a..94e9f8e46d02a 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -315,32 +315,6 @@ wizhud.leave_hud(wiz) set_antag_hud(wiz, null) - -/datum/antagonist/wizard/academy - name = "Academy Teacher" - outfit_type = /datum/outfit/wizard/academy - move_to_lair = FALSE - -/datum/antagonist/wizard/academy/equip_wizard() - . = ..() - - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt) - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile) - owner.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball) - - var/mob/living/M = owner.current - if(!istype(M)) - return - - var/obj/item/implant/exile/Implant = new/obj/item/implant/exile(M) - Implant.implant(M) - -/datum/antagonist/wizard/academy/create_objectives() - var/datum/objective/new_objective = new("Protect Wizard Academy from the intruders") - new_objective.owner = owner - objectives += new_objective - log_objective(owner, new_objective.explanation_text) - //Solo wizard report /datum/antagonist/wizard/roundend_report() var/list/parts = list() diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 4d000b79b5d6f..db427d2c2b87d 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -11,7 +11,8 @@ var/time = 20 var/sensitivity = 0 var/hearing_range = 3 - ///Proximity monitor associated with this atom, needed for it to work after this rework + ///Proximity monitor associated with this atom, needed for it to work. + var/datum/proximity_monitor/proximity_monitor /obj/item/assembly/prox_sensor/Initialize(mapload) . = ..() @@ -34,7 +35,7 @@ timing = !timing else scanning = FALSE - update_icon() + update_appearance() return TRUE /obj/item/assembly/prox_sensor/dropped() @@ -44,7 +45,7 @@ // assembly holder's attached object // assembly holder itself // us - proximity_monitor?.SetHost(connected?.holder || holder?.master || holder || src, src) + proximity_monitor?.set_host(connected?.holder || holder?.master || holder || src, src) /obj/item/assembly/prox_sensor/on_attach() . = ..() @@ -53,7 +54,7 @@ // assembly holder's attached object // assembly holder itself // us - proximity_monitor.SetHost(connected?.holder || holder?.master || holder || src, src) + proximity_monitor.set_host(connected?.holder || holder?.master || holder || src, src) /obj/item/assembly/prox_sensor/on_detach() . = ..() @@ -65,20 +66,20 @@ // assembly holder's attached object // assembly holder itself // us - proximity_monitor.SetHost(connected?.holder || holder?.master || holder || src, src) + proximity_monitor.set_host(connected?.holder || holder?.master || holder || src, src) /obj/item/assembly/prox_sensor/toggle_secure() secured = !secured if(!secured) if(scanning) toggle_scan() - proximity_monitor.SetHost(src,src) + proximity_monitor.set_host(src,src) timing = FALSE STOP_PROCESSING(SSobj, src) else START_PROCESSING(SSobj, src) - proximity_monitor.SetHost(loc,src) - update_icon() + proximity_monitor.set_host(loc,src) + update_appearance() return secured /obj/item/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj) @@ -89,7 +90,7 @@ /obj/item/assembly/prox_sensor/proc/sense() if(!scanning || !secured || next_activate > world.time) return FALSE - next_activate = world.time + 30 + next_activate = world.time + (3 SECONDS) pulse(FALSE) audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) playsound(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) @@ -110,28 +111,28 @@ if(!secured) return FALSE scanning = scan - proximity_monitor.SetRange(scanning ? sensitivity : 0) - update_icon() + proximity_monitor.set_range(scanning ? sensitivity : 0) + update_appearance() /obj/item/assembly/prox_sensor/proc/sensitivity_change(value) var/sense = min(max(sensitivity + value, 0), 5) sensitivity = sense - if(scanning && proximity_monitor.SetRange(sense)) + if(scanning && proximity_monitor.set_range(sense)) sense() -/obj/item/assembly/prox_sensor/update_icon() - cut_overlays() +/obj/item/assembly/prox_sensor/update_appearance() + . = ..() + holder?.update_appearance() + +/obj/item/assembly/prox_sensor/update_overlays() + . = ..() attached_overlays = list() if(timing) - add_overlay("prox_timing") + . += "prox_timing" attached_overlays += "prox_timing" if(scanning) - add_overlay("prox_scanning") + . += "prox_scanning" attached_overlays += "prox_scanning" - if(holder) - holder.update_icon() - return - /obj/item/assembly/prox_sensor/ui_requires_update(mob/user, datum/tgui/ui) . = ..() @@ -162,7 +163,8 @@ return data /obj/item/assembly/prox_sensor/ui_act(action, params) - if(..()) + . = ..() + if(.) return switch(action) @@ -176,7 +178,7 @@ . = TRUE if("time") timing = !timing - update_icon() + update_appearance() . = TRUE if("input") var/value = text2num(params["adjust"]) diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm deleted file mode 100644 index 6392ef169fb28..0000000000000 --- a/code/modules/awaymissions/mission_code/Cabin.dm +++ /dev/null @@ -1,160 +0,0 @@ - -/*Cabin areas*/ - -/area/awaymission/cabin - name = "Cabin" - icon_state = "away2" - requires_power = TRUE - dynamic_lighting = DYNAMIC_LIGHTING_ENABLED - -/area/awaymission/cabin/snowforest - name = "Snow Forest" - icon_state = "away" - dynamic_lighting = DYNAMIC_LIGHTING_DISABLED - -/area/awaymission/cabin/snowforest/sovietsurface - name = "Snow Forest" - icon_state = "awaycontent29" - requires_power = FALSE - -/area/awaymission/cabin/lumbermill - name = "Lumbermill" - icon_state = "away3" - requires_power = FALSE - dynamic_lighting = DYNAMIC_LIGHTING_DISABLED - -/area/awaymission/cabin/caves/sovietcave - name = "Soviet Bunker" - icon_state = "awaycontent4" - -/area/awaymission/cabin/caves - name = "North Snowdin Caves" - icon_state = "awaycontent15" - dynamic_lighting = DYNAMIC_LIGHTING_ENABLED - -/area/awaymission/cabin/caves/mountain - name = "North Snowdin Mountains" - icon_state = "awaycontent24" - -/obj/structure/firepit - name = "firepit" - desc = "Warm and toasty." - icon = 'icons/obj/fireplace.dmi' - icon_state = "firepit-active" - density = FALSE - var/active = 1 - -/obj/structure/firepit/Initialize(mapload) - . = ..() - toggleFirepit() - -/obj/structure/firepit/interact(mob/living/user) - if(active) - active = FALSE - toggleFirepit() - -/obj/structure/firepit/attackby(obj/item/W,mob/living/user,params) - if(!active) - var/msg = W.ignition_effect(src, user) - if(msg) - active = TRUE - visible_message(msg) - toggleFirepit() - else - return ..() - else - W.fire_act() - -/obj/structure/firepit/proc/toggleFirepit() - active = !active - if(active) - set_light(8) - icon_state = "firepit-active" - else - set_light(0) - icon_state = "firepit" - -/obj/structure/firepit/extinguish() - if(active) - active = FALSE - toggleFirepit() - -/obj/structure/firepit/fire_act(exposed_temperature, exposed_volume) - if(!active) - active = TRUE - toggleFirepit() - - - -//other Cabin Stuff// - -/obj/machinery/recycler/lumbermill - name = "lumbermill saw" - desc = "Faster then the cartoons!" - obj_flags = CAN_BE_HIT | EMAGGED - item_recycle_sound = 'sound/weapons/chainsawhit.ogg' - -/obj/machinery/recycler/lumbermill/recycle_item(obj/item/grown/log/L) - if(!istype(L)) - return - else - var/potency = L.seed.potency - ..() - new L.plank_type(src.loc, 1 + round(potency / 25)) - -/mob/living/simple_animal/chicken/rabbit/normal - icon_state = "b_rabbit" - icon_living = "b_rabbit" - icon_dead = "b_rabbit_dead" - icon_prefix = "b_rabbit" - minbodytemp = 0 - eggsleft = 0 - egg_type = null - speak = list() - mobchatspan = "assistant" - -/*Cabin's forest. Removed in the new cabin map since it was buggy and I prefer manual placement.*/ -/datum/mapGenerator/snowy - modules = list(/datum/mapGeneratorModule/bottomlayer/snow, \ - /datum/mapGeneratorModule/snow/pineTrees, \ - /datum/mapGeneratorModule/snow/deadTrees, \ - /datum/mapGeneratorModule/snow/randBushes, \ - /datum/mapGeneratorModule/snow/randIceRocks, \ - /datum/mapGeneratorModule/snow/bunnies) - -/datum/mapGeneratorModule/snow/checkPlaceAtom(turf/T) - if(istype(T, /turf/open/floor/plating/asteroid/snow)) - return ..(T) - return 0 - -/datum/mapGeneratorModule/bottomlayer/snow - spawnableTurfs = list(/turf/open/floor/plating/asteroid/snow/atmosphere = 100) - -/datum/mapGeneratorModule/snow/pineTrees - spawnableAtoms = list(/obj/structure/flora/tree/pine = 30) - -/datum/mapGeneratorModule/snow/deadTrees - spawnableAtoms = list(/obj/structure/flora/tree/dead = 10) - -/datum/mapGeneratorModule/snow/randBushes - spawnableAtoms = list() - -/datum/mapGeneratorModule/snow/randBushes/New() - ..() - spawnableAtoms = typesof(/obj/structure/flora/ausbushes) - for(var/i in spawnableAtoms) - spawnableAtoms[i] = 1 - -/datum/mapGeneratorModule/snow/bunnies - //spawnableAtoms = list(/mob/living/simple_animal/chicken/rabbit/normal = 0.1) - spawnableAtoms = list(/mob/living/simple_animal/chicken/rabbit = 0.5) - -/datum/mapGeneratorModule/snow/randIceRocks - spawnableAtoms = list(/obj/structure/flora/rock/icy = 5, /obj/structure/flora/rock/pile/icy = 5) - -/obj/effect/landmark/mapGenerator/snowy - mapGeneratorType = /datum/mapGenerator/snowy - endTurfX = 159 - endTurfY = 157 - startTurfX = 37 - startTurfY = 35 diff --git a/code/modules/awaymissions/mission_code/TheFactory.dm b/code/modules/awaymissions/mission_code/TheFactory.dm deleted file mode 100644 index ad46e44275bbe..0000000000000 --- a/code/modules/awaymissions/mission_code/TheFactory.dm +++ /dev/null @@ -1,835 +0,0 @@ -/obj/anomaly/singularity/factory - name = "tear in the fabric of reality" - desc = "Your own comprehension of reality starts bending as you stare this." - icon = 'icons/effects/96x96.dmi' - icon_state = "boh_tear" - pixel_x = -32 - pixel_y = -32 - dissipate = 0 - move_self = 0 - grav_pull = 1 - -/obj/anomaly/singularity/factory/admin_investigate_setup() - return - -//AREAS// -//"old" means places we get in after the rune transition - -/area/awaymission/factory - teleport_restriction = TELEPORT_ALLOW_NONE - -/area/awaymission/factory/secret - name = "secrets" - ambientsounds = list('sound/ambience/secrets.ogg','sound/ambience/ambiholy2.ogg') - -/area/awaymission/factory/villageafter - name = "The Village" - ambientsounds = list('sound/ambience/seag1.ogg', 'sound/ambience/seag2.ogg', 'sound/ambience/seag2.ogg', 'sound/ambience/ambiodd.ogg', 'sound/ambience/ambimystery.ogg', 'sound/ambience/ambiearth.ogg', 'sound/ambience/ambiwind.ogg', 'sound/ambience/ambimine.ogg') - dynamic_lighting = DYNAMIC_LIGHTING_DISABLED - requires_power = FALSE - -/area/awaymission/factory/villageafter/church - name = "The Church" - ambience_index = AMBIENCE_HOLY - -/area/awaymission/factory/villageafter/house - ambientsounds = list('sound/ambience/ambiruin4.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambiruin7.ogg','sound/ambience/ambiruin2.ogg') - -/area/awaymission/factory/villageafter/house/ritual - ambientsounds = list('sound/ambience/antag/ecult_op.ogg','sound/ambience/ambiruin2.ogg','sound/spookoween/insane_low_laugh.ogg') - mood_bonus = -2 - mood_message = "It smells like death in here!\n" - -/area/awaymission/factory/villageafter/house/start - name = "The House" - ambientsounds = list('sound/ambience/ambidet2.ogg','sound/ambience/ambiodd.ogg') - -/area/awaymission/factory/villageafter/hospital - ambientsounds = list('sound/ambience/ambiodd.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin2.ogg') - name = "The Hospital" - requires_power = TRUE - -/area/awaymission/factory/villageafter/spooky - ambience_index = AMBIENCE_SPOOKY - mood_bonus = -2 - mood_message = "It smells like death in here!\n" - -/area/awaymission/factory/factoryafter - name = "The Factory" - ambientsounds = list('sound/ambience/ambiodd.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambitech3.ogg') - requires_power = TRUE - always_unpowered = TRUE - -/area/awaymission/factory/clownplanet - dynamic_lighting = DYNAMIC_LIGHTING_DISABLED - ambientsounds = list('sound/spookoween/scary_horn3.ogg','sound/spookoween/scary_horn.ogg','sound/spookoween/scary_horn2.ogg','sound/spookoween/scary_clown_appear.ogg') - mood_bonus = 3 - mood_message = "I hate this!\n" - -/area/awaymission/factory/factoryafter/down - ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambifac.ogg','sound/ambience/ambimaint3.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambitech3.ogg') - requires_power = FALSE - always_unpowered = FALSE - dynamic_lighting = DYNAMIC_LIGHTING_ENABLED - -/area/awaymission/factory/factoryafter/down/maint - ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambimaint3.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambimaint2.ogg') - -/area/awaymission/factory/factoryafter/down/batsecret - name = "The maze" - ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambimaint3.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambimaint2.ogg','sound/ambience/ambibasement.ogg') - -/area/awaymission/factory/factoryafter/down/leveltwo - name = "The Factory - middle level" - ambientsounds = list('sound/ambience/ambigen7.ogg','sound/ambience/ambifac.ogg','sound/ambience/ambireebe1.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambigen14.ogg') - -/area/awaymission/factory/factoryafter/down/leveltwo/morgue - name = "The Morgue" - ambience_index = AMBIENCE_SPOOKY - mood_bonus = -2 - mood_message = "It smells like death in here!\n" - -/area/awaymission/factory/factoryafter/down/leveltwo/ritual - name = "a strange place" - ambientsounds = list('sound/ambience/antag/ecult_op.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambireebe2.ogg','sound/spookoween/insane_low_laugh.ogg','sound/spookoween/chain_rattling.ogg') - mood_bonus = -2 - mood_message = "It smells like death in here!\n" - -/area/awaymission/factory/factoryafter/down/levelthree - name = "The Factory - lower level" - ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambitech.ogg','sound/ambience/ambitech2.ogg','sound/ambience/ambitech3.ogg','sound/ambience/ambiatmos.ogg','sound/ambience/ambiatmos2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambimaint5.ogg','sound/ambience/ambireebe3.ogg','sound/ambience/ambilava.ogg') - -/area/awaymission/factory/factoryafter/down/levelthree/engine - name = "The reality engine" - ambientsounds = list('sound/ambience/singulambience.ogg','sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg','sound/ambience/antag/assimilation.ogg') - mood_bonus = 1 - mood_message = "Uhm... Ok?... I guess...\n" - -/area/awaymission/factory/factoryduring - name = "The old Factory" - ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambifac.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiatm1.ogg','sound/ambience/ambiatmos.ogg') - -/area/awaymission/factory/factoryduring/down/levelthree - name = "The old Factory - lower level" - ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambitech.ogg','sound/ambience/ambitech2.ogg','sound/ambience/ambitech3.ogg','sound/ambience/ambiatmos.ogg','sound/ambience/ambiatmos2.ogg','sound/ambience/signal.ogg','sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiruin2.ogg') - -/area/awaymission/factory/factoryduring/down/levelthree/engine - name = "The reality engine" - mood_bonus = 1 - mood_message = "Uhm... Ok?... I guess...\n" - ambientsounds = list('sound/ambience/singulambience.ogg','sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg','sound/ambience/antag/assimilation.ogg','sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg') - -/area/awaymission/factory/factoryduring/down/leveltwo - name = "The old Factory - middle level" - ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambifac.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiruin5.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg') - -/area/awaymission/factory/factoryduring/down/leveltwo/ritual - name = "a strange place" - ambientsounds = list('sound/ambience/antag/ecult_op.ogg','sound/spookoween/insane_low_laugh.ogg','sound/spookoween/spookywind.ogg') - -/area/awaymission/factory/factoryduring/down/leveltwo/morgue - name = "The old Morgue" - ambience_index = AMBIENCE_SPOOKY - mood_bonus = -2 - mood_message = "It smells like death in here!\n" - -/area/awaymission/factory/factoryduring/down/leveltwo/asylum - name = "The sector of mentally disordered" - ambientsounds = list('sound/ambience/ambimo2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambitech.ogg','sound/ambience/ambireebe1.ogg') - -/area/awaymission/factory/factoryduring/down - ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambitech3.ogg','sound/ambience/ambiatm1.ogg') - -/area/awaymission/factory/factoryduring/down/maint - ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiatm1.ogg','sound/ambience/ambimaint3.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambimaint2.ogg') - -/area/awaymission/factory/villageduring - name = "The old village" - dynamic_lighting = DYNAMIC_LIGHTING_DISABLED - requires_power = FALSE - ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiearthduring.ogg','sound/ambience/ambiwind.ogg','sound/ambience/ambimine.ogg') - -/area/awaymission/factory/villageduring/house - ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiearthduring.ogg','sound/ambience/ambiwind.ogg','sound/ambience/ambimine.ogg','sound/ambience/ambiruin4.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambiruin7.ogg','sound/ambience/ambiruin2.ogg','sound/ambience/signal.ogg') - -/area/awaymission/factory/villageduring/house/ritual - ambientsounds = list('sound/ambience/antag/ecult_op.ogg','sound/ambience/ambiruin2.ogg','sound/spookoween/insane_low_laugh.ogg') - mood_bonus = -2 - mood_message = "It smells like death in here!\n" - -/area/awaymission/factory/villageduring/church - name = "The old Church" - ambience_index = AMBIENCE_HOLY - -/area/awaymission/factory/villageduring/church/leveltwo - name = "The old Church - 2nd floor" - ambientsounds = list('sound/ambience/ambimystery.ogg','sound/ambience/ambiodd.ogg','sound/ambience/signal.ogg','sound/ambience/ambiwind.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambiholy3.ogg') - -/area/awaymission/factory/villageduring/basement - name = "The old basement" - ambientsounds = list('sound/ambience/ambibasement.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambiodd.ogg') - dynamic_lighting = DYNAMIC_LIGHTING_ENABLED - -/area/awaymission/factory/villageduring/house/start - name = "The old House" - ambientsounds = list('sound/ambience/ambidet2.ogg') - -/area/awaymission/factory/villageduring/hospital - ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiatmos.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin2.ogg') - name = "The Hospital" - -/area/awaymission/factory/transition - name = "Beyond the time" - dynamic_lighting = DYNAMIC_LIGHTING_ENABLED - ambientsounds = list('sound/ambience/shipambience.ogg','sound/ambience/ambiatmos.ogg','sound/ambience/antag/malf.ogg','sound/ambience/signal.ogg','sound/ambience/ambimalf.ogg') - -//ITEMS// - -/obj/item/statuebust/toy - name = "aesthetic bust" - desc = "A priceless ancient marble bust, the kind that belongs in a museum. Looks like this one has some differences." - var/cooldown = 0 - -/obj/item/statuebust/toy/attack_self(mob/user) - if (cooldown < world.time) - cooldown = world.time + 450 - user.visible_message("[user] activates \the [src].", "You activate \the [src]!", "You hear a music playing.") - playsound(src, 'sound/ambience/ambivapor1.ogg', 50, 0) - else - to_chat(user, "Nothing happens!") - -/obj/item/clothing/glasses/hud/terminator - name = "T-80 tactical sunglasses" - desc = "Strangely ancient technology used to help provide rudimentary eye cover. Also shows information about criminals and their condition. Has enhanced shielding which blocks flashes." - icon_state = "t80sunglasses" - darkness_view = 1 - clothing_flags = SCAN_REAGENTS - vision_flags = SEE_MOBS - flash_protect = 1 - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF - lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE - hud_type = list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_DIAGNOSTIC_BASIC, DATA_HUD_MEDICAL_ADVANCED) - hud_trait = list(TRAIT_SECURITY_HUD, TRAIT_MEDICAL_HUD) - -//MOBS// - -/mob/living/simple_animal/hostile/proc/summon_backup_nosound(distance, exact_faction_match) - do_alert_animation(src) - for(var/mob/living/simple_animal/hostile/M in oview(distance, GET_TARGETS_FROM(src))) - if(faction_check_mob(M, TRUE)) - if(M.AIStatus == AI_OFF) - return - else - M.Goto(src,M.move_to_delay,M.minimum_distance) - -/mob/living/simple_animal/hostile/factory - name = "Guard" - desc = "An armed officer. Looks like they prefer to shoot rather than asking questions." - speak = list("Stop resisting!","I need backup!","Die, freak!","It's getting away!") - icon = 'icons/mob/simple_human.dmi' - icon_state = "nanotrasen" - icon_living = "nanotrasen" - icon_dead = null - icon_gib = "syndicate_gib" - mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) - turns_per_move = 5 - speak_chance = 5 - del_on_death = TRUE - footstep_type = FOOTSTEP_MOB_SHOE - environment_smash = ENVIRONMENT_SMASH_STRUCTURES - search_objects = 1 - a_intent = INTENT_HARM - attack_sound = 'sound/weapons/cqchit2.ogg' - attack_verb_continuous = "punches" - attack_verb_simple = "punch" - robust_searching = 1 - melee_damage = 12 - speed = 0 - maxHealth = 100 - health = 100 - melee_damage = 12 - stat_attack = HARD_CRIT - faction = list("nanotrasenprivate") - status_flags = CANPUSH - atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) - unsuitable_atmos_damage = 10 - loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier) - var/cooldown = 0 - -/mob/living/simple_animal/hostile/factory/death(gibbed) - var/chosen_sound = pick('sound/creatures/guarddeath.ogg','sound/creatures/guarddeath2.ogg','sound/creatures/guarddeath3.ogg','sound/creatures/guarddeath4.ogg') - playsound(get_turf(src), chosen_sound, 100, TRUE, 0) - ..() - -/mob/living/simple_animal/hostile/factory/Aggro() - ..() - var/list/possible_sounds = list('sound/effects/radio1.ogg','sound/effects/radio2.ogg','sound/effects/radio3.ogg') - var/chosen_sound = pick(possible_sounds) - if (cooldown < world.time) // So we don't repeat the sound and the phrase every time we get hit and do it at least each 30 seconds - cooldown = world.time + 300 - summon_backup_nosound(10) - playsound(get_turf(src), chosen_sound, 100, 0, 0) - var/list/possible_phrases = list("Anomaly spotted! Send backup!","Intruder over here!","Hostile spotted, get them!") - var/chosen_phrase = pick(possible_phrases) - say(chosen_phrase, language = speak_language) - else - return - -/mob/living/simple_animal/hostile/factory/ranged - icon_state = "nanotrasenranged" - icon_living = "nanotrasenranged" - ranged_cooldown_time = 15 - ranged = 1 - retreat_distance = 3 - minimum_distance = 5 - casingtype = /obj/item/ammo_casing/c45 - projectilesound = 'sound/weapons/gunshot.ogg' - loot = list(/obj/item/gun/ballistic/automatic/pistol/m1911, - /obj/effect/mob_spawn/human/corpse/nanotrasensoldier) - -/mob/living/simple_animal/hostile/factory/ranged/lmg - desc = "This one is carrying a bigger gun. Seek for cover." - icon_state = "nanotrasenrangedlmg" - icon_living = "nanotrasenrangedlmg" - projectilesound = 'sound/weapons/rifleshot.ogg' - sidestep_per_cycle = 0 - check_friendly_fire = 1 - minimum_distance = 6 - approaching_target = FALSE - rapid = 8 - rapid_fire_delay = 2 - casingtype = /obj/item/ammo_casing/mm712x82 - ranged_cooldown_time = 80 - vision_range = 12 - aggro_vision_range = 12 - retreat_distance = 1 - move_to_delay = 4 - speed = 12 - health = 150 - maxHealth = 150 - loot = list(/obj/item/gun/ballistic/automatic/l6_saw/unrestricted, - /obj/effect/mob_spawn/human/corpse/nanotrasensoldier) - -/mob/living/simple_animal/hostile/factory/ranged/shotgun - icon_state = "nanotrasenrangedshot" - icon_living = "nanotrasenrangedshot" - rapid = 2 - rapid_fire_delay = 5 - casingtype = /obj/item/ammo_casing/shotgun/buckshot - projectilesound = 'sound/weapons/shotgunshot.ogg' - ranged_cooldown_time = 25 - loot = list(/obj/item/gun/ballistic/shotgun/automatic/combat, - /obj/effect/mob_spawn/human/corpse/nanotrasensoldier) - -/mob/living/simple_animal/hostile/factory/ranged/smg - icon_state = "nanotrasenrangedsmg" - icon_living = "nanotrasenrangedsmg" - rapid = 3 - casingtype = /obj/item/ammo_casing/c46x30mm - projectilesound = 'sound/weapons/gunshot_smg.ogg' - loot = list(/obj/item/gun/ballistic/automatic/wt550, - /obj/effect/mob_spawn/human/corpse/nanotrasensoldier) - -/mob/living/simple_animal/hostile/syndicate/factory - gender = MALE - faction = list("nanotrasenprivate") - speak_chance = 5 - speak = list("Come get me!","You can't get away!","Die!") - -/mob/living/simple_animal/hostile/syndicate/factory/sniper - name = "The Warden" - desc = "One of the best snipers. Take cover or get shot" - icon_state = "fsniper" - icon_living = "fsniper" - ranged = TRUE - speed = 1 - dodge_prob = 40 - ranged_cooldown_time = 40 - check_friendly_fire = 1 - sidestep_per_cycle = 3 - minimum_distance = 4 - turns_per_move = 6 - melee_queue_distance = 2 - health = 250 - maxHealth = 250 - melee_damage = 20 - rapid_melee = 3 - attack_verb_continuous = "hits" - attack_verb_simple = "hit" - attack_sound = 'sound/weapons/genhit3.ogg' - projectilesound = 'sound/weapons/sniper_shot.ogg' - speak_chance = 2 - var/cooldown = 0 - speak = list("You're pretty good.","You can't dodge everything!","Fall down already!") - loot = list(/obj/item/gun/ballistic/sniper_rifle, - /obj/effect/mob_spawn/human/corpse/sniper, - /obj/item/ammo_box/magazine/sniper_rounds, - /obj/item/ammo_box/magazine/sniper_rounds/penetrator, - /obj/item/ammo_box/magazine/sniper_rounds/soporific) - -/mob/living/simple_animal/hostile/syndicate/factory/sniper/Aggro() - ..() - ranged_cooldown = 30 - if (cooldown < world.time) - cooldown = world.time + 150 - summon_backup_nosound(10) - playsound(get_turf(src), 'sound/weapons/sniper_rack.ogg', 80, TRUE) - say("I've got you in my scope.") - -/mob/living/simple_animal/hostile/syndicate/factory/sniper/Shoot() - var/allowed_projectile_types = list(/obj/item/ammo_casing/p50, /obj/item/ammo_casing/p50/penetrator) - casingtype = pick(allowed_projectile_types) - ..() - -/mob/living/simple_animal/hostile/syndicate/factory/sniper/death(gibbed) - playsound(get_turf(src), 'sound/creatures/wardendeath.ogg', 100, TRUE, 0) - ..() - -/mob/living/simple_animal/hostile/psycho - name = "Psycho" - desc = "They're wearing a pretty uncomfortable jacket." - icon = 'icons/mob/simple_human.dmi' - icon_state = "psycho" - icon_living = "psycho" - attack_verb_continuous = "bites" - attack_verb_simple = "bite" - mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) - turns_per_move = 0 - del_on_death = TRUE - speak_chance = 5 - attack_sound = 'sound/weapons/bite.ogg' - speak = list("I'm not mad!","What insanity?","Kill") - speed = -2 - maxHealth = 100 - health = 100 - atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) - unsuitable_atmos_damage = 5 - faction = list("psycho") - move_to_delay = 3 - rapid_melee = 2 - in_melee = TRUE - approaching_target = TRUE - environment_smash = ENVIRONMENT_SMASH_NONE - obj_damage = 5 - sidestep_per_cycle = 0 - stat_attack = HARD_CRIT - melee_damage = 15 - lose_patience_timeout = 350 - loot = list(/obj/effect/mob_spawn/human/corpse/psychost) - -/mob/living/simple_animal/hostile/psycho/regular - var/cooldown = 0 - var/static/list/idle_sounds - -/mob/living/simple_animal/hostile/psycho/regular/Initialize(mapload) - . = ..() - idle_sounds = list('sound/creatures/psycidle1.ogg','sound/creatures/psycidle2.ogg','sound/creatures/psycidle3.ogg') - -/mob/living/simple_animal/hostile/psycho/regular/Life() - ..() - if(Aggro() || stat) - return - if(prob(20)) - var/chosen_sound = pick(idle_sounds) - playsound(src, chosen_sound, 50, FALSE) - -/mob/living/simple_animal/hostile/psycho/regular/Aggro() - ..() - var/list/possible_sounds = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg') - var/chosen_sound = pick(possible_sounds) - if (cooldown < world.time) - cooldown = world.time + 300 - playsound(get_turf(src), chosen_sound, 70, TRUE, 0) - -/mob/living/simple_animal/hostile/psycho/regular/death(gibbed) - var/list/possible_sounds = list('sound/creatures/psycdeath1.ogg','sound/creatures/psycdeath2.ogg') - var/chosen_sound = pick(possible_sounds) - playsound(get_turf(src), chosen_sound, 70, TRUE, 0) - ..() - -/mob/living/simple_animal/hostile/psycho/fast - move_to_delay = 2 - speed = -5 - maxHealth = 70 - health = 70 - -/mob/living/simple_animal/hostile/psycho/muzzle - icon_state = "psychomuzzle" - icon_living = "psychomuzzle" - attack_sound = null - speak_chance = 0 - melee_damage = 9 - var/cooldown = 0 - var/static/list/idle_sounds - speed = 0 - loot = list(/obj/effect/mob_spawn/human/corpse/psychost/muzzle) - -/mob/living/simple_animal/hostile/psycho/muzzle/Initialize(mapload) - . = ..() - idle_sounds = list('sound/creatures/psychidle.ogg','sound/creatures/psychidle2.ogg') - -/mob/living/simple_animal/hostile/psycho/muzzle/death(gibbed) - var/list/possible_sounds = list('sound/creatures/psychdeath.ogg','sound/creatures/psychdeath2.ogg',) - var/chosen_sound = pick(possible_sounds) - playsound(get_turf(src), chosen_sound, 70, TRUE, 0) - ..() - -/mob/living/simple_animal/hostile/psycho/muzzle/Aggro() - ..() - var/list/possible_sounds = list('sound/creatures/psychsight.ogg','sound/creatures/psychsight2.ogg') - var/chosen_sound = pick(possible_sounds) - if (cooldown < world.time) - cooldown = world.time + 300 - playsound(get_turf(src), chosen_sound, 70, TRUE, 0) - -/mob/living/simple_animal/hostile/psycho/muzzle/AttackingTarget() - ..() - playsound(get_turf(src), 'sound/creatures/psychattack1.ogg', 70, TRUE, 0) - -/mob/living/simple_animal/hostile/psycho/muzzle/Life() - ..() - if(Aggro() || stat) - return - if(prob(20)) - var/chosen_sound = pick(idle_sounds) - playsound(src, chosen_sound, 50, TRUE) - -/mob/living/simple_animal/hostile/psycho/trap - desc = "This one has a strange device on his head." - icon_state = "psychotrap" - icon_living = "psychotrap" - speak_chance = 0 - speed = -3 - move_to_delay = 2 - melee_damage = 15 - attack_sound = null - loot = list(/obj/effect/mob_spawn/human/corpse/psychost/trap) - var/cooldown = 0 - var/static/list/idle_sounds - -/mob/living/simple_animal/hostile/psycho/trap/Aggro() - ..() - var/list/possible_sounds = list('sound/creatures/psychsight.ogg','sound/creatures/psychsight2.ogg') - var/chosen_sound = pick(possible_sounds) - if (cooldown < world.time) - cooldown = world.time + 300 - playsound(get_turf(src), chosen_sound, 70, TRUE, 0) - -/mob/living/simple_animal/hostile/psycho/trap/Initialize(mapload) - . = ..() - idle_sounds = list('sound/creatures/psychidle.ogg','sound/creatures/psychidle2.ogg') - -/mob/living/simple_animal/hostile/psycho/trap/Life() - ..() - if(Aggro() || stat) - return - if(prob(20)) - var/chosen_sound = pick(idle_sounds) - playsound(src, chosen_sound, 50, FALSE) - if(health < maxHealth) - playsound(src, 'sound/machines/beep.ogg', 80, FALSE) - addtimer(CALLBACK(src, PROC_REF(death)), 200) - -/mob/living/simple_animal/hostile/psycho/trap/AttackingTarget() - var/list/possible_sounds = list('sound/creatures/psychhead.ogg','sound/creatures/psychhead2.ogg') - var/chosen_sound = pick(possible_sounds) - playsound(get_turf(src), chosen_sound, 100, TRUE, 0) - ..() - -/mob/living/simple_animal/hostile/psycho/trap/death(gibbed) - var/list/possible_sounds = list('sound/creatures/psychdeath.ogg','sound/creatures/psychdeath2.ogg') - var/chosen_sound = pick(possible_sounds) - playsound(get_turf(src), chosen_sound, 70, 0, 0) - playsound(get_turf(src), 'sound/effects/snap.ogg', 75, TRUE, 0) - playsound(get_turf(src), 'sound/effects/splat.ogg', 90, TRUE, 0) - visible_message("The device activates!") - ..() - -/mob/living/simple_animal/hostile/syndicate/factory/heavy - name = "Heavy gunner" - desc = "They didn't get that backpack for nothing." - icon_state = "Heavy" - icon_living = "Heavy" - sidestep_per_cycle = 0 - minimum_distance = 5 - approaching_target = TRUE - ranged = TRUE - rapid = 65 - rapid_fire_delay = 0.5 - projectiletype = /obj/projectile/beam - ranged_cooldown_time = 110 - vision_range = 9 - speak_chance = 0 - speak = null - aggro_vision_range = 9 - attack_verb_continuous = "hits" - attack_verb_simple = "hit" - attack_sound = 'sound/weapons/genhit3.ogg' - retreat_distance = 2 - melee_queue_distance = 1 - melee_damage = 25 - move_to_delay = 4 - projectilesound = null - speed = 15 - health = 300 - maxHealth = 300 - loot = list(/obj/effect/mob_spawn/human/corpse/heavy) - var/cooldown = 0 - -/mob/living/simple_animal/hostile/syndicate/factory/heavy/Initialize(mapload) - ..() - -/mob/living/simple_animal/hostile/syndicate/factory/heavy/Aggro() - ..() - if (cooldown < world.time) - cooldown = world.time + 300 - playsound(get_turf(src), 'sound/creatures/heavysight1.ogg', 80, 0, 0) - -/mob/living/simple_animal/hostile/syndicate/factory/heavy/OpenFire(atom/A) - playsound(get_turf(src), 'sound/weapons/heavyminigunstart.ogg', 80, 0, 0) - move_to_delay = 6//slowdown when shoot - speed = 30 - sleep(15) - playsound(get_turf(src), 'sound/weapons/heavyminigunshoot.ogg', 90, 0, 0) - if(CheckFriendlyFire(A)) - return - if(!(simple_mob_flags & SILENCE_RANGED_MESSAGE)) - visible_message("[src] [ranged_message] at [A]!") - if(rapid > 1) - var/datum/callback/cb = CALLBACK(src, PROC_REF(Shoot), A) - for(var/i in 1 to rapid) - addtimer(cb, (i - 1)*rapid_fire_delay) - else - Shoot(A) - ranged_cooldown = world.time + ranged_cooldown_time - playsound(get_turf(src), 'sound/weapons/heavyminigunstop.ogg', 80, 0, 0) - move_to_delay = initial(move_to_delay)//restore speed - speed = initial(speed) - -/mob/living/simple_animal/hostile/syndicate/factory/heavy/death(gibbed) - playsound(get_turf(src), 'sound/creatures/heavydeath1.ogg', 80, TRUE, 0) - ..() - -/obj/item/clothing/mask/gas/sechailer/swat/emagged - safety = FALSE - -/mob/living/simple_animal/hostile/zombie_suicide - name = "aggressive corpse" - desc = "This corpse is holding a grenade without a pin in it..." - icon = 'icons/mob/simple_human.dmi' - icon_state = "suicidezombie" - icon_living = "suicidezombie" - mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) - minbodytemp = 0 - status_flags = CANPUSH - health = 100 - maxHealth = 100 - move_to_delay = 2 - speed = 0 - melee_damage = null - attack_sound = null - del_on_death = TRUE - stat_attack = HARD_CRIT - a_intent = INTENT_HARM - var/det_time = 30 - var/active = 0 - var/cooldown = 0 - loot = list(/obj/effect/mob_spawn/human/corpse/suicidezombie, /obj/item/grenade/syndieminibomb/concussion/frag/activated) - footstep_type = FOOTSTEP_MOB_SHOE - hardattacks = TRUE - -/mob/living/simple_animal/hostile/zombie_suicide/Aggro() - ..() - var/list/possible_sounds = list('sound/creatures/szombiesight.ogg','sound/creatures/szombiesight2.ogg') - var/chosen_sound = pick(possible_sounds) - if (cooldown < world.time) - cooldown = world.time + 300 - playsound(get_turf(src), chosen_sound, 50, TRUE, 0) - -/mob/living/simple_animal/hostile/zombie_suicide/AttackingTarget() - if(!active) - active = TRUE - playsound(src, 'sound/weapons/armbomb.ogg', 100, TRUE) - var/list/possible_sounds = list('sound/creatures/szombiesight.ogg','sound/creatures/szombiesight2.ogg') - var/chosen_sound = pick(possible_sounds) - playsound(get_turf(src), chosen_sound, 50, TRUE, 0) - visible_message("[src] primes the grenade!.") - addtimer(CALLBACK(src, PROC_REF(prime)), det_time) - -/mob/living/simple_animal/hostile/zombie_suicide/proc/prime() - explosion(src,0, 2, 3, flame_range = 3) - new /obj/effect/gibspawner/generic(get_turf(src), src) - qdel(src) - -/mob/living/simple_animal/hostile/zombie_suicide/death(gibbed) - playsound(src, 'sound/creatures/szombiedeath.ogg', 60, TRUE) - ..() - -/obj/item/grenade/syndieminibomb/concussion/frag/activated - det_time = 30 - -/obj/item/grenade/syndieminibomb/concussion/frag/activated/Initialize(mapload) - ..() - preprime() - -/mob/living/simple_animal/hostile/syndicate/factory/boss - name = "The Director" - desc = "This thing looks more like a machine than human." - maxHealth = 500 - health = 500 - icon_state = "facboss" - icon_living = "facboss" - see_in_dark = 13 - vision_range = 12 - aggro_vision_range = 12 - search_objects = 1 - minbodytemp = 0 - speak = null - dodging = FALSE - mob_biotypes = list(MOB_ROBOTIC) - obj_damage = 100 - move_force = MOVE_FORCE_EXTREMELY_STRONG - move_resist = MOVE_FORCE_EXTREMELY_STRONG - pull_force = MOVE_FORCE_EXTREMELY_STRONG - hardattacks = TRUE - melee_damage = 50 - speed = 5 - move_to_delay = 3 - ranged = TRUE - hud_possible = list(ANTAG_HUD) - approaching_target = TRUE - ranged_ignores_vision = TRUE - environment_smash = ENVIRONMENT_SMASH_RWALLS - ranged_cooldown_time = 30 - check_friendly_fire = 1 - turns_per_move = 2 - spacewalk = TRUE - rapid_melee = 0 - lose_patience_timeout = 400 - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) - unsuitable_atmos_damage = 0 - attack_sound = 'sound/weapons/sonic_jackhammer.ogg' - projectilesound = 'sound/weapons/shotgunshot.ogg' - var/cooldown = 0 - loot = list(/obj/item/gun/ballistic/shotgun/lever_action, - /obj/effect/mob_spawn/human/corpse/facboss) - -/mob/living/simple_animal/hostile/syndicate/factory/boss/Shoot() - var/static/list/allowed_projectile_types = list(/obj/item/ammo_casing/shotgun/beanbag, - /obj/item/ammo_casing/shotgun, /obj/item/ammo_casing/shotgun/incendiary, - /obj/item/ammo_casing/shotgun/dragonsbreath, - /obj/item/ammo_casing/shotgun/meteorslug, - /obj/item/ammo_casing/shotgun/pulseslug, - /obj/item/ammo_casing/shotgun/frag12, - /obj/item/ammo_casing/shotgun/buckshot, - /obj/item/ammo_casing/shotgun/rubbershot, - /obj/item/ammo_casing/shotgun/incapacitate, - /obj/item/ammo_casing/shotgun/improvised, - /obj/item/ammo_casing/shotgun/ion, - /obj/item/ammo_casing/shotgun/laserslug, - /obj/item/ammo_casing/shotgun/breacher) - casingtype = pick(allowed_projectile_types) - ..() - sleep(5) - playsound(get_turf(src), 'sound/weapons/shotgunpump.ogg', 50, 0, 0) - -/mob/living/simple_animal/hostile/syndicate/factory/boss/Aggro() - ..() - var/list/possible_sounds = list('sound/voice/ed209_20sec.ogg','sound/creatures/bosssight.ogg','sound/creatures/bosssight2.ogg','sound/voice/complionator/harry.ogg','sound/weapons/leveractionrack.ogg') - var/chosen_sound = pick(possible_sounds) - if (cooldown < world.time) - cooldown = world.time + 300 - playsound(get_turf(src), chosen_sound, 80, TRUE, 0) - say("Target!") - -/mob/living/simple_animal/hostile/syndicate/factory/boss/Life() - ..() - if(health <= 300) - icon_state = "facboss2" - icon_living = "facboss2" - ranged_cooldown_time = 20//less health - faster shooting - return - if(health <= 150) - if(prob(5) && Aggro())//change to insult the target on low health - playsound(get_turf(src), 'sound/voice/beepsky/insult.ogg', 100, 0, 0) - visible_message("FUCK YOUR CUNT YOU SHIT EATING COCKSTORM AND EAT A DONG FUCKING ASS RAMMING SHIT FUCK EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS OF FUCK AND POO AND SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FUCK ASS WANKER FROM THE DEPTHS OF SHIT.") - icon_state = "facboss3" - icon_living = "facboss3" - ranged_cooldown_time = 10//even faster - -/mob/living/simple_animal/hostile/syndicate/factory/boss/updatehealth() - ..() - if(health <= 300) - var/list/possible_sounds = list('sound/creatures/bosspain.ogg','sound/creatures/bosspain2.ogg') - var/chosen_sound = pick(possible_sounds) - playsound(get_turf(src), chosen_sound, 60, TRUE, 0) - -/mob/living/simple_animal/hostile/syndicate/factory/boss/death(gibbed) - playsound(get_turf(src), 'sound/voice/borg_deathsound.ogg', 80, TRUE, 0) - visible_message("\the [src] activates its self-destruct system!.") - speed = 15 - move_to_delay = 20 - ranged_cooldown = 300 - ranged_cooldown_time = 300 - INVOKE_ASYNC(src, PROC_REF(explosion), src.loc, 0, 3, 4, null, null, FALSE, 2) - ..() - -//GUNS// - -/obj/item/gun/ballistic/shotgun/lever_action - name = "lever action shotgun" - desc = "A really old shotgun with five shell capacity. This one can fit in a backpack." - w_class = WEIGHT_CLASS_LARGE - dual_wield_spread = 0 - fire_sound_volume = 60 //tried on 90 my eardrums said goodbye - item_state = "leveraction" - icon_state = "leveraction" - worn_icon_state = "shotgun" - rack_sound = "sound/weapons/leveractionrack.ogg" - fire_sound = "sound/weapons/leveractionshot.ogg" - vary_fire_sound = FALSE - rack_sound_vary = FALSE - recoil = 1 - mag_type = /obj/item/ammo_box/magazine/internal/shot/lever - pb_knockback = 5 - -/obj/item/gun/ballistic/shotgun/lever_action/examine(mob/user) - . = ..() - . += "You will instantly reload it after a shot if you have another hand free." - -/obj/item/gun/ballistic/shotgun/lever_action/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1) - ..() - if(user.get_inactive_held_item()) - return - else - rack() - -/obj/item/gun/ballistic/shotgun/lever_action/rack(mob/user = null) - if (user) - to_chat(user, "You rack the [bolt_wording] of \the [src].") - process_chamber(!chambered, FALSE) - playsound(src, rack_sound, rack_sound_volume, rack_sound_vary) - update_icon() - if(user.get_inactive_held_item() && prob(50) && chambered) - user.visible_message("With a single move of [user.p_their()] arm, [user] flips \the [src] and loads the chamber with a shell.") - -/obj/item/gun/ballistic/automatic/pistol/deagle/sound - desc = "A robust .50 AE handgun. This one looks even more robust." - rack_sound = "sound/weapons/deaglerack.ogg" - bolt_drop_sound = "sound/weapons/deagleslidedrop.ogg" - lock_back_sound = "sound/weapons/deaglelock.ogg" - lock_back_sound_vary = FALSE - rack_sound_vary = FALSE - load_sound_vary = FALSE - eject_sound_vary = FALSE - fire_sound = "sound/weapons/deagleshot.ogg" - vary_fire_sound = TRUE - fire_rate = 5 - force = 18 - -//MISC// - -/obj/effect/trap/nexus/trickyspawner/clowns - mobs = 5 - spawned = /mob/living/simple_animal/hostile/retaliate/clown diff --git a/code/modules/awaymissions/mission_code/caves.dm b/code/modules/awaymissions/mission_code/caves.dm deleted file mode 100644 index b7ab7c454d980..0000000000000 --- a/code/modules/awaymissions/mission_code/caves.dm +++ /dev/null @@ -1,61 +0,0 @@ -//Areas - -/area/awaymission/caves/BMP_asteroid - name = "\improper BMP Asteroid Level 1" - icon_state = "awaycontent1" - -/area/awaymission/caves/BMP_asteroid/level_two - name = "\improper BMP Asteroid Level 2" - icon_state = "awaycontent2" - -/area/awaymission/caves/BMP_asteroid/level_three - name = "\improper BMP Asteroid Level 3" - icon_state = "awaycontent3" - -/area/awaymission/caves/BMP_asteroid/level_four - name = "\improper BMP Asteroid Level 4" - icon_state = "awaycontent4" - -/area/awaymission/caves/research - name = "Research Outpost" - icon_state = "awaycontent5" - dynamic_lighting = DYNAMIC_LIGHTING_ENABLED - -/area/awaymission/caves/northblock //engineering, bridge (not really north but it doesnt really need its own APC) - -/area/awaymission/caves/listeningpost - name = "Listening Post" - icon_state = "awaycontent6" - requires_power = FALSE - -//caves papers - -/obj/item/paper/crumpled/awaymissions/caves/unsafe_area - default_raw_text = "
4 scattershot rifles
6 grenades
1 laser rifle
1 blowup doll" - -/obj/item/paper/fluff/awaymissions/caves/mech_notice - name = "NOTICE!! paper" - default_raw_text = "
Robotics Team" diff --git a/code/modules/awaymissions/mission_code/centcomAway.dm b/code/modules/awaymissions/mission_code/centcomAway.dm deleted file mode 100644 index 60741701b4d82..0000000000000 --- a/code/modules/awaymissions/mission_code/centcomAway.dm +++ /dev/null @@ -1,63 +0,0 @@ -//centcomAway areas - -/area/awaymission/centcomAway - name = "XCC-P5831" - icon_state = "away" - requires_power = FALSE - -/area/awaymission/centcomAway/general - name = "XCC-P5831" - ambientsounds = list('sound/ambience/ambigen3.ogg') - -/area/awaymission/centcomAway/maint - name = "XCC-P5831 Maintenance" - icon_state = "away1" - ambientsounds = list('sound/ambience/ambisin1.ogg') - -/area/awaymission/centcomAway/thunderdome - name = "XCC-P5831 Thunderdome" - icon_state = "away2" - ambientsounds = list('sound/ambience/ambisin2.ogg') - -/area/awaymission/centcomAway/cafe - name = "XCC-P5831 Kitchen Arena" - icon_state = "away3" - ambientsounds = list('sound/ambience/ambisin3.ogg') - -/area/awaymission/centcomAway/courtroom - name = "XCC-P5831 Courtroom" - icon_state = "away4" - ambientsounds = list('sound/ambience/ambisin4.ogg') - -/area/awaymission/centcomAway/hangar - name = "XCC-P5831 Hangars" - icon_state = "away4" - ambientsounds = list('sound/ambience/ambigen5.ogg') - -//centcomAway items - -/obj/item/paper/pamphlet/centcom/visitor_info - name = "Visitor Info Pamphlet" - default_raw_text = " XCC-P5831 Visitor Information
\ - Greetings, visitor, to XCC-P5831! As you may know, this outpost was once \ - used as Nanotrasen's CENTRAL COMMAND STATION, organizing and coordinating company \ - projects across the vastness of space.
\ - Since the completion of the much more efficient CC-A5831 on March 8, 2553, XCC-P5831 no longer \ - acts as NT's base of operations but still plays a very important role its corporate affairs; \ - serving as a supply and repair depot, as well as being host to its most important legal proceedings\ - and the thrilling pay-per-view broadcasts of PLASTEEL CHEF and THUNDERDOME LIVE.
\ - We hope you enjoy your stay!" - -/obj/item/paper/fluff/awaymissions/centcom/gateway_memo - name = "Memo to XCC-P5831 QM" - default_raw_text = "From: XCC-P5831 Management Office
\ - To: Rolf Ingram, XCC-P5831 Quartermaster
\ - Hey, Rolf, once you pack that gateway into the ferry hangar, make absolutely sure \ - to deactivate it! As you may know, SS13 has recently got its network up and running, \ - which means that until we get this gate shipped off to the next colonization staging \ - area, they'll be able to hop straight in here if its hooked up on our end.
\ - Obviously, that's something I'd very much rather avoid. Our forensics and medical \ - teams never did figure out what happened that last time... and I can't wrap my head \ - around it myself. Why would a shuttle full of evacuees all snap and beat each other \ - to death the moment they reached safety?
\ - - D. Cereza" diff --git a/code/modules/awaymissions/mission_code/challenge.dm b/code/modules/awaymissions/mission_code/challenge.dm deleted file mode 100644 index 4df8fbf32f894..0000000000000 --- a/code/modules/awaymissions/mission_code/challenge.dm +++ /dev/null @@ -1,36 +0,0 @@ -//Challenge Areas - -/area/awaymission/challenge/start - name = "Where Am I?" - icon_state = "away" - -/area/awaymission/challenge/main - name = "Danger Room" - icon_state = "away1" - requires_power = FALSE - -/area/awaymission/challenge/end - name = "Administration" - icon_state = "away2" - requires_power = FALSE - - -/obj/machinery/power/emitter/energycannon - name = "Energy Cannon" - desc = "A heavy duty industrial laser." - icon = 'icons/obj/singularity.dmi' - icon_state = "emitter_+a" - anchored = TRUE - density = TRUE - resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF - - use_power = NO_POWER_USE - idle_power_usage = 0 - active_power_usage = 0 - - active = TRUE - locked = TRUE - welded = TRUE - -/obj/machinery/power/emitter/energycannon/RefreshParts() - return diff --git a/code/modules/awaymissions/mission_code/moonoutpost19.dm b/code/modules/awaymissions/mission_code/moonoutpost19.dm deleted file mode 100644 index 492805950c046..0000000000000 --- a/code/modules/awaymissions/mission_code/moonoutpost19.dm +++ /dev/null @@ -1,119 +0,0 @@ -// moonoutpost19 - -//Areas -/area/awaymission/moonoutpost19 - name = "space" - icon_state = "awaycontent1" - -/area/awaymission/moonoutpost19/arrivals - name = "MO19 Arrivals" - icon_state = "awaycontent2" - -/area/awaymission/moonoutpost19/research - name = "MO19 Research" - icon_state = "awaycontent3" - -/area/awaymission/moonoutpost19/syndicate - name = "Syndicate Outpost" - icon_state = "awaycontent4" - -/area/awaymission/moonoutpost19/main - name = "Khonsu 19" - always_unpowered = TRUE - power_environ = FALSE - power_equip = FALSE - power_light = FALSE - ambientsounds = list('sound/ambience/ambimine.ogg') - icon_state = "awaycontent5" - -/area/awaymission/moonoutpost19/hive - name = "The Hive" - always_unpowered = TRUE - power_environ = FALSE - power_equip = FALSE - power_light = FALSE - icon_state = "awaycontent6" - -//Papers - -/obj/item/paper/crumpled/awaymissions/moonoutpost19/hastey_note - name = "Hastily Written Note" - default_raw_text = "19 06 2554
I fucking knew it. There was a major breach, that idiotic force field failed and the xenomorphs rushed out and took out the scientists. I've managed to make it to my office and closed the blast doors. I can hear them trying to pry open the doors. Probably don't have long. I have no clue what has happened to the rest of the crew, for all I know they've been killed to produce more of the fucks." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_social - name = "Larva Xenomorph Social Interactions & Capturing Procedure" - default_raw_text = "Researcher: Dr. Sakuma Sano
Date: 04/06/2554
Report:
As expected, all that is left of the monkeys we sent in earlier is a group of xenomorph larvae. It is quite clear that the facehuggers are not selective in their hosts, and so far the gestation process has been shown to have a 100% success rate.
The larvae themselves have been behaving very differently from the lone larva we first observed, and despite shying away from humans they are clearly comfortable with others of their kind. Our previous suspicions on larvae have been confirmed with their demonstration of playfulness: they are not nearly as aggressive or violent when young, before molting to adulthood.
The majority of the play we observed involved a sort of hide-and-seek, and occasionally wrestling by tangling themselves and struggling out of it. While normally we would write these off as instinctual play for honing their skills when they molt, their growth period is so incredibly fast and they are still such adept killers that it would serve no practical purpose. The only explanation for this is perhaps to create bonds and friendships with each other, if that is even possible for such an incredibly hostile race. It may be that they are much more reasonable with each other than other life forms.
It had become clear that now was the best time to extract a xenomorph for dissecting, as these were all still larvae and the queen was still attached to its ovipositor and would be immobile. With the approval of the research director, we sent in our medical robot that had been dubbed 'Head Surgeon' into the containment pen, dropping the shields for only a fraction of a second to allow it entry. The larvae were cautious, but the curiosity of one had him within grabbing range of our robot. It was brought out and quickly euthanized through lethal injection, courtesy of our mechanical doctor." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_queen - name = "Queen Xenomorph Physiology & Behavior Observation" - default_raw_text = "Researcher: Dr. Sakuma Sano
Date: 04/06/2554
Report:
I have studied many interesting and diverse life-forms as a xenobiologist ranging from creatures as large as cows, to specimens too small see with the naked eye. This is by far the largest alien I have ever seen. The alien we were previously studying has molted and has become an absolutely enormous creature. Standing at over 15 feet tall and weighing in at likely two tons or more, the xenomorph queen is an absolutely breathtakingly large and cruel monster. Its behavior has changed drastically from when it was a drone, having become far more comfortable with sitting and staring at us, rather than smashing at the windows.
The queen, physiologically speaking, is fairly similar to the other xenomorphs, with a few key differences. Its enormous size demands large legs, while the back seems to be always hunched forward. The dorsal tubes on the back have changed to several large spikes, and we observed the alien now sports a second pair of smaller arms on its chest. The purpose of these secondary arms is still unknown. Finally, the queen's crown has become incredibly large, with what seems to be a retractable slot to hide its head in. The dome appears to be extremely thick near the front, and will likely be able to resist a lot of trauma. Despite the enormous size it has grown to, it is not that much slower than it used to be.
After two hours of doing relatively nothing but staring, the queen began to produce an unusually large amount of resin and weeds, quickly shaping up a large nest that it then hid behind. It then proceeded to smash out all the lights, leaving us with very little to see with our cameras. When we looked through the back cameras, we had discovered that it had grown a large ovipositor, and was releasing large eggs onto the ground. This had us all in agreement that this stage of the life cycle was the queen.
Over the next few hours, the eggs grew to their full sizes, and we provided the subject with new monkey hosts. When they approached the eggs, they opened to release more facehuggers. It seems that we have observed the full cycle of reproduction for this species. We can expect more larvae in the next few hours." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_adult - name = "Adult Xenomorph Physiology & Behavior Observation" - default_raw_text = "Researcher: Dr. Sakuma Sano
Date: 03/06/2554
Report:
The other scientists and I can hardly believe our eyes. The snake-like larva has molted into a 7 foot tall insectoid nightmare in just a few hours. It's obvious now as to why such heavy duty containment was needed. It immediately tried to escape however by flinging itself at the window in a flurry of swipes and stabs. It seems its behavior has returned to a state that is very similar to the facehugger, though I doubt with the same intent! Thankfully, our glass and shields have shown to be more than sturdy enough for such a violent creature, and so far, any attempts at the creature escaping have been in vain.
As for its physiology, the creature has an elongated head with what appears to be have an exoskeleton resembling an external rib-cage on the torso. The alien is also fairly skinny with a lean body. The little amount of meat on the alien appears to be entirely muscle. We assume this makes it deceptively strong, while remaining agile at the same time. One of the most interesting things we have seen is its pharyngeal jaw. It has some what of an inner mouth capable of being fired externally at extremely high speeds. It has already caused many dents in the walls and a few small cracks in the window with it. The alien also has a couple of dorsal tubes on its back, their purpose unknown. Finally, this monster sports a long ridged tail, complete with a large and extremely sharp blade at the tip.
Normally I would be absolutely terrified of something like this, but I'm putting my trust in Nanotrasen with the containment. After all, they wouldn't build a cell that could fail to contain its subject, would they?" - -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_psych - name = "Larva Xenomorph Physiology & Behavior Observation" - default_raw_text = "Researcher: Dr. Sakuma Sano
Date: 03/06/2554
Report:
When the larva first emerged from the chest of the monkey, it seemed very curious. It would wander around aimlessly for awhile and then sit still. We are unable to determine the gender of the larva, or even determine if it has a gender. After some time had passed, it seemed to lose interest in its surroundings and sat mostly still while occasionally wagging its tail. We decided to throw in a live mouse to see if it would consume it. The larva quickly attacked and ate the mouse and seemed to get larger very suddenly, this suggests that the larvae are capable of metabolizing and directing all the energy towards growth at previously thought impossible speeds. It is a shame that we cannot observe the process more closely, as we do not currently know how dangerous or violent this creature is or will become as it matures fully.
It is tempting to imagine the possibilities of utilizing such a mechanism. The capability of skipping years of growth time for children, repairing bodily damage in a matter of moments, even its usage in existing cloning technology." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/facehugger - name = "'Facehugger' Xenomorph Physiology & Behavior Observation" - default_raw_text = "Researcher: Dr. Sakuma Sano
Date: 03/06/2554
Report:
The test subject we were provided with truly is alien. It is a small spider-like creature with bony legs leading to a smooth body. It has a long tail connected to it, and it has shown extremely aggressive behavior by flinging its entire body at the glass and shields to no avail. While doing so, we noticed there was a small pink hole in the middle of the body.
When we sent in a monkey through the crude but effective disposal tube, the alien immediately jumped at its face and latched on. The monkey was quickly suffocated by its constricting tail, unable to pry off the fingers. The monkey at first seemed to be dead, but was observed to be breathing. The recently named alien 'facehugger' fell off dead and curled its legs up like a spider moments after it had finished with the monkey's body.
While the monkey appeared to be unharmed, we kept it in the cell for a couple more hours until we were horrified to discover it screaming out in pain as a snake-like creature erupted from the monkey's chest! It appears that the 'facehugger' is only the start of this life cycle. The impregnation cycle involving the creatures growing inside the chests of their hosts seems to only be the beginning." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_hivemind - name = "The Hivemind Hypothesis" - default_raw_text = "Researcher: Dr. Mark Douglas
Date: 17/06/2554
Report:
Earlier today we have observed a new phenomenon with our subjects. While feeding them our last monkey subject and throwing out the box, the aliens merely looked at us instead of infecting the monkey right away. They looked to be collectively distressed as they would no longer be given hosts, where instead we would move to the next phase of the experiment. When I glanced at the gas tanks and piping leading to their cell, I looked back to see all of them were up against the glass, even the queen! It was as if they all understood what was going to happen, even though we knew only the queen had the cognitive capability to do so.
The only explanation for this is a form of communication between the aliens, but we have seen no such action take place anywhere in the cell until now. We also know that regular drone and hunter xenomorphs have no personality or instinct to survive by themselves. Perhaps the queen has a direct link to them? A form of a commander or overseer that controls their every move? A hivemind?" - -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_behavior - name = "\improper A Preliminary Study of Alien Behavior" - default_raw_text = "Researcher: Dr. Sakuma Sano
Date: 08/06/2554
Report:
The xenomorphs we have come to study here are a remarkable species. They are almost universally aggressive across all castes, showing no remorse or guilt or pause before or after acts of violence. They appear to be a species entirely designed to kill. Oddly enough, even their method of reproduction is a brutal two-for-one method of birthing a new xenomorph and killing its host.
The lone xenomorph we studied only five days ago showed little sign of intelligence. Only a simple drone that flung itself at the safety glass and shields repeatedly and thankfully without success. Once the drone molted into a queen, it became much more calm and calculating, merely looking at us and waiting while building its nest. As the hive grew in size and in numbers, so too did the intelligence of the common hunter and drone. We are still researching how they can communicate with one another and the relationship between the different castes and the queen. We will continue to update our research as we learn more about the species." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_castes - name = "The Xenomorph 'Castes'" - default_raw_text = "Researcher: Dr. Mark Douglas
Date: 06/06/2554
Report:
While observing the growing number of aliens in the containment cell, we began to notice subtle differences that were consistently repeating. Like ants, these creatures clearly have different specialized variations that determine their roles in the hive. We have dubbed the three currently observed castes as Hunters, Drones, and Sentinels.
Hunters have been observed to be by far the most aggressive and agile of the three, constantly running on every surface and frequently swiping at the windows. They are also remarkably good at camouflaging themselves in darkness and on their resin structures, appearing almost invisible to the unwary observer. They are always the first to reach the monkeys we send in leading us to believe that this caste is primarily used for finding and retrieving hosts.
Drones on the other hand are much more docile and seem more shy by comparison, though not any less aggressive than the other castes. They have been observed to have a much wider head and lack dorsal tubes. They have shown to be less agile and visibly more fragile than any other caste. The drone however has never been observed to interact with the monkeys directly and instead preferring maintenance of the hive by building walls of resin and moving eggs around the nest. As far as we know, we have only ever observed a drone become a queen, and we have no way of knowing if the other castes have that capability.
Lastly, we have the Sentinels, which appear at first glance to be the guards of the hive. They have so far been only observed to remain near the queen and the eggs, frequently curled up against the walls. We have only observed one instance where they have interacted with a monkey who strayed too closely to the queen, and was pounced and held down immediately until it was applied with a facehugger. Their lack of movement makes it difficult to determine their exact purpose as guards, sentries, or other role." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy - name = "Larva Xenomorph Autopsy Report" - default_raw_text = "Researcher: Dr. Mark Douglas
Date: 04/06/2554
Report:
After an extremely dangerous, time consuming and costly dissection, we have managed to record and identify several of the organs inside of the first stage of the xenomorph cycle: the larva. This procedure took an extensive amount of time because these creatures have incredibly, almost-comically acidic blood that can melt through almost anything in a few moments. We had to use over a dozen scalpels and retractors to complete the autopsy.
The larva seems to possess far fewer and quite different organs than that of a human. There is a stomach, with no digestive tract, a heart, which seems to lack any blood-oxygen circulation purpose, and an elongated brain, even though its as dumb as any large cat. It also lacks any liver, kidneys, or other basic organs.
We can't determine the exact nature of how these creatures grow, nor if they gain organs as they become adults. The larger breeds of xenomorph are too dangerous to kill and capture to give us an accurate answer to these questions. All that we can conclude is that being able to function with so little and yet be so deadly means that these creatures are highly evolved and likely to be extremely durable to various hazards that would otherwise be lethal to humans." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/evacuation - name = "Evacuation Procedure" - default_raw_text = "
In The Event of Xenobiology Breach: Evacuate staff, Lock down Xenobiology, Notify on-site superiors and/or Central Command immediately.
Current Xenobiology Containment Level:Secure RUN
"
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/log/personal
- name = "Personal Log"
- default_raw_text = "Log 1:We got our promised supply drop today. We were only meant to get it, what, a week ago? This bloody gateway keeps desyncing itself, and that means subsisting off recycled water and carb packs. No clue where the damn thing connects to on its off days, and HQ say we are 'not to touch it if it isn't linking to command.' We dumped off the assload of crates Jim filled, got our boxes of oxygen, food and drink, and closed the portal.
Log 2:
Damn thing is acting up again. Three days no contact this time. I thought I heard clanking noises from it yesterday. Jim is going on about the NT base or some shit. We've been over this before - They don't know we're here, that engineer was too drunk to recognize his suit, especially since I had it painted orange. He's starting to get annoying. We're safe.
Log 3:
Gateway synced itself up automatically today. I opened it for an instant to spy through it, got a glimpse of the inside of a transport container. Either HQ's redecorating or something, or there's more than two of these things." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/log/personal_2 - name = "Personal Log" - default_raw_text = "Log 1:
While mining today I noticed the NT station was finished with its renovations. They placed some huge reinforced tumor on the station, looks so ugly. I wouldn't be surprised if those pigs decided to turn that little astronomy outpost into a prison with that thing, it'd be pretty typical of them.
Log 2:
Really dumb of me but I just waved at an engineer in the outpost, and he waved back. I hope to god he was too dumb or drunk to recognize the suit, because if he isn't then we might have to pull out before they come looking for us.
Log 3:
That huge reinforced tumor in their science section has been making a lot of noise lately. I've been hearing some banging and scratching from the other side and I'm kind of glad now that they reinforced this thing so much. I'll be sleeping with my gun under my pillow from now on." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/engineering - name = "Engineering Instructions" - default_raw_text = "Alright, listen up. If you're reading this, I'm either taking a shit or I've been recalled back to Command. Either way, you'll need to know how to restore power. We've stolen this stuff from Nanotrasen, so all the equipment is jury-rigged. We have generators that work on both plasma and uranium, about 50 sheets should power the outpost for quite a while. If the generators aren't working, which is very likely, take the power cell on the desk and put it into the APC in the hallway. That should get the place running, at least for a little while." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/log/kenneth - name = "Personal Log - Kenneth Cunningham" - default_raw_text = "Entry One - 27/05/2554:
I just arrived, and already I hate my job. I'm stuck on this shithole of an outpost, trying to avoid these damn eggheads running all over the place preparing for god knows what. There's no crimes to stop, no syndies to kill, and I'm not even allowed to beat the fuckin' assistant senseless! They said I was transferred from Space Station 13 for 'good behavior', but this feels more like a punishment than a reward. All I know is that if I don't get some action soon, I'm going to go insane.
Entry Two - 03/06/2554:
Okay, so get this: we got a fuckin' deathsquad coming in today! I thought the day I saw one of them would be the day my employment was 'terminated', if you get my drift. They're escorting some sort of weird alien creature for the eggheads to study. I heard one of the docs telling the chef that this thing killed a whole security force before it was captured. I sure as hell hope that I don't have to fight it.
Entry Three - 08/06/2554:
My first real bit of 'action' today, if you could call it that. Crazy Ivan got in a fight with Kuester today about his Booze-O-Mat. Apparently one of the crewmembers had stolen a couple bottles of booze from the machine after Ivan disabled the ID lock. Tell you the truth, I don't blame the thief. Everyone is going a little stir-crazy in here, and the bartender is being damn stingy with the alcohol. Either way, once they started to pick a fight, I had to take them down. It's a damn shame that we don't have a brig, though. I had to lock Ivan in a fuckin' freezer, for god's sake. Let's hope that we can keep our sanity together, at least for a while.
Entry Four - 10/06/2554:
Jesus fucking Christ riding on a motorbike. These things the scientists are studying are terrifying! Fucking great huge purple bug things as tall as the ceiling, with blades for arms and drooling at the mouth. I don't think my taser will do jack shit against these damn things, but the eggheads say that they're safely contained. If they do, I have a feeling that it's only a matter of time before we're all screwed. These bastards look like walking death.
Entry Five - 18/06/2554:
Finally caught who stole the booze from Kuester. It was that fuckin' loser assistant Steve! He was in the dorms, chugging his worries away. I took one of the bottles back to the barkeep, but no one has to know about this second one. I think I'm gonna enjoy this while watching tomorrow's Thunderdome match.
Entry Six - 19/06/2554:
Oh, great. The chef is still sleeping, so we get Ivan's gruel for breakfast today. I overheard Sano and Douglas saying something about the aliens being restless, so we might get some action today. As long as it happens after the big game, I'm fine with it. I still got one beer to drink before I'm ready to die." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/log/ivan - name = "Personal Log - Ivan Volodin" - default_raw_text = "Ivan Volodin Stories:
Entry Won - 28/05/2554:
Hello. I am Crazy Ivan. Boss say I must write. I do good job fixing outpost. Is very good job. Much better than mines. Many nice people. I cause no trouble.
Entry Too - 05/06/2554:
I am finding problem with Booze-O-Mat. Is not problem. I solve very easy. Use yellow tool to make purple light go off. I am good engineer! Bartender will be very happy.
Entry Tree - 08/06/2554:
Bartender is not happy. Security man is not happy. Cannot feel legs, is very cold in freezer. Is not good. Table is jammed into door, have no tools. Is very not good. But, on bright side, found meat! Shall chew to keep spirits up.
Entry Fore - 12/06/2554:
Big nasty purple bug looked at me today. Make nervous. Blue wall wire can be broken, then bad thing happens. Very very bad thing. Man in orange spacesuit wave at me today too. He seem nice. Wonder who was?
Entry Fiv - 15/06/2554:
I eat cornflakes today. Is good day. Sun shine for a while. Was nice. I also take ride on disposals chute. Was fun, but tiny. Get clog out of pipes, was vodka bottle. Is empty. This make many sads.
Entry Sex: 19/06/2554:
Purple bugs jumpy today. When waved, get hiss. Maybe very bad. Maybe just ill. Do not know. Is science problem, is not engineer problem. I eat sandwich. Is glorious job. Wish to never end." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/log/gerald - name = "Personal Log - Gerald Rosswell" - default_raw_text = "Personal Log for Research Director Gerald Rosswell
Entry One - 17/05/2554:
You know, I can't believe I took this position so suddenly. I saw that corporate needed a research director for one of it's outposts and thought it would be a cakewalk, there isn't going to be a lot of research to be done on a tiny outpost. Mainly just running scans on the gas giant we are orbiting or some basic RnD. However, they conveniently forgot to tell me that me and my science staff would have to pull double duty as medical staff and that there is no one higher up on the chain of command here, so I get to pull triple duty as acting captain as well! This shit is probably allowed in some 3 point fine print buried underneath the literally thousands of pages of contracts. Well, at least the research will be easy work.
Entry Two - 25/05/2554:
Well, we all expected it at the outpost, CentCom has decided to completely change what research we are doing. They've decided that we should be research the species known as 'xenomporphs'. They announced this change 4 days ago and along with it, sadly, the termination of our current science staff barring me. Not to mention the constant noise made by the construction detail they sent to staple on an xenobiology lab ensuring no one has been able to sleep decently ever since they announced the shift. To make matters worse our current security guard actually died of a heart attack today. Just goes to show that 75 year old men shouldn't be security guards. Still can't believe that they decided to do this major change less than a month after the outpost was established.
Entry Three - 27/05/2554:
The new security guard arrived today. Apparently transferred here from the research station that also is orbiting the gas giant. He seems to be rather angry about his transfer. Considering the rumors I've heard about the research station he's probably caught off guard by the fact that Steve hasn't tried to force an IED down his throat.
Entry Four - 06/06/2554:
My requests for additional security and containment measures for the 'xenomorph' has been denied. Does Central Command not notice how dangerous these creatures are? The only thing keeping them in is a force field, a minor problem with the power grid and the entire hive is loose. What would stop them then, the lone security guard with a dinky little taser? Kenneth can barely handle a short-tempered engineer. We are under equipped and under staffed, we are inevitably going to be destroyed unless we get the equipment and staff we need.
Entry Five - 10/06/2554:
Cunningham got a good look at the xenomorph in containment. He was frightened for the rest of the day, rather amusing if it wasn't for the fact that we are all trapped on this scrap heap with naught but a force field keeping those xenomorphs in.
Entry Six - 17/06/2554:
The reactions from the specimens today has shown that they possess strange mental properties. Mark hypothesizes that they possibly have a sort of hive mind, while nothing is certain this would explain how xenomorphs seem to have vastly increased intellect when a 'queen' is present. Of course, to test this hypothesis would require many complicated procedures which we will not be able to undertake. But we do not know the full extend of the xenomorph mind, it may or may not be able to find a way to circumvent our containment system. I will resend my request for additional security measures along with this new found information." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/food_specials - name = "Specials This Week" - default_raw_text = "
I Can't Believe It's Not Pasta: Half off on Wednesdays
Burger night every Friday 6PM-10PM, free drinks with purchase of meal!
Premiering Tonight: The comedy stylings of Shoe Snatching Willy! 11AM-7PM
" - -/obj/item/paper/fluff/awaymissions/moonoutpost19/welcome - name = "Welcome Notice" - default_raw_text = "Welcome to Moon Outpost 19! Property of Nanotrasen Inc.
Staff Roster:
-Dr. Gerald Rosswell: Research Director & Acting Captain
-Dr. Sakuma Sano: Xenobiologist
-Dr. Mark Douglas: Xenobiologist
-Kenneth Cunningham: Security Officer-Ivan Volodin: Engineer
-Mathias Kuester: Bartender
-Sven Edling: Chef
-Steve: Assistant
Please enjoy your stay, and report any abnormalities to an officer." - -/obj/item/paper/fluff/awaymissions/moonoutpost19/goodbye_note - name = "Note" - default_raw_text = "Bugs break out. I run to here and lock door. I hear door next to me break open and screams. All nice people here dead now. I no want to be eaten, and bottle always said to be coward way out, but person who say that is stupid. Mira, there is no escape for me, tell Alexis and Elena that father will never come home, and that I love you all." - - diff --git a/code/modules/awaymissions/mission_code/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm deleted file mode 100644 index 5dfc4c0164176..0000000000000 --- a/code/modules/awaymissions/mission_code/murderdome.dm +++ /dev/null @@ -1,39 +0,0 @@ -/area/awaymission/vr/murderdome - name = "Murderdome" - icon_state = "awaycontent8" - pacifist = FALSE - -/obj/structure/window/reinforced/fulltile/indestructable - name = "robust window" - flags_1 = PREVENT_CLICK_UNDER_1 | NODECONSTRUCT_1 - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - -/obj/structure/grille/indestructable - flags_1 = CONDUCT_1 | NODECONSTRUCT_1 - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - -/obj/effect/spawner/structure/window/reinforced/indestructable - spawn_list = list(/obj/structure/grille/indestructable, /obj/structure/window/reinforced/fulltile/indestructable) - -/obj/structure/barricade/security/murderdome - name = "respawnable barrier" - desc = "A barrier. Provides cover in firefights." - -/obj/structure/barricade/security/murderdome/make_debris() - new /obj/effect/murderdome/dead_barricade(get_turf(src)) - -/obj/effect/murderdome/dead_barricade - name = "dead barrier" - desc = "It provided cover in fire fights. And now it's gone." - icon = 'icons/obj/objects.dmi' - icon_state = "barrier0" - alpha = 100 - -/obj/effect/murderdome/dead_barricade/Initialize(mapload) - . = ..() - addtimer(CALLBACK(src, PROC_REF(respawn)), 3 MINUTES) - -/obj/effect/murderdome/dead_barricade/proc/respawn() - if(!QDELETED(src)) - new /obj/structure/barricade/security/murderdome(get_turf(src)) - qdel(src) diff --git a/code/modules/awaymissions/mission_code/research.dm b/code/modules/awaymissions/mission_code/research.dm deleted file mode 100644 index b3e4ff8b863b6..0000000000000 --- a/code/modules/awaymissions/mission_code/research.dm +++ /dev/null @@ -1,69 +0,0 @@ -//Research Base Areas//-- - -/area/awaymission/research - name = "Research Outpost" - icon_state = "away" - dynamic_lighting = DYNAMIC_LIGHTING_ENABLED - -/area/awaymission/research/interior - name = "Research Inside" - requires_power = TRUE - icon_state = "away2" - -/area/awaymission/research/interior/cryo - name = "Research Cryostasis Room" - icon_state = "medbay" - -/area/awaymission/research/interior/clonestorage - name = "Research Clone Storage" - icon_state = "cloning" - -/area/awaymission/research/interior/genetics - name = "Research Genetics Research" - icon_state = "genetics" - -/area/awaymission/research/interior/engineering - name = "Research Engineering" - icon_state = "engine" - -/area/awaymission/research/interior/security - name = "Research Security" - icon_state = "security" - -/area/awaymission/research/interior/secure - name = "Research Secure Vault" - -/area/awaymission/research/interior/maint - name = "Research Maintenance" - icon_state = "maintcentral" - -/area/awaymission/research/interior/dorm - name = "Research Dorms" - icon_state = "Sleep" - -/area/awaymission/research/interior/escapepods - name = "Research Escape Wing" - icon_state = "exit" - -/area/awaymission/research/interior/gateway - name = "Research Gateway" - icon_state = "start" - -/area/awaymission/research/interior/bathroom - name = "Research Bathrooms" - icon_state = "restrooms" - -/area/awaymission/research/interior/medbay - name = "Research Medbay" - icon_state = "medbay" - -/area/awaymission/research/exterior - name = "Research Exterior" - icon_state = "unknown" - - -//research papers - -/obj/item/paper/crumpled/awaymissions/research/sensitive_info - default_raw_text = "Theres a lot of sensitive info on these disks, try and keep them secure! If these backup copies get into the wrong hands, god knows what they could do with the genetic research on these disk.." - diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm deleted file mode 100644 index 4ac5b20b26d3b..0000000000000 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ /dev/null @@ -1,665 +0,0 @@ -//Snow Valley Areas//-- - -/area/awaymission/snowdin - name = "Snowdin" - icon_state = "awaycontent1" - requires_power = FALSE - dynamic_lighting = DYNAMIC_LIGHTING_DISABLED - -/area/awaymission/snowdin/outside - name = "Snowdin Tundra Plains" - icon_state = "awaycontent25" - -/area/awaymission/snowdin/post - name = "Snowdin Outpost" - icon_state = "awaycontent2" - requires_power = TRUE - dynamic_lighting = DYNAMIC_LIGHTING_ENABLED - -/area/awaymission/snowdin/post/medbay - name = "Snowdin Outpost - Medbay" - icon_state = "awaycontent3" - -/area/awaymission/snowdin/post/secpost - name = "Snowdin Outpost - Security Checkpoint" - icon_state = "awaycontent4" - -/area/awaymission/snowdin/post/hydro - name = "Snowdin Outpost - Hydroponics" - icon_state = "awaycontent5" - -/area/awaymission/snowdin/post/messhall - name = "Snowdin Outpost - Mess Hall" - icon_state = "awaycontent6" - -/area/awaymission/snowdin/post/gateway - name = "Snowdin Outpost - Gateway" - icon_state = "awaycontent7" - -/area/awaymission/snowdin/post/dorm - name = "Snowdin Outpost - Dorms" - icon_state = "awaycontent8" - -/area/awaymission/snowdin/post/kitchen - name = "Snowdin Outpost - Kitchen" - icon_state = "awaycontent9" - -/area/awaymission/snowdin/post/engineering - name = "Snowdin Outpost - Engineering" - icon_state = "awaycontent10" - -/area/awaymission/snowdin/post/custodials - name = "Snowdin Outpost - Custodials" - icon_state = "awaycontent11" - -/area/awaymission/snowdin/post/research - name = "Snowdin Outpost - Research Area" - icon_state = "awaycontent12" - -/area/awaymission/snowdin/post/garage - name = "Snowdin Outpost - Garage" - icon_state = "awaycontent13" - -/area/awaymission/snowdin/post/minipost - name = "Snowdin Outpost - Recon Post" - icon_state = "awaycontent19" - -/area/awaymission/snowdin/post/mining_main - name = "Snowdin Outpost - Mining Post" - icon_state = "awaycontent21" - -/area/awaymission/snowdin/post/mining_main/mechbay - name = "Snowdin Outpost - Mining Post Mechbay" - icon_state = "awaycontent25" - -/area/awaymission/snowdin/post/mining_main/robotics - name = "Snowdin Outpost - Mining Post Robotics" - icon_state = "awaycontent26" - -/area/awaymission/snowdin/post/cavern1 - name = "Snowdin Outpost - Cavern Outpost 1" - icon_state = "awaycontent27" - -/area/awaymission/snowdin/post/cavern2 - name = "Snowdin Outpost - Cavern Outpost 2" - icon_state = "awaycontent28" - -/area/awaymission/snowdin/post/mining_dock - name = "Snowdin Outpost - Underground Mine Post" - icon_state = "awaycontent22" - -/area/awaymission/snowdin/post/broken_shuttle - name = "Snowdin Outpost - Broken Transit Shuttle" - icon_state = "awaycontent20" - requires_power = FALSE - -/area/awaymission/snowdin/igloo - name = "Snowdin Igloos" - icon_state = "awaycontent14" - dynamic_lighting = DYNAMIC_LIGHTING_ENABLED - -/area/awaymission/snowdin/cave - name = "Snowdin Caves" - icon_state = "awaycontent15" - dynamic_lighting = DYNAMIC_LIGHTING_ENABLED - -/area/awaymission/snowdin/cave/cavern - name = "Snowdin Depths" - icon_state = "awaycontent23" - -/area/awaymission/snowdin/cave/mountain - name = "Snowdin Mountains" - icon_state = "awaycontent24" - - -/area/awaymission/snowdin/base - name = "Snowdin Main Base" - icon_state = "awaycontent16" - dynamic_lighting = DYNAMIC_LIGHTING_ENABLED - requires_power = TRUE - -/area/awaymission/snowdin/dungeon1 - name = "Snowdin Depths" - icon_state = "awaycontent17" - dynamic_lighting = DYNAMIC_LIGHTING_ENABLED - -/area/awaymission/snowdin/sekret - name = "Snowdin Operations" - icon_state = "awaycontent18" - dynamic_lighting = DYNAMIC_LIGHTING_ENABLED - requires_power = TRUE - -/area/shuttle/snowdin/elevator1 - name = "Excavation Elevator" - -/area/shuttle/snowdin/elevator2 - name = "Mining Elevator" - -//liquid plasma!!!!!!// - -/turf/open/floor/iron/dark/snowdin - initial_gas_mix = FROZEN_ATMOS - planetary_atmos = 1 - initial_temperature = 180 - -/turf/open/lava/plasma - name = "liquid plasma" - desc = "A flowing stream of chilled liquid plasma. You probably shouldn't get in." - icon_state = "liquidplasma" - initial_gas_mix = "n2=82;plasma=24;TEMP=120" - baseturfs = /turf/open/lava/plasma - slowdown = 2 - - resistance_flags = INDESTRUCTIBLE - - light_range = 3 - light_power = 0.75 - light_color = LIGHT_COLOR_PURPLE - -/turf/open/lava/plasma/attackby(obj/item/I, mob/user, params) - var/obj/item/reagent_containers/cup/C = I - if(C.reagents.total_volume >= C.volume) - to_chat(user, "[C] is full.") - return - C.reagents.add_reagent(/datum/reagent/toxin/plasma, rand(5, 10)) - user.visible_message("[user] scoops some plasma from the [src] with \the [C].", "You scoop out some plasma from the [src] using \the [C].") - -/turf/open/lava/plasma/burn_stuff(AM) - . = 0 - - if(is_safe()) - return FALSE - - var/thing_to_check = src - if (AM) - thing_to_check = list(AM) - for(var/thing in thing_to_check) - if(isobj(thing)) - var/obj/O = thing - if((O.resistance_flags & (FREEZE_PROOF)) || O.throwing) - continue - - else if (isliving(thing)) - . = 1 - var/mob/living/L = thing - if(L.movement_type & (FLOATING|FLYING)) - continue //YOU'RE FLYING OVER IT - if("snow" in L.weather_immunities) - continue - - var/buckle_check = L.buckled - if(isobj(buckle_check)) - var/obj/O = buckle_check - if(O.resistance_flags & FREEZE_PROOF) - continue - - else if(isliving(buckle_check)) - var/mob/living/live = buckle_check - if("snow" in live.weather_immunities) - continue - - L.adjustFireLoss(2) - if(L) - L.adjust_fire_stacks(20) //dipping into a stream of plasma would probably make you more flammable than usual - L.adjust_bodytemperature(-rand(50,65)) //its cold, man - if(ishuman(L))//are they a carbon? - var/list/plasma_parts = list()//a list of the organic parts to be turned into plasma limbs - var/list/robo_parts = list()//keep a reference of robotic parts so we know if we can turn them into a plasmaman - var/mob/living/carbon/human/PP = L - var/S = PP.dna.species - if(istype(S, /datum/species/plasmaman) || istype(S, /datum/species/android)) //ignore plasmamen/robotic species - continue - - for(var/BP in PP.bodyparts) - var/obj/item/bodypart/NN = BP - if(IS_ORGANIC_LIMB(NN) && NN.limb_id != "plasmaman") //getting every organic, non-plasmaman limb (augments/androids are immune to this) - plasma_parts += NN - if(!IS_ORGANIC_LIMB(NN)) - robo_parts += NN - - if(prob(35)) //checking if the delay is over & if the victim actually has any parts to nom - PP.adjustToxLoss(15) - PP.adjustFireLoss(25) - if(plasma_parts.len) - var/obj/item/bodypart/NB = pick(plasma_parts) //using the above-mentioned list to get a choice of limbs for dismember() to use - PP.emote("scream") - NB.limb_id = "plasmaman"//change the species_id of the limb to that of a plasmaman - NB.no_update = TRUE - NB.change_bodypart_status() - PP.visible_message("[L] screams in pain as [L.p_their()] [NB] melts down to the bone!", \ - "You scream out in pain as your [NB] melts down to the bone, leaving an eerie plasma-like glow where flesh used to be!") - if(!plasma_parts.len && !robo_parts.len) //a person with no potential organic limbs left AND no robotic limbs, time to turn them into a plasmaman - PP.IgniteMob() - PP.set_species(/datum/species/plasmaman) - PP.visible_message("[L] bursts into a brilliant purple flame as [L.p_their()] entire body is that of a skeleton!", \ - "Your senses numb as all of your remaining flesh is turned into a purple slurry, sloshing off your body and leaving only your bones to show in a vibrant purple!") - - -/obj/vehicle/ridden/lavaboat/plasma - name = "plasma boat" - desc = "A boat used for traversing the streams of plasma without turning into an icecube." - icon_state = "goliath_boat" - icon = 'icons/obj/lavaland/dragonboat.dmi' - resistance_flags = FREEZE_PROOF - can_buckle = TRUE -/////////// papers - - -/obj/item/paper/crumpled/ruins/snowdin/foreshadowing - name = "scribbled note" - default_raw_text = {"Something's gone VERY wrong here. Jouslen has been mumbling about some weird shit in his cabin during the night and he seems always tired when we're working. I tried to confront him about it and he blew up on me, - telling me to mind my own business. I reported him to the officer, said he'd look into it. We only got another 2 months here before we're pulled for another assignment, so this shit can't go any quicker..."} - -/obj/item/paper/crumpled/ruins/snowdin/misc1 - name = "Mission Prologue" - default_raw_text = {"Holy shit, what a rush! Those Nanotrasen bastards didn't even know what hit 'em! All five of us dropped in right on the captain, didn't even have time to yell! We were in and out with that disk in mere minutes! - Crew didn't even know what was happening till the delta alert went down and by then we were already gone. We got a case to drink on the way home to celebrate, fuckin' job well done!"} - -/obj/item/paper/crumpled/ruins/snowdin/dontdeadopeninside - name = "scribbled note" - default_raw_text = {"If you're reading this: GET OUT! The mining go on here has unearthed something that was once-trapped by the layers of ice on this hell-hole. The overseer and Jouslen have gone missing. The officer is - keeping the rest of us on lockdown and I swear to god I keep hearing strange noises outside the walls at night. The gateway link has gone dead and without a supply of resources from Central, we're left - for dead here. We haven't heard anything back from the mining squad either, so I can only assume whatever the fuck they unearthed got them first before coming for us. I don't want to die here..."} - -/obj/item/paper/fluff/awaymissions/snowdin/saw_usage - name = "SAW Usage" - default_raw_text = "YOU SEEN IVAN, WHEN YOU HOLD SAAW LIKE PEESTOL, YOU STRONGER THAN RECOIL FOR FEAR OF HITTING FACE!" - -/obj/item/paper/fluff/awaymissions/snowdin/research_feed - name = "Research Feed" - default_raw_text = {"A page full of graphs and other detailed information on the seismic activity of the surrounding area."} - -//profile of each of the old crewmembers for the outpost - -/obj/item/paper/fluff/awaymissions/snowdin/profile/overseer - name = "Personnel Record AOP#01" - default_raw_text = {"
Name:Caleb Reed
Age:38
Gender:Male
On-Site Profession:Outpost Overseer
Name:James Reed
Age:43
Gender:Male
On-Site Profession:Outpost Security
Name:Katherine Esterdeen
Age:27
Gender:Female
On-Site Profession:Outpost Botanist
Name:Rachel Migro
Age:35
Gender:Female
On-Site Profession:Outpost Engineer
Name:Jacob Ullman
Age:27
Gender:Male
On-Site Profession:Outpost Researcher
Name:Elizabeth Queef
Age:28
Gender:Female
On-Site Profession:Outpost Researcher
Name:Jouslen McGee
Age:38
Gender:Male
On-Site Profession:Outpost Researcher
- Objective: Prototype weaponry. The captain likely keeps them locked in her safe.
-
- Our on-board spy has learned the code and has hidden away a few copies of the code around the station. Unfortunately he has been captured by security - Your objective is to split up, locate any of the papers containing the captain's safe code, open the safe and - secure anything found inside. If possible, recover the imprisioned syndicate operative and receive the code from him.
-
- As always, eliminate anyone who gets in the way.
-
- Your assigned ship is designed specifically for penetrating the hull of another station or ship with minimal damage to operatives. - It is completely fly-by-wire meaning you have just have to enjoy the ride and when the red light comes on... find something to hold onto! - "} -/* - * Captain's safe - */ -/obj/item/storage/secure/safe/sc_ssafe - name = "Captain's secure safe" - -/obj/item/storage/secure/safe/sc_ssafe/Initialize(mapload) - . = ..() - l_code = "[GLOB.sc_safecode1][GLOB.sc_safecode2][GLOB.sc_safecode3][GLOB.sc_safecode4][GLOB.sc_safecode5]" - l_set = 1 - new /obj/item/gun/energy/mindflayer(src) - new /obj/item/soulstone(src) - new /obj/item/clothing/suit/hooded/cultrobes(src) - //new /obj/item/teleportation_scroll(src) - new /obj/item/stack/ore/diamond(src) diff --git a/code/modules/awaymissions/mission_code/undergroundoutpost45.dm b/code/modules/awaymissions/mission_code/undergroundoutpost45.dm deleted file mode 100644 index 7ec7d7728f257..0000000000000 --- a/code/modules/awaymissions/mission_code/undergroundoutpost45.dm +++ /dev/null @@ -1,38 +0,0 @@ -// undergroundoutpost45 - -//Areas -/area/awaymission/undergroundoutpost45 - name = "space" - icon_state = "awaycontent1" - -/area/awaymission/undergroundoutpost45/central - name = "UO45 Central Hall" - icon_state = "awaycontent2" - -/area/awaymission/undergroundoutpost45/crew_quarters - name = "UO45 Crew Quarters" - icon_state = "awaycontent3" - -/area/awaymission/undergroundoutpost45/engineering - name = "UO45 Engineering" - icon_state = "awaycontent4" - -/area/awaymission/undergroundoutpost45/mining - name = "UO45 Mining" - icon_state = "awaycontent5" - -/area/awaymission/undergroundoutpost45/research - name = "UO45 Research" - icon_state = "awaycontent6" - -/area/awaymission/undergroundoutpost45/gateway - name = "UO45 Gateway" - icon_state = "awaycontent7" - -/area/awaymission/undergroundoutpost45/caves - name = "UO45 Caves" - icon_state = "awaycontent8" - always_unpowered = TRUE - power_environ = FALSE - power_equip = FALSE - power_light = FALSE diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm deleted file mode 100644 index 1ede6fa0f60ad..0000000000000 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ /dev/null @@ -1,174 +0,0 @@ -/* Code for the Wild West map by Brotemis - * Contains: - * Wish Granter - * Meat Grinder - */ - -//Areas - -/area/awaymission/wildwest/mines - name = "Wild West Mines" - icon_state = "away1" - requires_power = FALSE - -/area/awaymission/wildwest/gov - name = "Wild West Mansion" - icon_state = "away2" - requires_power = FALSE - -/area/awaymission/wildwest/refine - name = "Wild West Refinery" - icon_state = "away3" - requires_power = FALSE - -/area/awaymission/wildwest/vault - name = "Wild West Vault" - icon_state = "away3" - -/area/awaymission/wildwest/vaultdoors - name = "Wild West Vault Doors" // this is to keep the vault area being entirely lit because of requires_power - icon_state = "away2" - requires_power = FALSE - - -////////// wildwest papers - -/obj/item/paper/fluff/awaymissions/wildwest/grinder - default_raw_text = "meat grinder requires sacri" - - -/obj/item/paper/fluff/awaymissions/wildwest/journal/page1 - name = "Planer Saul's Journal: Page 1" - default_raw_text = "We've discovered something floating in space. We can't really tell how old it is, but it is scraped and bent to hell. There object is the size of about a room with double doors that we have yet to break into. It is a lot sturdier than we could have imagined. We have decided to call it 'The Vault' " - -/obj/item/paper/fluff/awaymissions/wildwest/journal/page4 - name = "Planer Saul's Journal: Page 4" - default_raw_text = " The miners in the town have become sick and almost all production has stopped. They, in a fit of delusion, tossed all of their mining equipment into the furnaces. They all claimed the same thing. A voice beckoning them to lay down their arms. Stupid miners." - -/obj/item/paper/fluff/awaymissions/wildwest/journal/page7 - name = "Planer Sauls' Journal: Page 7" - default_raw_text = "The Vault...it just keeps growing and growing. I went on my daily walk through the garden and now it's just right outside the mansion... a few days ago it was only barely visible. But whatever is inside...it's calling to me." - -/obj/item/paper/fluff/awaymissions/wildwest/journal/page8 - name = "Planer Saul's Journal: Page 8" - default_raw_text = "The syndicate have invaded. Their ships appeared out of nowhere and now they likely intend to kill us all and take everything. On the off-chance that the Vault may grant us sanctuary, many of us have decided to force our way inside and bolt the door, taking as many provisions with us as we can carry. In case you find this, send for help immediately and open the Vault. Find us inside." - - -/* - * Wish Granter - */ -/obj/machinery/wish_granter_dark - name = "Wish Granter" - desc = "You're not so sure about this, anymore..." - icon = 'icons/obj/device.dmi' - icon_state = "syndbeacon" - - density = TRUE - use_power = NO_POWER_USE - - var/chargesa = 1 - var/insistinga = 0 - -/obj/machinery/wish_granter_dark/interact(mob/living/carbon/human/user) - if(chargesa <= 0) - to_chat(user, "The Wish Granter lies silent.") - return - - else if(!ishuman(user)) - to_chat(user, "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.") - return - - else if(is_special_character(user)) - to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.") - - else if (!insistinga) - to_chat(user, "Your first touch makes the Wish Granter stir, listening to you. Are you really sure you want to do this?") - insistinga++ - - else - chargesa-- - insistinga = 0 - var/wish = input("You want...","Wish") as null|anything in sort_list(list("Power","Wealth","Immortality","Peace")) - switch(wish) - if("Power") - to_chat(user, "Your wish is granted, but at a terrible cost...") - to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.") - user.dna.add_mutation(LASEREYES) - user.dna.add_mutation(SPACEMUT) - user.dna.add_mutation(XRAY) - user.set_species(/datum/species/shadow) - if("Wealth") - to_chat(user, "Your wish is granted, but at a terrible cost...") - to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.") - new /obj/structure/closet/syndicate/resources/everything(loc) - user.set_species(/datum/species/shadow) - if("Immortality") - to_chat(user, "Your wish is granted, but at a terrible cost...") - to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.") - user.add_verb(/mob/living/carbon/proc/immortality) - user.set_species(/datum/species/shadow) - if("Peace") - to_chat(user, "Whatever alien sentience that the Wish Granter possesses is satisfied with your wish. There is a distant wailing as the last of the Faithless begin to die, then silence.") - to_chat(user, "You feel as if you just narrowly avoided a terrible fate...") - for(var/mob/living/simple_animal/hostile/faithless/F in GLOB.mob_living_list) - F.death() - - -///////////////Meatgrinder////////////// - - -/obj/effect/meatgrinder - name = "Meat Grinder" - desc = "What is that thing?" - density = TRUE - anchored = TRUE - icon = 'icons/mob/blob.dmi' - icon_state = "blobpod" - var/triggered = 0 - -/obj/effect/meatgrinder/Initialize(mapload) - . = ..() - var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = PROC_REF(on_entered), - ) - AddElement(/datum/element/connect_loc, loc_connections) - -/obj/effect/meatgrinder/proc/on_entered(datum/source, atom/movable/AM) - SIGNAL_HANDLER - - Bumped(AM) - -/obj/effect/meatgrinder/Bumped(atom/movable/AM) - - if(triggered) - return - if(!ishuman(AM)) - return - - var/mob/living/carbon/human/M = AM - - if(M.stat != DEAD && M.ckey) - visible_message("[M] triggered [src]!") - triggered = 1 - - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(3, 1, src) - s.start() - explosion(M, 1, 0, 0, 0) - qdel(src) - -/////For the Wishgranter/////////// - -/mob/living/carbon/proc/immortality() //Mob proc so people cant just clone themselves to get rid of the shadowperson race. No hiding your wickedness. - set category = "Immortality" - set name = "Resurrection" - - var/mob/living/carbon/C = usr - if(!C.stat) - to_chat(C, "You're not dead yet!") - return - if(C.has_status_effect(STATUS_EFFECT_WISH_GRANTERS_GIFT)) - to_chat(C, "You're already resurrecting!") - return - C.apply_status_effect(STATUS_EFFECT_WISH_GRANTERS_GIFT) - return 1 diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 9aad4cfc9d022..46f0ea0a6b85f 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -253,9 +253,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/closet/supplypod) break if (effectOrgans) //effectOrgans means remove every organ in our mob var/mob/living/carbon/carbon_target_mob = target_living - for(var/organ in carbon_target_mob.internal_organs) + for(var/obj/item/organ/organ_to_yeet as anything in carbon_target_mob.internal_organs) var/destination = get_edge_target_turf(turf_underneath, pick(GLOB.alldirs)) //Pick a random direction to toss them in - var/obj/item/organ/organ_to_yeet = organ organ_to_yeet.Remove(carbon_target_mob) //Note that this isn't the same proc as for lists organ_to_yeet.forceMove(turf_underneath) //Move the organ outta the body organ_to_yeet.throw_at(destination, 2, 3) //Thow the organ at a random tile 3 spots away diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index e4477e14e4c50..10f5973aa700f 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -95,7 +95,7 @@ // sigh, ok, so it's not ACTUALLY infinite nutrition. this is so you can eat clothes more than...once. // bite_consumption limits how much you actually get, and the take_damage in after eat makes sure you can't abuse this. // ...maybe this was a mistake after all. - food_reagents = list(/datum/reagent/consumable/nutriment = INFINITY) + food_reagents = list(/datum/reagent/consumable/nutriment/cloth = INFINITY) tastes = list("dust" = 1, "lint" = 1) foodtypes = CLOTH @@ -117,11 +117,18 @@ after_eat = CALLBACK(src, PROC_REF(after_eat))) /obj/item/food/clothing/proc/after_eat(mob/eater) - var/obj/item/clothing/resolved_clothing = clothing.resolve() - if (resolved_clothing) + var/resolved_item = clothing.resolve() + + if(istype(resolved_item, /obj/item/clothing)) + var/obj/item/clothing/resolved_clothing = resolved_item resolved_clothing.take_damage(MOTH_EATING_CLOTHING_DAMAGE, sound_effect = FALSE, damage_flag = CONSUME) - else - qdel(src) + return + else if(istype(resolved_item, /obj/item/stack/sheet)) + var/obj/item/stack/sheet/resolved_stack = resolved_item + if(resolved_stack.amount > 1) + resolved_stack.amount-- //Each bite removes one from the stack. + return + qdel(resolved_item) /obj/item/clothing/attack(mob/attacker, mob/user, params) if(user.a_intent == INTENT_HARM) diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 833377349d32e..242f21c780d8f 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -80,6 +80,7 @@ icon_state = "clown" item_state = "clown_hat" dye_color = "clown" + w_class = WEIGHT_CLASS_SMALL flags_cover = MASKCOVERSEYES resistance_flags = FLAMMABLE actions_types = list(/datum/action/item_action/adjust) @@ -134,6 +135,7 @@ clothing_flags = MASKINTERNALS icon_state = "mime" item_state = "mime" + w_class = WEIGHT_CLASS_SMALL flags_cover = MASKCOVERSEYES resistance_flags = FLAMMABLE actions_types = list(/datum/action/item_action/adjust) diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index d58556b405024..dd353ea218331 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -47,6 +47,10 @@ stamina = 30 bleed = 30 +/obj/item/clothing/mask/gas/sechailer/swat/emagged + desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. This one seems to have the safety toggled off..." + safety = FALSE + /obj/item/clothing/mask/gas/sechailer/swat/spacepol name = "spacepol mask" desc = "A close-fitting tactical mask created in cooperation with a certain megacorporation, comes with an especially aggressive Compli-o-nator 3000." diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 7c329aa4296a0..fb5d7c45375ae 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -1,3 +1,6 @@ +/datum/outfit/centcom + name = "CentCom Base" + /datum/outfit/ert name = "ERT Common" @@ -265,19 +268,19 @@ id = /obj/item/card/id/ert/Janitor suit = /obj/item/clothing/suit/space/hardsuit/ert/jani + suit_store = /obj/item/storage/bag/trash/bluespace glasses = /obj/item/clothing/glasses/night back = /obj/item/storage/backpack belt = /obj/item/storage/belt/janitor/full r_pocket = /obj/item/grenade/chem_grenade/cleaner - l_pocket = /obj/item/grenade/chem_grenade/cleaner - l_hand = /obj/item/storage/bag/trash/bluespace + + r_hand = /obj/item/choice_beacon/janicart backpack_contents = list(/obj/item/storage/box/survival/engineer=1, /obj/item/storage/box/lights/mixed=1, /obj/item/melee/baton/loaded=1, /obj/item/mop/advanced=1, - /obj/item/reagent_containers/cup/bucket=1, /obj/item/grenade/clusterbuster/cleaner=1, - /obj/item/choice_beacon/janicart) + ) /datum/outfit/ert/janitor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() @@ -291,12 +294,8 @@ /datum/outfit/ert/janitor/heavy name = "ERT Janitor - Heavy Duty" - backpack_contents = list(/obj/item/storage/box/survival/engineer=1, - /obj/item/storage/box/lights/mixed=1, - /obj/item/melee/baton/loaded=1, - /obj/item/grenade/clusterbuster/cleaner=3, - /obj/item/reagent_containers/spray/chemsprayer/janitor=1, - /obj/item/choice_beacon/janicart) + + l_hand = /obj/item/reagent_containers/spray/chemsprayer/janitor /datum/outfit/ert/kudzu name = "ERT Weed Whacker" diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 5a6c689da9922..1d21dce3b330b 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -312,7 +312,6 @@ uniform = /obj/item/clothing/under/color/black/ghost suit = /obj/item/clothing/suit/hooded/cultrobes/alt/ghost shoes = /obj/item/clothing/shoes/cult/alt/ghost - head = /obj/item/clothing/shoes/cult/alt/ghost r_hand = /obj/item/melee/cultblade/ghost /datum/outfit/wizard diff --git a/code/modules/clothing/outfits/vr.dm b/code/modules/clothing/outfits/vr.dm index 4eba242b85c82..8b2a6a64ead43 100644 --- a/code/modules/clothing/outfits/vr.dm +++ b/code/modules/clothing/outfits/vr.dm @@ -22,7 +22,7 @@ id = /obj/item/card/id/syndicate belt = /obj/item/gun/ballistic/automatic/pistol l_pocket = /obj/item/paper/fluff/vr/fluke_ops - backpack_contents = list(/obj/item/storage/box/syndie=1,\ + backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\ /obj/item/knife/combat/survival) /datum/outfit/vr/syndicate/post_equip(mob/living/carbon/human/H) diff --git a/code/modules/clothing/outfits/vv_outfit.dm b/code/modules/clothing/outfits/vv_outfit.dm index b293b78ccf739..33cf2fc2903d9 100644 --- a/code/modules/clothing/outfits/vv_outfit.dm +++ b/code/modules/clothing/outfits/vv_outfit.dm @@ -1,6 +1,7 @@ // This outfit preserves varedits made on the items // Created from admin helpers. /datum/outfit/varedit + name = "Var Edited Outfit" var/list/vv_values var/list/stored_access var/update_id_name = FALSE //If the name of the human is same as the name on the id they're wearing we'll update provided id when equipping diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 4eeb18b66947a..82a0bb5ecd852 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -126,7 +126,7 @@ // Clean up the cell on destroy /obj/item/clothing/suit/space/Destroy() - if(cell) + if(isatom(cell)) QDEL_NULL(cell) var/mob/living/carbon/human/human = src.loc if(istype(human)) diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index d8f1ee3829e66..baa5c3651f7b7 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -27,11 +27,6 @@ if(suit) suit.deactivate(1, 1) -/obj/item/clothing/head/helmet/space/chronos/Destroy() - dropped() - return ..() - - /obj/item/clothing/suit/space/chronos name = "Chronosuit" desc = "An advanced spacesuit equipped with time-bluespace teleportation and anti-compression technology." @@ -73,13 +68,7 @@ else deactivate() -/obj/item/clothing/suit/space/chronos/dropped() - ..() - if(activated) - deactivate() - /obj/item/clothing/suit/space/chronos/Destroy() - dropped() QDEL_NULL(teleport_now) return ..() @@ -228,8 +217,8 @@ var/hard_landing = teleporting && force REMOVE_TRAIT(src, TRAIT_NODROP, CHRONOSUIT_TRAIT) cooldown = world.time + cooldowntime * 1.5 - activated = 0 - activating = 0 + activated = FALSE + activating = FALSE finish_chronowalk() if(user && ishuman(user)) teleport_now.Remove(user) diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index ac9ac39902501..d88ce5c118442 100755 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -428,3 +428,27 @@ var/mob/living/L = user if(L && L.mind) SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "poppy_pin") + +//Security Badges +/obj/item/clothing/accessory/badge/officer/det + name = "\improper Detective's badge" + desc = "A badge of the Nanotrasen Detective Agency, made of gold and set on false leather." + icon_state = "detbadge" + worn_icon_state = "detbadge" + +/obj/item/clothing/accessory/badge/officer/hos + name = "\improper Head of Security badge" + desc = "A badge of the Nanotrasen Security Division, made of gold and set on false black leather." + icon_state = "hosbadge" + worn_icon_state = "hosbadge" + +/obj/item/clothing/accessory/badge/officer + name = "\improper Security badge" + desc = "A badge of the Nanotrasen Security Division, made of silver and set on false black leather." + icon_state = "officerbadge" + worn_icon_state = "officerbadge" + +/obj/item/clothing/accessory/badge/officer/attack_self(mob/user) + if(Adjacent(user)) + user.visible_message("[user] shows you \the: [icon2html(src, viewers(user))] [src.name].", "You show \the [src.name].") + ..() diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index a706bdf8efb54..248f38adcdb40 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -89,7 +89,7 @@ . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 6 - STR.can_hold = typecacheof(list(/obj/item/evidencebag)) + STR.set_holdable(list(/obj/item/evidencebag)) /obj/item/storage/box/evidence/PopulateContents() for(var/i in 1 to 6) diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm index e74cc471d5e81..c2ce778b157d5 100644 --- a/code/modules/error_handler/error_handler.dm +++ b/code/modules/error_handler/error_handler.dm @@ -129,7 +129,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0) #ifdef UNIT_TESTS if(GLOB.current_test) //good day, sir - GLOB.current_test.Fail("[main_line]\n[desclines.Join("\n")]") + GLOB.current_test.Fail("[main_line]\n[desclines.Join("\n")]", file = E.file, line = E.line) #endif if (Debugger?.enabled) diff --git a/code/modules/fields/fields.dm b/code/modules/fields/fields.dm deleted file mode 100644 index dc37016c59001..0000000000000 --- a/code/modules/fields/fields.dm +++ /dev/null @@ -1,319 +0,0 @@ - -//Movable and easily code-modified fields! Allows for custom AOE effects that affect movement and anything inside of them, and can do custom turf effects! -//Supports automatic recalculation/reset on movement. -//If there's any way to make this less CPU intensive than I've managed, gimme a call or do it yourself! - kevinz000 - -//Proc to make fields. make_field(field_type, field_params_in_associative_list) -/proc/make_field(field_type, list/field_params, override_checks = FALSE, start_field = TRUE) - var/datum/proximity_monitor/advanced/F = new field_type() - if(!F.assume_params(field_params) && !override_checks) - QDEL_NULL(F) - if(!F.check_variables() && !override_checks) - QDEL_NULL(F) - if(start_field && (F || override_checks)) - F.Initialize() - return F - -/datum/proximity_monitor/advanced - var/name = "\improper Energy Field" - //Field setup specifications - var/field_shape = FIELD_NO_SHAPE - var/square_height = 0 - var/square_width = 0 - var/square_depth_up = 0 - var/square_depth_down = 0 - //Processing - var/process_inner_turfs = FALSE //Don't do this unless it's absolutely necessary - var/process_edge_turfs = FALSE //Don't do this either unless it's absolutely necessary, you can just track what things are inside manually or on the initial setup. - var/requires_processing = FALSE - var/setup_edge_turfs = FALSE //Setup edge turfs/all field turfs. Set either or both to ON when you need it, it's defaulting to off unless you do to save CPU. - var/setup_field_turfs = FALSE - var/use_host_turf = FALSE //For fields from items carried on mobs to check turf instead of loc... - - var/list/turf/field_turfs = list() - var/list/turf/edge_turfs = list() - var/list/turf/field_turfs_new = list() - var/list/turf/edge_turfs_new = list() - -/datum/proximity_monitor/advanced/Destroy() - full_cleanup() - STOP_PROCESSING(SSfields, src) - return ..() - -/datum/proximity_monitor/advanced/proc/assume_params(list/field_params) - var/pass_check = TRUE - for(var/param in field_params) - if(vars[param] || isnull(vars[param]) || (param in vars)) - vars[param] = field_params[param] - else - pass_check = FALSE - return pass_check - -/datum/proximity_monitor/advanced/proc/check_variables() - var/pass = TRUE - if(field_shape == FIELD_NO_SHAPE) //If you're going to make a manually updated field you shouldn't be using automatic checks so don't. - pass = FALSE - if(current_range < 0 || square_height < 0 || square_width < 0 || square_depth_up < 0 || square_depth_down < 0) - pass = FALSE - if(!istype(host)) - pass = FALSE - return pass - -/datum/proximity_monitor/advanced/process() - if(process_inner_turfs) - for(var/turf/T in field_turfs) - process_inner_turf(T) - CHECK_TICK //Really crappy lagchecks, needs improvement once someone starts using processed fields. - if(process_edge_turfs) - for(var/turf/T in edge_turfs) - process_edge_turf(T) - CHECK_TICK //Same here. - -/datum/proximity_monitor/advanced/proc/process_inner_turf(turf/T) - -/datum/proximity_monitor/advanced/proc/process_edge_turf(turf/T) - -/datum/proximity_monitor/advanced/New() - if(requires_processing) - START_PROCESSING(SSfields, src) - -/datum/proximity_monitor/advanced/proc/Initialize() - setup_field() - post_setup_field() - -/datum/proximity_monitor/advanced/proc/full_cleanup() //Full cleanup for when you change something that would require complete resetting. - for(var/turf/T in edge_turfs) - cleanup_edge_turf(T) - for(var/turf/T in field_turfs) - cleanup_field_turf(T) - -/datum/proximity_monitor/advanced/proc/check_movement() - if(!use_host_turf) - if(host.loc != last_host_loc) - last_host_loc = host.loc - return TRUE - else - if(get_turf(host) != last_host_loc) - last_host_loc = get_turf(host) - return TRUE - return FALSE - -/datum/proximity_monitor/advanced/proc/recalculate_field(ignore_movement_check = FALSE) //Call every time the field moves (done automatically if you use update_center) or a setup specification is changed. - if(!(ignore_movement_check || check_movement()) && (field_shape != FIELD_NO_SHAPE)) - return - update_new_turfs() - var/list/turf/needs_setup = field_turfs_new.Copy() - if(setup_field_turfs) - for(var/turf/T in field_turfs) - if(!(T in needs_setup)) - cleanup_field_turf(T) - else - needs_setup -= T - CHECK_TICK - for(var/turf/T in needs_setup) - setup_field_turf(T) - CHECK_TICK - if(setup_edge_turfs) - for(var/turf/T in edge_turfs) - cleanup_edge_turf(T) - CHECK_TICK - for(var/turf/T in edge_turfs_new) - setup_edge_turf(T) - CHECK_TICK - -/datum/proximity_monitor/advanced/proc/field_turf_canpass(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_turf/F, border_dir) - return TRUE - -/datum/proximity_monitor/advanced/proc/field_turf_crossed(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_turf/F) - return TRUE - -/datum/proximity_monitor/advanced/proc/field_turf_uncrossed(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_turf/F) - return TRUE - -/datum/proximity_monitor/advanced/proc/field_edge_canpass(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_edge/F, border_dir) - return TRUE - -/datum/proximity_monitor/advanced/proc/field_edge_crossed(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_edge/F) - return TRUE - -/datum/proximity_monitor/advanced/proc/field_edge_uncrossed(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_edge/F) - return TRUE - -/datum/proximity_monitor/advanced/HandleMove() - var/atom/_host = host - var/atom/new_host_loc = _host.loc - if(last_host_loc != new_host_loc) - INVOKE_ASYNC(src, PROC_REF(recalculate_field)) - -/datum/proximity_monitor/advanced/proc/post_setup_field() - -/datum/proximity_monitor/advanced/proc/setup_field() - update_new_turfs() - if(setup_field_turfs) - for(var/turf/T in field_turfs_new) - setup_field_turf(T) - CHECK_TICK - if(setup_edge_turfs) - for(var/turf/T in edge_turfs_new) - setup_edge_turf(T) - CHECK_TICK - -/datum/proximity_monitor/advanced/proc/cleanup_field_turf(turf/T) - qdel(field_turfs[T]) - field_turfs -= T - -/datum/proximity_monitor/advanced/proc/cleanup_edge_turf(turf/T) - qdel(edge_turfs[T]) - edge_turfs -= T - -/datum/proximity_monitor/advanced/proc/setup_field_turf(turf/T) - field_turfs[T] = new /obj/effect/abstract/proximity_checker/advanced/field_turf(T, src) - -/datum/proximity_monitor/advanced/proc/setup_edge_turf(turf/T) - edge_turfs[T] = new /obj/effect/abstract/proximity_checker/advanced/field_edge(T, src) - -/datum/proximity_monitor/advanced/proc/update_new_turfs() - if(!istype(host)) - return FALSE - var/turf/center = get_turf(host) - field_turfs_new = list() - edge_turfs_new = list() - switch(field_shape) - if(FIELD_NO_SHAPE) - return FALSE - if(FIELD_SHAPE_RADIUS_SQUARE) - for(var/turf/T in block(locate(center.x-current_range,center.y-current_range,center.z-square_depth_down),locate(center.x+current_range, center.y+current_range,center.z+square_depth_up))) - field_turfs_new += T - edge_turfs_new = field_turfs_new.Copy() - if(current_range >= 1) - var/list/turf/center_turfs = list() - for(var/turf/T in block(locate(center.x-current_range+1,center.y-current_range+1,center.z-square_depth_down),locate(center.x+current_range-1, center.y+current_range-1,center.z+square_depth_up))) - center_turfs += T - for(var/turf/T in center_turfs) - edge_turfs_new -= T - if(FIELD_SHAPE_CUSTOM_SQUARE) - for(var/turf/T in block(locate(center.x-square_width,center.y-square_height,center.z-square_depth_down),locate(center.x+square_width, center.y+square_height,center.z+square_depth_up))) - field_turfs_new += T - edge_turfs_new = field_turfs_new.Copy() - if(square_height >= 1 && square_width >= 1) - var/list/turf/center_turfs = list() - for(var/turf/T in block(locate(center.x-square_width+1,center.y-square_height+1,center.z-square_depth_down),locate(center.x+square_width-1, center.y+square_height-1,center.z+square_depth_up))) - center_turfs += T - for(var/turf/T in center_turfs) - edge_turfs_new -= T - -//Gets edge direction/corner, only works with square radius/WDH fields! -/datum/proximity_monitor/advanced/proc/get_edgeturf_direction(turf/T, turf/center_override = null) - var/turf/checking_from = get_turf(host) - if(istype(center_override)) - checking_from = center_override - if(field_shape != FIELD_SHAPE_RADIUS_SQUARE && field_shape != FIELD_SHAPE_CUSTOM_SQUARE) - return - if(!(T in edge_turfs)) - return - switch(field_shape) - if(FIELD_SHAPE_RADIUS_SQUARE) - if(((T.x == (checking_from.x + current_range)) || (T.x == (checking_from.x - current_range))) && ((T.y == (checking_from.y + current_range)) || (T.y == (checking_from.y - current_range)))) - return get_dir(checking_from, T) - if(T.x == (checking_from.x + current_range)) - return EAST - if(T.x == (checking_from.x - current_range)) - return WEST - if(T.y == (checking_from.y - current_range)) - return SOUTH - if(T.y == (checking_from.y + current_range)) - return NORTH - if(FIELD_SHAPE_CUSTOM_SQUARE) - if(((T.x == (checking_from.x + square_width)) || (T.x == (checking_from.x - square_width))) && ((T.y == (checking_from.y + square_height)) || (T.y == (checking_from.y - square_height)))) - return get_dir(checking_from, T) - if(T.x == (checking_from.x + square_width)) - return EAST - if(T.x == (checking_from.x - square_width)) - return WEST - if(T.y == (checking_from.y - square_height)) - return SOUTH - if(T.y == (checking_from.y + square_height)) - return NORTH - -//DEBUG FIELDS -/datum/proximity_monitor/advanced/debug - name = "\improper Color Matrix Field" - field_shape = FIELD_SHAPE_RADIUS_SQUARE - current_range = 5 - var/set_fieldturf_color = "#aaffff" - var/set_edgeturf_color = "#ffaaff" - setup_field_turfs = TRUE - setup_edge_turfs = TRUE - - -/datum/proximity_monitor/advanced/debug/setup_edge_turf(turf/T) - T.color = set_edgeturf_color - ..() - -/datum/proximity_monitor/advanced/debug/cleanup_edge_turf(turf/T) - T.color = initial(T.color) - ..() - if(T in field_turfs) - T.color = set_fieldturf_color - -/datum/proximity_monitor/advanced/debug/setup_field_turf(turf/T) - T.color = set_fieldturf_color - ..() - -/datum/proximity_monitor/advanced/debug/cleanup_field_turf(turf/T) - T.color = initial(T.color) - ..() - -//DEBUG FIELD ITEM -/obj/item/multitool/field_debug - name = "strange multitool" - desc = "Seems to project a colored field!" - var/list/field_params = list("field_shape" = FIELD_SHAPE_RADIUS_SQUARE, "current_range" = 5, "set_fieldturf_color" = "#aaffff", "set_edgeturf_color" = "#ffaaff") - var/field_type = /datum/proximity_monitor/advanced/debug - var/operating = FALSE - var/datum/proximity_monitor/advanced/current = null - var/mob/listeningTo - -/obj/item/multitool/field_debug/Initialize(mapload) - . = ..() - START_PROCESSING(SSobj, src) - -/obj/item/multitool/field_debug/Destroy() - STOP_PROCESSING(SSobj, src) - QDEL_NULL(current) - listeningTo = null - return ..() - -/obj/item/multitool/field_debug/proc/setup_debug_field() - var/list/new_params = field_params.Copy() - new_params["host"] = src - current = make_field(field_type, new_params) - -/obj/item/multitool/field_debug/attack_self(mob/user) - operating = !operating - to_chat(user, "You turn [src] [operating? "on":"off"].") - UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED) - listeningTo = null - if(!istype(current) && operating) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_mob_move)) - listeningTo = user - setup_debug_field() - else if(!operating) - QDEL_NULL(current) - -/obj/item/multitool/field_debug/dropped() - ..() - if(listeningTo) - UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED) - listeningTo = null - -/obj/item/multitool/field_debug/proc/on_mob_move() - SIGNAL_HANDLER - - check_turf(get_turf(src)) - -/obj/item/multitool/field_debug/process() - check_turf(get_turf(src)) - -/obj/item/multitool/field_debug/proc/check_turf(turf/T) - current.HandleMove() diff --git a/code/modules/fields/turf_objects.dm b/code/modules/fields/turf_objects.dm deleted file mode 100644 index 5edc6300caf77..0000000000000 --- a/code/modules/fields/turf_objects.dm +++ /dev/null @@ -1,78 +0,0 @@ -// ???? -#define FIELD_TURF 1 -#define FIELD_EDGE 2 - -/obj/effect/abstract/proximity_checker/advanced - name = "field" - desc = "Why can you see energy fields?!" - icon = null - icon_state = null - alpha = 0 - invisibility = INVISIBILITY_ABSTRACT - flags_1 = ON_BORDER_1 - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - var/datum/proximity_monitor/advanced/parent = null - -CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/abstract/proximity_checker/advanced) - -/obj/effect/abstract/proximity_checker/advanced/Initialize(mapload, _monitor) - if(_monitor) - parent = _monitor - . = ..() - -/obj/effect/abstract/proximity_checker/advanced/center - name = "field anchor" - desc = "No." - -/obj/effect/abstract/proximity_checker/advanced/field_turf - name = "energy field" - desc = "Get off my turf!" - -/obj/effect/abstract/proximity_checker/advanced/field_turf/CanAllowThrough(atom/movable/mover, border_dir) - . = ..() - if(parent) - return parent.field_turf_canpass(mover, src, border_dir) - -/obj/effect/abstract/proximity_checker/advanced/field_turf/on_entered(datum/source, atom/movable/AM) - . = ..() - if(parent) - return parent.field_turf_crossed(AM, src) - return TRUE - -/obj/effect/abstract/proximity_checker/advanced/field_turf/on_uncrossed(datum/source, atom/movable/gone, direction) - . = ..() - if(parent) - return parent.field_turf_uncrossed(gone, src) - return TRUE - -/obj/effect/abstract/proximity_checker/advanced/field_edge - name = "energy field edge" - desc = "Edgy description here." - -/obj/effect/abstract/proximity_checker/advanced/field_edge/CanAllowThrough(atom/movable/mover, border_dir) - . = ..() - if(parent) - return parent.field_edge_canpass(mover, src, border_dir) - -/obj/effect/abstract/proximity_checker/advanced/field_edge/on_entered(datum/source, atom/movable/AM) - . = ..() - if(parent) - return parent.field_edge_crossed(AM, src) - return TRUE - -/obj/effect/abstract/proximity_checker/advanced/field_edge/on_uncrossed(datum/source, atom/movable/gone, direction) - if(parent) - return parent.field_edge_uncrossed(gone, src) - return TRUE - -/proc/is_turf_in_field(turf/T, datum/proximity_monitor/advanced/F) //Looking for ways to optimize this! - for(var/obj/effect/abstract/proximity_checker/advanced/O in T) - if(istype(O, /obj/effect/abstract/proximity_checker/advanced/field_edge)) - if(O.parent == F) - return FIELD_EDGE - if(O.parent == F) - return FIELD_TURF - return FALSE - -#undef FIELD_TURF -#undef FIELD_EDGE diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 305de392d2954..fdd8f2928e469 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -157,6 +157,8 @@ desc = "An industrial grinder with a sticker saying appropriated for science department. Keep hands clear of intake area while operating." circuit = /obj/item/circuitboard/machine/processor/slime var/sbacklogged = FALSE + ///Proximity monitor associated with this atom, needed for proximity checks. + var/datum/proximity_monitor/proximity_monitor /obj/machinery/processor/slime/Initialize(mapload) . = ..() diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 4276be9bdae13..695d450b650c2 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -26,32 +26,26 @@ if(R.name != "blobspawn") if(prob(35)) if(isspaceturf(R.loc)) - new /mob/living/simple_animal/chicken/rabbit/space(R.loc) + new /mob/living/simple_animal/chicken/rabbit/easter/space(R.loc) else - new /mob/living/simple_animal/chicken/rabbit(R.loc) + new /mob/living/simple_animal/chicken/rabbit/easter(R.loc) -/mob/living/simple_animal/chicken/rabbit - name = "\improper rabbit" +/mob/living/simple_animal/chicken/rabbit/easter desc = "The hippiest hop around." - icon = 'icons/mob/easter.dmi' icon_state = "rabbit_white" icon_living = "rabbit_white" icon_dead = "rabbit_white_dead" speak = list("Hop into Easter!","Come get your eggs!","Prizes for everyone!") - speak_emote = list("sniffles","twitches") speak_language = /datum/language/metalanguage // everyone should understand happy easter emote_hear = list("hops.") emote_see = list("hops around","bounces up and down") - butcher_results = list(/obj/item/food/meat/slab = 1) egg_type = /obj/item/suprise_egg food_type = /obj/item/food/grown/carrot eggsleft = 10 eggsFertile = FALSE - icon_prefix = "rabbit" - feedMessages = list("It nibbles happily.","It noms happily.") layMessage = list("hides an egg.","scampers around suspiciously.","begins making a huge racket.","begins shuffling.") -/mob/living/simple_animal/chicken/rabbit/space +/mob/living/simple_animal/chicken/rabbit/easter/space icon_prefix = "s_rabbit" icon_state = "s_rabbit_white" icon_living = "s_rabbit_white" @@ -82,7 +76,7 @@ /obj/item/storage/basket/easter/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) - STR.can_hold = typecacheof(list(/obj/item/food/egg, /obj/item/food/chocolateegg, /obj/item/food/boiledegg)) + STR.set_holdable(list(/obj/item/food/egg, /obj/item/food/chocolateegg, /obj/item/food/boiledegg)) /obj/item/storage/basket/easter/proc/countEggs() cut_overlays() diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index 4f3822bc9c8d5..bf2152ec7a8b5 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -124,7 +124,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/seeds/galaxythistle) // Gatfruit /obj/item/seeds/gatfruit name = "pack of gatfruit seeds" - desc = "These seeds grow into .357 revolvers." + desc = "These seeds grow into .38 revolvers." icon_state = "seed-gatfruit" species = "gatfruit" plantname = "Gatfruit Tree" @@ -146,7 +146,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/seeds/galaxythistle) name = "gatfruit" desc = "It smells like burning." icon_state = "gatfruit" - trash_type = /obj/item/gun/ballistic/revolver + trash_type = /obj/item/gun/ballistic/revolver/detective/random bite_consumption_mod = 2 foodtypes = FRUIT tastes = list("gunpowder" = 1) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index b69ca5b25fe06..b1a58acc331d1 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -22,7 +22,7 @@ else if(ishuman(accessor)) var/mob/living/carbon/human/H = accessor //if they are holding or wearing a card that has access, that works - if(check_access(H.get_active_held_item()) || src.check_access(H.wear_id)) + if(check_access(H.get_active_held_item()) || src.check_access(H.wear_id) || check_access(accessor.get_inactive_held_item())) return TRUE else if(ismonkey(accessor) || isalienadult(accessor)) var/mob/living/carbon/george = accessor @@ -350,7 +350,7 @@ GLOBAL_LIST_INIT(access_desc_list, list( \ /proc/get_all_centcom_jobs() return list(JOB_CENTCOM_VIP,JOB_CENTCOM_CUSTODIAN, JOB_CENTCOM_THUNDERDOME_OVERSEER,JOB_CENTCOM_OFFICIAL,JOB_CENTCOM_MEDICAL_DOCTOR,JOB_ERT_DEATHSQUAD,JOB_CENTCOM_RESEARCH_OFFICER,"Special Ops Officer",JOB_CENTCOM_ADMIRAL,JOB_CENTCOM_COMMANDER,JOB_ERT_COMMANDER,JOB_ERT_OFFICER ,JOB_ERT_ENGINEER, JOB_ERT_MEDICAL_DOCTOR,JOB_CENTCOM_BARTENDER,"Comedy Response Officer", "HONK Squad Trooper") -/obj/item/proc/GetJobIcon() //Used in secHUD icon generation (the new one) +/obj/item/proc/get_item_job_icon() //Used in secHUD icon generation (the new one) var/obj/item/card/id/I = GetID() if(!I) return diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 2c584577d6133..36bbb54b9f332 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -360,7 +360,9 @@ belt = /obj/item/modular_computer/tablet/pda back = /obj/item/storage/backpack shoes = /obj/item/clothing/shoes/sneakers/black - box = /obj/item/storage/box/survival/normal + box = /obj/item/storage/box/survival + + preload = TRUE // These are used by the prefs ui, and also just kinda could use the extra help at roundstart var/backpack = /obj/item/storage/backpack var/satchel = /obj/item/storage/backpack/satchel @@ -435,6 +437,16 @@ types += duffelbag return types +/datum/outfit/job/get_types_to_preload() + var/list/preload = ..() + preload += backpack + preload += satchel + preload += duffelbag + preload += /obj/item/storage/backpack/satchel/leather + var/skirtpath = "[uniform]/skirt" + preload += text2path(skirtpath) + return preload + //Warden and regular officers add this result to their get_access() /datum/job/proc/check_config_for_sec_maint() return CONFIG_GET(flag/security_has_maint_access) diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index a978829c9977f..c4f4337433094 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -49,6 +49,8 @@ Assistant uniform = /obj/item/clothing/under/color/jumpskirt/random /datum/outfit/job/assistant/proc/give_grey_suit(mob/living/carbon/human/target) + //We don't cache these, because they can delete on init + //Too fragile, better to just eat the cost if (target.jumpsuit_style == PREF_SUIT) uniform = /obj/item/clothing/under/color/grey else diff --git a/code/modules/jobs/job_types/brig_physician.dm b/code/modules/jobs/job_types/brig_physician.dm index 0f98d71dc8d42..d17d7e6a77ff0 100644 --- a/code/modules/jobs/job_types/brig_physician.dm +++ b/code/modules/jobs/job_types/brig_physician.dm @@ -51,6 +51,6 @@ backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med - box = /obj/item/storage/box/survival/security + box = /obj/item/storage/box/survival/security chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index 109508d12fbcc..968ebed54f5d1 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -54,5 +54,6 @@ satchel = /obj/item/storage/backpack/satchel/chem duffelbag = /obj/item/storage/backpack/duffelbag/med + box = /obj/item/storage/box/survival/medical chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index c6d52684a0b00..0875252478c2c 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -69,6 +69,7 @@ satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med + box = /obj/item/storage/box/survival/medical chameleon_extras = list(/obj/item/gun/syringe, /obj/item/stamp/cmo) /datum/outfit/job/chief_medical_officer/hardsuit diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm index 1b75a9340dbd3..0fede554c1d45 100644 --- a/code/modules/jobs/job_types/cook.dm +++ b/code/modules/jobs/job_types/cook.dm @@ -64,3 +64,7 @@ var/datum/martial_art/cqc/under_siege/justacook = new justacook.teach(H) +/datum/outfit/job/cook/get_types_to_preload() + . = ..() + . += /obj/item/clothing/suit/apron/chef + . += /obj/item/clothing/head/soft diff --git a/code/modules/jobs/job_types/deputy.dm b/code/modules/jobs/job_types/deputy.dm index 1592731e31a69..7ce3e523aa559 100644 --- a/code/modules/jobs/job_types/deputy.dm +++ b/code/modules/jobs/job_types/deputy.dm @@ -42,7 +42,7 @@ backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec duffelbag = /obj/item/storage/backpack/duffelbag/sec - box = /obj/item/storage/box/survival/normal + box = /obj/item/storage/box/survival /obj/item/card/id/pass/deputy name = "deputy promotion card" diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index f0e993d9496cd..9e4d0dc757c4f 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -49,7 +49,7 @@ gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/fedora/det_hat l_pocket = /obj/item/modular_computer/tablet/pda/detective - r_pocket = /obj/item/lighter + r_pocket = /obj/item/clothing/accessory/badge/officer/det mask = /obj/item/clothing/mask/cigarette diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index 5fab538dc6973..83da429be221f 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -58,6 +58,7 @@ glasses = /obj/item/clothing/glasses/hud/security/sunglasses suit_store = /obj/item/gun/energy/disabler r_pocket = /obj/item/modular_computer/tablet/pda/heads/head_of_security + l_pocket = /obj/item/clothing/accessory/badge/officer/hos backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index 5acac3c911f03..2a2084cbcee1b 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -42,3 +42,9 @@ if(GARBAGEDAY in SSevents.holidays) l_pocket = /obj/item/gun/ballistic/revolver r_pocket = /obj/item/ammo_box/a357 + +/datum/outfit/job/janitor/get_types_to_preload() + . = ..() + if(GARBAGEDAY in SSevents.holidays) + . += /obj/item/gun/ballistic/revolver + . += /obj/item/ammo_box/a357 diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm index 3d2f6e0e1f38f..e3e4e5078e26e 100644 --- a/code/modules/jobs/job_types/lawyer.dm +++ b/code/modules/jobs/job_types/lawyer.dm @@ -47,12 +47,18 @@ /datum/outfit/job/lawyer/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - ..() if(visualsOnly) - return + return ..() - var/datum/job/lawyer/J = SSjob.GetJobType(jobtype) - J.lawyers++ - if(J.lawyers>1) + var/static/use_purple_suit = FALSE //If there is one lawyer, they get the default blue suit. If another lawyer joins the round, they start with a purple suit. + if(use_purple_suit) uniform = /obj/item/clothing/under/rank/civilian/lawyer/purpsuit suit = /obj/item/clothing/suit/toggle/lawyer/purple + else + use_purple_suit = TRUE + ..() + +/datum/outfit/job/lawyer/get_types_to_preload() + . = ..() + . += /obj/item/clothing/under/rank/civilian/lawyer/purpsuit + . += /obj/item/clothing/suit/toggle/lawyer/purple diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 724fd92b5640b..89314a5272f08 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -58,4 +58,5 @@ satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med + box = /obj/item/storage/box/survival/medical chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index e5c33a5724d02..91d8549a2251a 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -57,4 +57,5 @@ satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med + box = /obj/item/storage/box/survival/medical chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 8e22534c617c6..2801e500b45e5 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -152,6 +152,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S suit = /obj/item/clothing/suit/armor/vest/alt shoes = /obj/item/clothing/shoes/jackboots l_pocket = /obj/item/modular_computer/tablet/pda/security + r_pocket = /obj/item/clothing/accessory/badge/officer suit_store = /obj/item/gun/energy/disabler backpack = /obj/item/storage/backpack/security diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index c06cd31ce4a43..8257e7000dc97 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -53,6 +53,7 @@ gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/hats/warden glasses = /obj/item/clothing/glasses/hud/security/sunglasses + l_pocket = /obj/item/clothing/accessory/badge/officer r_pocket = /obj/item/modular_computer/tablet/pda/warden suit_store = /obj/item/gun/energy/disabler diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm index e42ce4a9ce4c5..152f6b2614f5c 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -27,6 +27,7 @@ name = "regenerative core" desc = "All that remains of a hivelord. It can be used to heal completely, but it will rapidly decay into uselessness." icon_state = "roro core 2" + visual = FALSE item_flags = NOBLUDGEON organ_flags = null slot = "hivecore" diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 36e3129c3e5b2..7b689097c7b38 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -203,6 +203,8 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/mineral/processing_unit_console) var/datum/material/selected_material = null var/selected_alloy = null var/datum/techweb/stored_research + ///Proximity monitor associated with this atom, needed for proximity checks. + var/datum/proximity_monitor/proximity_monitor var/link_id = null var/stored_points = 0 var/allow_point_redemption = FALSE diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 345fe27472452..2abf384dca98b 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -103,6 +103,8 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/mineral/stacking_unit_console) var/stack_amt = 50 //amount to stack before releassing var/datum/component/remote_materials/materials var/force_connect = FALSE + ///Proximity monitor associated with this atom, needed for proximity checks. + var/datum/proximity_monitor/proximity_monitor var/link_id = null /obj/machinery/mineral/stacking_machine/Initialize(mapload) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 39ba6dc987211..85c8da179e38d 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -75,11 +75,11 @@ if(id_card) .["user"]["card_found"] = TRUE .["user"]["name"] = id_card.registered_name || id_card.registered_account?.account_holder || "Unknown" - var/datum/data/record/R = find_record("name", id_card.registered_name, GLOB.data_core.general) + var/datum/record/crew/R = find_record(id_card.registered_name, GLOB.manifest.general) if(!R) - R = find_record("name", id_card.registered_account.account_holder, GLOB.data_core.general) + R = find_record(id_card.registered_account.account_holder, GLOB.manifest.general) if(R) - .["user"]["job"] = R.fields["rank"] + .["user"]["job"] = R.rank else if(id_card.assignment) .["user"]["job"] = id_card.assignment else if(id_card.registered_account?.account_job) diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index 17d3d7e228336..c3224c201bf7b 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -16,7 +16,7 @@ STR.max_w_class = WEIGHT_CLASS_NORMAL STR.max_items = 40 STR.max_combined_w_class = 40 - STR.can_hold = typecacheof(list(/obj/item/coin, /obj/item/stack/spacecash, /obj/item/holochip)) + STR.set_holdable(list(/obj/item/coin, /obj/item/stack/spacecash, /obj/item/holochip)) /obj/item/storage/bag/money/vault/PopulateContents() new /obj/item/coin/silver(src) diff --git a/code/modules/mob/dead/crew_manifest.dm b/code/modules/mob/dead/crew_manifest.dm index 82eb0e8066612..0c797cd3be0e9 100644 --- a/code/modules/mob/dead/crew_manifest.dm +++ b/code/modules/mob/dead/crew_manifest.dm @@ -37,7 +37,7 @@ GLOBAL_DATUM_INIT(crew_manifest_tgui, /datum/crew_manifest, new) var/user_theme = null if(isdead(user)) user_theme = "generic" - return list("manifest" = GLOB.data_core.get_manifest(), "user_theme" = user_theme) + return list("manifest" = GLOB.manifest.get_manifest(), "user_theme" = user_theme) /datum/crew_manifest/ui_assets(mob/user) return list(get_asset_datum(/datum/asset/spritesheet_batched/job_icons)) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index d83b53a72f705..5ce3b199f2e90 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -339,7 +339,6 @@ humanc = character //Let's retypecast the var to be human, if(humanc) //These procs all expect humans - GLOB.data_core.manifest_inject(humanc) if(SSshuttle.arrivals) SSshuttle.arrivals.QueueAnnounce(humanc, rank) else @@ -374,6 +373,7 @@ if(CONFIG_GET(flag/roundstart_traits)) SSquirks.AssignQuirks(character.mind, character.client, TRUE) + GLOB.manifest.inject(humanc) log_manifest(character.mind.key,character.mind,character,latejoin = TRUE) /mob/dead/new_player/proc/AddEmploymentContract(mob/living/carbon/human/employee) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 65589082cfdf2..5181d9cda0f40 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -153,6 +153,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_SPIRIT) AddComponent(/datum/component/tracking_beacon, "ghost", null, null, TRUE, "#9e4d91", TRUE, TRUE, "#490066") AddElement(/datum/element/movetype_handler) ADD_TRAIT(src, TRAIT_MOVE_FLOATING, "ghost") + ADD_TRAIT(src, TRAIT_SECURITY_HUD, ref(src)) /mob/dead/observer/get_photo_description(obj/item/camera/camera) return "You can also see a g-g-g-g-ghooooost!" diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index 2f9b7c9f8c3f0..fefaefe2e8d4b 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -67,7 +67,7 @@ //If we have an ID, use that var/obj/item/card/id/identification_card = M.get_idcard() if (identification_card) - serialized["role_icon"] = "hud[ckey(identification_card.GetJobIcon())]" + serialized["role_icon"] = "hud[ckey(identification_card.get_item_job_icon())]" else if(SSjob.name_occupations[mind.assigned_role]) //If we have no ID, use the mind job var/located_job_hud = get_hud_by_jobname(mind.assigned_role, returns_unknown=FALSE) diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index d909cea4e0eb2..b2e9d1b3e081e 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -66,7 +66,7 @@ return // if the thing we're pulling isn't alive - if (!isliving(pullee)) + if (!isliving(pullee) || ismegafauna(pullee)) return var/mob/living/victim = pullee @@ -126,8 +126,7 @@ to_chat(src, "You devour [victim]. Your health is fully restored.") src.revive(full_heal = 1) - // No defib possible after laughter - victim.apply_damage(1000, BRUTE) + victim.apply_damage(200, BRUTE) if(victim.stat != DEAD) victim.investigate_log("has been killed by being consumed by a slaugter demon.", INVESTIGATE_DEATHS) victim.death() diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index a7f54cd301a41..5533b9029c4cf 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -2,6 +2,7 @@ name = "brain" desc = "A piece of juicy meat found in a person's head." icon_state = "brain" + visual = TRUE throw_speed = 3 throw_range = 5 layer = ABOVE_MOB_LAYER diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index 97cc056fda287..a67bc637986aa 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -1,5 +1,6 @@ /obj/item/organ/alien icon_state = "acid" + visual = FALSE food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/acid = 10) var/list/alien_powers = list() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index d764a65c57e83..fd7e668c4103e 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -842,8 +842,7 @@ CREATION_TEST_IGNORE_SELF(/mob/living/carbon) /mob/living/carbon/fully_heal(admin_revive = FALSE) if(reagents) reagents.clear_reagents() - for(var/O in internal_organs) - var/obj/item/organ/organ = O + for(var/obj/item/organ/organ as anything in internal_organs) organ.setOrganDamage(0) var/obj/item/organ/brain/B = getorgan(/obj/item/organ/brain) if(B) diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 8530c23a039cc..11bb858ca70f8 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -81,3 +81,6 @@ /// Timer id of any transformation var/transformation_timer + + /// Only load in visual organs + var/visual_only_organs = FALSE diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index d060e0982352f..12961b8d82daa 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -3,6 +3,7 @@ real_name = "Test Dummy" status_flags = GODMODE|CANPUSH mouse_drag_pointer = MOUSE_INACTIVE_POINTER + visual_only_organs = TRUE var/in_use = FALSE INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) @@ -21,6 +22,65 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) /mob/living/carbon/human/dummy/Life() return +/mob/living/carbon/human/dummy/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE) + harvest_organs() + return ..() + +///Let's extract our dummies organs and limbs for storage, to reduce the cache missed that spamming a dummy cause +/mob/living/carbon/human/dummy/proc/harvest_organs() + for(var/slot in list(ORGAN_SLOT_BRAIN, ORGAN_SLOT_HEART, ORGAN_SLOT_LUNGS, ORGAN_SLOT_APPENDIX, \ + ORGAN_SLOT_EYES, ORGAN_SLOT_EARS, ORGAN_SLOT_TONGUE, ORGAN_SLOT_LIVER, ORGAN_SLOT_STOMACH)) + var/obj/item/organ/current_organ = getorganslot(slot) //Time to cache it lads + if(current_organ) + current_organ.Remove(src, special = TRUE) //Please don't somehow kill our dummy + SSwardrobe.stash_object(current_organ) + + var/datum/species/current_species = dna.species + for(var/organ_path in current_species.mutant_organs) + var/obj/item/organ/current_organ = getorgan(organ_path) + if(current_organ) + current_organ.Remove(src, special = TRUE) //Please don't somehow kill our dummy + SSwardrobe.stash_object(current_organ) + + /* + for(var/obj/item/organ/external/organ in internal_organs) + if(organ.type in current_species.external_organs) + organ.Remove(src) + SSwardrobe.stash_object(organ) + */ + +//Instead of just deleting our equipment, we save what we can and reinsert it into SSwardrobe's store +//Hopefully this makes preference reloading not the worst thing ever +/mob/living/carbon/human/dummy/delete_equipment() + var/list/items_to_check = get_all_slots() + held_items + var/list/to_nuke = list() //List of items queued for deletion, can't qdel them before iterating their contents in case they hold something + ///Travel to the bottom of the contents chain, expanding it out + for(var/i = 1; i <= length(items_to_check); i++) //Needs to be a c style loop since it can expand + var/obj/item/checking = items_to_check[i] + if(QDELETED(checking)) //Nulls in the list, depressing + continue + if(!isitem(checking)) //What the fuck are you on + to_nuke += checking + continue + + var/list/contents = checking.contents + if(length(contents)) + items_to_check |= contents //Please don't make an infinite loop somehow thx + to_nuke += checking //Goodbye + continue + + //I'm making the bet that if you're empty of other items you're not going to OOM if reapplied. I assume you're here because I was wrong + if(ismob(checking.loc)) + var/mob/checkings_owner = checking.loc + checkings_owner.temporarilyRemoveItemFromInventory(checking, TRUE) //Clear out of there yeah? + SSwardrobe.stash_object(checking) + + for(var/obj/item/delete as anything in to_nuke) + qdel(delete) + +/mob/living/carbon/human/dummy/has_equipped(obj/item/item, slot, initial = FALSE) + return item.visual_equipped(src, slot, initial) + /mob/living/carbon/human/dummy/proc/wipe_state() delete_equipment() cut_overlays() @@ -146,6 +206,12 @@ GLOBAL_LIST_EMPTY(dummy_mob_list) /// Provides a dummy for unit_tests that functions like a normal human, but with a standardized appearance /// Copies the stock dna setup from the dummy/consistent type /mob/living/carbon/human/consistent + next_click = -1 + next_move = -1 + +/mob/living/carbon/human/consistent/Initialize(mapload) + . = ..() + ADD_TRAIT(src, INSTANT_DO_AFTER, INNATE_TRAIT) /mob/living/carbon/human/consistent/setup_human_dna() create_consistent_human_dna(src) @@ -153,3 +219,8 @@ GLOBAL_LIST_EMPTY(dummy_mob_list) /mob/living/carbon/human/consistent/domutcheck() return // We skipped adding any mutations so this runtimes + +/mob/living/carbon/human/consistent/ClickOn(atom/A, params) + next_click = -1 + next_move = -1 + . = ..() diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index c755e27290862..e303b650155e0 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -8,6 +8,7 @@ var/t_is = p_are() var/t_es = p_es() var/obscure_name + var/obscure_examine var/obscured = check_obscured_slots() var/skipface = ((wear_mask?.flags_inv & HIDEFACE) || (head?.flags_inv & HIDEFACE)) @@ -16,12 +17,18 @@ var/mob/living/L = user if(HAS_TRAIT(L, TRAIT_PROSOPAGNOSIA)) obscure_name = TRUE + if(HAS_TRAIT(src, TRAIT_UNKNOWN)) + obscure_name = TRUE + obscure_examine = TRUE var/apparent_species if(dna?.species && !skipface) apparent_species = ", \an [dna.species.name]" . = list("This is [!obscure_name ? name : "Unknown"][apparent_species]!") + if(obscure_examine) + return list("You're struggling to make out any details...") + //Psychic soul stuff if(HAS_TRAIT(user, TRAIT_PSYCHIC_SENSE) && mind) to_chat(user, "[src] has a [mind.soul_glimmer] presence.") @@ -342,13 +349,13 @@ if (!isnull(trait_exam)) . += trait_exam - var/traitstring = mind?.get_quirk_string() + var/traitstring = get_quirk_string() var/perpname = get_face_name(get_id_name("")) if(perpname && (HAS_TRAIT(user, TRAIT_SECURITY_HUD) || HAS_TRAIT(user, TRAIT_MEDICAL_HUD))) - var/datum/data/record/target_record = find_record("name", perpname, GLOB.data_core.general) + var/datum/record/crew/target_record = find_record(perpname, GLOB.manifest.general) if(target_record) - . += "Rank: [target_record.fields["rank"]]\n\[Front photo\]\[Side photo\]" + . += "Rank: [target_record.rank]" if(HAS_TRAIT(user, TRAIT_MEDICAL_HUD)) var/list/cyberimp_detect = list() for(var/obj/item/organ/cyberimp/CI in internal_organs) @@ -357,29 +364,36 @@ if(length(cyberimp_detect)) . += "Detected cybernetic modifications: [english_list(cyberimp_detect)]" if(target_record) - var/health_r = target_record.fields["p_stat"] - . += "\[[health_r]\]" - health_r = target_record.fields["m_stat"] - . += "\[[health_r]\]" + var/physical_status = target_record.physical_status + . += "Physical status: \[[physical_status]\]" + var/mental_status = target_record.mental_status + . += "Mental status: \[[mental_status]\]" + target_record = find_record(perpname, GLOB.manifest.general) . += "\[Medical evaluation\]
" if(traitstring) . += "Detected physiological traits:\n[traitstring]" if(HAS_TRAIT(user, TRAIT_SECURITY_HUD)) - if(!user.stat && user != src) - //|| !user.canmove || user.restrained()) Fluff: Sechuds have eye-tracking technology and sets 'arrest' to people that the wearer looks and blinks at. - var/criminal = "None" + if((user.stat == CONSCIOUS || isobserver(user)) && user != src) + var/wanted_status = WANTED_NONE + var/security_note = "None." - target_record = find_record("name", perpname, GLOB.data_core.security) + target_record = find_record(perpname, GLOB.manifest.general) if(target_record) - criminal = target_record.fields["criminal"] - - . += "Criminal status: \[[criminal]\]" - . += jointext(list("Security record: \[View\]", - "\[Add citation\]", - "\[Add crime\]", - "\[View comment log\]", - "\[Add comment\]"), "") + wanted_status = target_record.wanted_status + if(target_record.security_note) + security_note = target_record.security_note + + if(ishuman(user)) + . += "Criminal status: \[[wanted_status]\]" + else + . += "Criminal status: [wanted_status]" + . += "Important Notes: [security_note]" + . += "Security record: \[View\]" + if(ishuman(user)) + . += jointext(list("\[Add citation\]", + "\[Add crime\]", + "\[Add note\]"), "") else if(isobserver(user) && traitstring) . += "Traits: [traitstring]" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 289e2d2fd1da6..6cb3b134322a1 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -38,6 +38,7 @@ ) AddElement(/datum/element/connect_loc, loc_connections) AddElement(/datum/element/mechanical_repair) + GLOB.human_list += src /mob/living/carbon/human/proc/setup_human_dna() //initialize dna. for spawned humans; overwritten by other code @@ -54,6 +55,7 @@ QDEL_NULL(physiology) QDEL_LIST(bioware) GLOB.suit_sensors_list -= src + GLOB.human_list -= src return ..() @@ -162,33 +164,31 @@ ///////HUDs/////// if(href_list["hud"]) - if(!ishuman(usr)) + if(!ishuman(usr) && !isobserver(usr)) return + var/mob/human_or_ghost_user = usr var/mob/living/carbon/human/human_user = usr var/perpname = get_face_name(get_id_name("")) - if(!HAS_TRAIT(human_user, TRAIT_SECURITY_HUD) && !HAS_TRAIT(human_user, TRAIT_MEDICAL_HUD)) + if(!HAS_TRAIT(human_or_ghost_user, TRAIT_SECURITY_HUD) && !HAS_TRAIT(human_or_ghost_user, TRAIT_MEDICAL_HUD)) return if((text2num(href_list["examine_time"]) + 1 MINUTES) < world.time) - to_chat(human_user, "It's too late to use this now!") + to_chat(human_or_ghost_user, "It's too late to use this now!") return - var/datum/data/record/target_record = find_record("name", perpname, GLOB.data_core.general) + var/datum/record/crew/target_record = find_record(perpname, GLOB.manifest.general) if(href_list["photo_front"] || href_list["photo_side"]) if(!target_record) return - if(!human_user.canUseHUD()) - return - if(!HAS_TRAIT(human_user, TRAIT_SECURITY_HUD) && !HAS_TRAIT(human_user, TRAIT_MEDICAL_HUD)) + if(ishuman(human_or_ghost_user)) + if(!human_user.canUseHUD()) + return + if(!HAS_TRAIT(human_or_ghost_user, TRAIT_SECURITY_HUD) && !HAS_TRAIT(human_or_ghost_user, TRAIT_MEDICAL_HUD)) return var/obj/item/photo/photo_from_record = null - if(href_list["photo_front"]) - photo_from_record = target_record.fields["photo_front"] - else if(href_list["photo_side"]) - photo_from_record = target_record.fields["photo_side"] if(photo_from_record) - photo_from_record.show(human_user) + photo_from_record.show(human_or_ghost_user) return - if(href_list["hud"] == "m") + if(ishuman(human_user) && href_list["hud"] == "m") if(!HAS_TRAIT(human_user, TRAIT_MEDICAL_HUD)) return if(href_list["evaluation"]) @@ -231,182 +231,125 @@ to_chat(human_user, "Patient has signs of suffocation, emergency treatment may be required!") if(getToxLoss() > 20) to_chat(human_user, "Gathered data is inconsistent with the analysis, possible cause: poisoning.") - if(!human_user.wear_id) //You require access from here on out. - to_chat(human_user, "ERROR: Invalid access") - return - var/list/access = human_user.wear_id.GetAccess() - if(!(ACCESS_MEDICAL in access)) - to_chat(human_user, "ERROR: Invalid access") - return - if(href_list["p_stat"]) - var/health_status = input(human_user, "Specify a new physical status for this person.", "Medical HUD", target_record.fields["p_stat"]) in list("Active", "Physically Unfit", "*Unconscious*", "*Deceased*", "Cancel") - if(!target_record) + if(href_list["physical_status"]) + var/physical_status = tgui_input_list(human_user, "Specify a new physical status for this person.", "Medical HUD", PHYSICAL_STATUSES(), target_record.physical_status) + if(!physical_status || !target_record || !human_user.canUseHUD() || !HAS_TRAIT(human_user, TRAIT_MEDICAL_HUD)) return - if(!human_user.canUseHUD()) - return - if(!HAS_TRAIT(human_user, TRAIT_MEDICAL_HUD)) - return - if(health_status && health_status != "Cancel") - target_record.fields["p_stat"] = health_status + + target_record.physical_status = physical_status return - if(href_list["m_stat"]) - var/health_status = input(human_user, "Specify a new mental status for this person.", "Medical HUD", target_record.fields["m_stat"]) in list("Stable", "*Watch*", "*Unstable*", "*Insane*", "Cancel") - if(!target_record) - return - if(!human_user.canUseHUD()) - return - if(!HAS_TRAIT(human_user, TRAIT_MEDICAL_HUD)) + + if(href_list["mental_status"]) + var/mental_status = tgui_input_list(human_user, "Specify a new mental status for this person.", "Medical HUD", MENTAL_STATUSES(), target_record.mental_status) + if(!mental_status || !target_record || !human_user.canUseHUD() || !HAS_TRAIT(human_user, TRAIT_MEDICAL_HUD)) return - if(health_status && health_status != "Cancel") - target_record.fields["m_stat"] = health_status + + target_record.mental_status = mental_status return return //Medical HUD ends here. if(href_list["hud"] == "s") - if(!HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) - return - if(human_user.stat || human_user == src) //|| !human_user.canmove || human_user.restrained()) Fluff: Sechuds have eye-tracking technology and sets 'arrest' to people that the wearer looks and blinks at. - return //Non-fluff: This allows sec to set people to arrest as they get disarmed or beaten - // Checks the user has security clearence before allowing them to change arrest status via hud, comment out to enable all access var/allowed_access = null - var/obj/item/clothing/glasses/hud/security/user_glasses = human_user.glasses - if(istype(user_glasses) && (user_glasses.obj_flags & EMAGGED)) - allowed_access = "@%&ERROR_%$*" - else //Implant and standard glasses check access - if(human_user.wear_id) - var/list/access = human_user.wear_id.GetAccess() - if(ACCESS_SEC_RECORDS in access) - allowed_access = human_user.get_authentification_name() - - if(!allowed_access) - to_chat(human_user, "ERROR: Invalid access.") + if(!HAS_TRAIT(human_or_ghost_user, TRAIT_SECURITY_HUD)) return - + if(ishuman(human_or_ghost_user)) + if(human_user.stat || human_user == src) //|| !human_user.canmove || human_user.restrained()) Fluff: Sechuds have eye-tracking technology and sets 'arrest' to people that the wearer looks and blinks at. + return //Non-fluff: This allows sec to set people to arrest as they get disarmed or beaten + // Checks the user has security clearence before allowing them to change arrest status via hud, comment out to enable all access + var/obj/item/clothing/glasses/hud/security/user_glasses = human_user.glasses + if(istype(user_glasses) && (user_glasses.obj_flags & EMAGGED)) + allowed_access = "@%&ERROR_%$*" + else //Implant and standard glasses check access + if(human_user.wear_id) + var/list/access = human_user.wear_id.GetAccess() + if(ACCESS_SEC_RECORDS in access) + allowed_access = human_user.get_authentification_name() + + if(!allowed_access) + to_chat(human_user, "ERROR: Invalid access.") + return if(!perpname) to_chat(human_user, "ERROR: Can not identify target.") return - target_record = find_record("name", perpname, GLOB.data_core.security) + target_record = find_record(perpname, GLOB.manifest.general) if(!target_record) to_chat(human_user, "ERROR: Unable to locate data core entry for target.") return - if(href_list["status"]) - var/setcriminal = input(human_user, "Specify a new criminal status for this person.", "Security HUD", target_record.fields["criminal"]) in list("None", "Arrest", "Search", "Monitor", "Incarcerated", "Paroled", "Discharged", "Cancel") - if(setcriminal != "Cancel") - if(!target_record) - return - if(!human_user.canUseHUD()) - return - if(!HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) - return - investigate_log("[key_name(src)] has been set from [target_record.fields["criminal"]] to [setcriminal] by [key_name(human_user)]'s security records (via SecHUDs).", INVESTIGATE_RECORDS) - target_record.fields["criminal"] = setcriminal - sec_hud_set_security_status() + if(ishuman(human_or_ghost_user) && href_list["status"]) + var/new_status = tgui_input_list(human_user, "Specify a new criminal status for this person.", "Security HUD", WANTED_STATUSES(), target_record.wanted_status) + if(!new_status || !target_record || !human_user.canUseHUD() || !HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) + return + + if(new_status == WANTED_ARREST) + var/datum/crime_record/new_crime = new(author = human_user, details = "Set by SecHUD.") + target_record.crimes += new_crime + investigate_log("SecHUD auto-crime | Added to [target_record.name] by [key_name(human_user)]", INVESTIGATE_RECORDS) + + investigate_log("has been set from [target_record.wanted_status] to [new_status] via HUD by [key_name(human_user)].", INVESTIGATE_RECORDS) + target_record.wanted_status = new_status + update_matching_security_huds(target_record.name) return if(href_list["view"]) - if(!human_user.canUseHUD()) - return + if(ishuman(human_or_ghost_user)) + if(!human_user.canUseHUD()) + return if(!HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) return - to_chat(human_user, "Name: [target_record.fields["name"]] Criminal Status: [target_record.fields["criminal"]]") - for(var/datum/data/crime/c in target_record.fields["crim"]) - to_chat(human_user, "Crime: [c.crimeName]") - if (c.crimeDetails) - to_chat(human_user, "Details: [c.crimeDetails]") - else - to_chat(human_user, "Details: \[Add details]") - to_chat(human_user, "Added by [c.author] at [c.time]") - to_chat(human_user, "----------") - to_chat(human_user, "Notes: [target_record.fields["notes"]]") + var/sec_record_message = "" + sec_record_message += "Name: [target_record.name]" + sec_record_message += "\nCriminal Status: [target_record.wanted_status]" + sec_record_message += "\nCitations: [length(target_record.citations)]" + sec_record_message += "\nNote: [target_record.security_note || "None"]" + sec_record_message += "\nRapsheet: [length(target_record.crimes)] incidents" + if(length(target_record.crimes)) + for(var/datum/crime_record/crime in target_record.crimes) + if(!crime.valid) + sec_record_message += "\n-- REDACTED --" + continue + + sec_record_message += "\nCrime: [crime.name]" + sec_record_message += "\nDetails: [crime.details]" + sec_record_message += "\nAdded by [crime.author] at [crime.time]" + to_chat(human_user, "\n----------") + to_chat(human_user, sec_record_message) return + if(ishuman(human_or_ghost_user)) + if(href_list["add_citation"]) + var/max_fine = CONFIG_GET(number/maxfine) + var/citation_name = tgui_input_text(human_user, "Citation crime", "Security HUD", max_length = MAX_MESSAGE_LEN) + var/fine = tgui_input_number(human_user, "Citation fine", "Security HUD", 50, max_fine, 5) + if(!fine || !target_record || !citation_name || !allowed_access || !isnum(fine) || fine > max_fine || fine <= 0 || !human_user.canUseHUD() || !HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) + return - if(href_list["add_citation"]) - var/maxFine = CONFIG_GET(number/maxfine) - var/t1 = stripped_input("Please input citation crime:", "Security HUD", "", null) - var/fine = FLOOR(input("Please input citation fine, up to [maxFine]:", "Security HUD", 50) as num|null, 1) - if(!target_record || !t1 || !fine || !allowed_access) - return - if(!human_user.canUseHUD()) - return - if(!HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) - return - if(fine < 0) - to_chat(human_user, "You're pretty sure that's not how money works.") - return - fine = min(fine, maxFine) - - var/datum/data/crime/crime = GLOB.data_core.createCrimeEntry(t1, "", allowed_access, station_time_timestamp(), fine) - for (var/obj/item/modular_computer/tablet in GLOB.TabletMessengers) - if(tablet.saved_identification == target_record.fields["name"]) - var/message = "You have been fined [fine] credits for '[t1]'. Fines may be paid at security." - var/datum/signal/subspace/messaging/tablet_msg/signal = new(src, list( - "name" = "Security Citation", - "job" = "Citation Server", - "message" = message, - "targets" = list(tablet), - "automated" = TRUE - )) - signal.send_to_receivers() - human_user.log_message("(PDA: Citation Server) sent \"[message]\" to [signal.format_target()]", LOG_PDA) - GLOB.data_core.addCitation(target_record.fields["id"], crime) - investigate_log("[key_name(human_user)] has added a citation '[t1]' ([fine] credits) to [target_record.fields["name"]]'s security records (via SecHUDs).", INVESTIGATE_RECORDS) - return + var/datum/crime_record/citation/new_citation = new(name = citation_name, author = allowed_access, fine = fine) - if(href_list["add_crime"]) - var/t1 = stripped_input("Please input crime name:", "Security HUD", "", null) - if(!target_record || !t1 || !allowed_access) - return - if(!human_user.canUseHUD()) - return - if(!HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) + target_record.citations += new_citation + new_citation.alert_owner(usr, src, target_record.name, "You have been fined [fine] credits for '[citation_name]'. Fines may be paid at security.") + investigate_log("New Citation: [citation_name] Fine: [fine] | Added to [target_record.name] by [key_name(human_user)]", INVESTIGATE_RECORDS) return - var/crime = GLOB.data_core.createCrimeEntry(t1, null, allowed_access, station_time_timestamp()) - GLOB.data_core.addCrime(target_record.fields["id"], crime) - investigate_log("[key_name(human_user)] has added a crime '[t1]' to [target_record.fields["name"]]'s security records (via SecHUDs).", INVESTIGATE_RECORDS) - to_chat(human_user, "Successfully added a crime.") - return - if(href_list["add_details"]) - var/t1 = stripped_input(human_user, "Please input crime details:", "Secure. records", "", null) - if(!target_record || !t1 || !allowed_access) - return - if(!human_user.canUseHUD()) - return - if(!HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) - return - if(href_list["cdataid"]) - GLOB.data_core.addCrimeDetails(target_record.fields["id"], href_list["cdataid"], t1) - investigate_log("[key_name(human_user)] has set crime details '[t1]' to [target_record.fields["name"]]'s security records (via SecHUDs).", INVESTIGATE_RECORDS) - to_chat(human_user, "Successfully added details.") - return + if(href_list["add_crime"]) + var/crime_name = tgui_input_text(human_user, "Crime name", "Security HUD", max_length = MAX_MESSAGE_LEN) + if(!target_record || !crime_name || !allowed_access || !human_user.canUseHUD() || !HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) + return - if(href_list["view_comment"]) - if(!human_user.canUseHUD()) - return - if(!HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) - return - to_chat(human_user, "Comments/Log:") - var/counter = 1 - while(target_record.fields["com_[counter]"]) - to_chat(human_user, target_record.fields["com_[counter]"]) - to_chat(human_user, "----------") - counter++ - return + var/datum/crime_record/new_crime = new(name = crime_name, author = allowed_access) + + target_record.crimes += new_crime + investigate_log("New Crime: [crime_name] | Added to [target_record.name] by [key_name(human_user)]", INVESTIGATE_RECORDS) + to_chat(human_user, "Successfully added a crime.") - if(href_list["add_comment"]) - var/t1 = stripped_multiline_input("Add Comment:", "Secure. records", null, null) - if (!target_record || !t1 || !allowed_access) - return - if(!human_user.canUseHUD()) return - if(!HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) + + if(href_list["add_note"]) + var/new_note = tgui_input_text(human_user, "Security note", "Security Records", max_length = MAX_MESSAGE_LEN, multiline = TRUE) + if(!target_record || !new_note || !allowed_access || !human_user.canUseHUD() || !HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) + return + + target_record.security_note = new_note + return - var/counter = 1 - while(target_record.fields["com_[counter]"]) - counter++ - target_record.fields["com_[counter]"] = "Made by [allowed_access] on [station_time_timestamp()] [time2text(world.realtime, "MMM DD")], [GLOB.year_integer+YEAR_OFFSET]
[t1]" - to_chat(human_user, "Successfully added comment.") - return ..() //end of this massive fucking chain. TODO: make the hud chain not spooky. @@ -500,18 +443,16 @@ //Check for arrest warrant if(judgment_criteria & JUDGE_RECORDCHECK) var/perpname = get_face_name(get_id_name()) - var/datum/data/record/R = find_record("name", perpname, GLOB.data_core.security) - if(R && R.fields["criminal"]) - switch(R.fields["criminal"]) - if("Arrest") + var/datum/record/crew/target = find_record(perpname, GLOB.manifest.general) + if(target) + switch(target.wanted_status) + if(WANTED_ARREST) threatcount += 5 - if("Incarcerated") + if(WANTED_PRISONER) threatcount += 2 - if("Paroled") + if(WANTED_PAROLE) threatcount += 2 - if("Monitor") - threatcount += 1 - if("Search") + if(WANTED_SUSPECT) threatcount += 2 //Check for dresscode violations @@ -764,11 +705,14 @@ to_chat(src, "You successfully [cuff_break ? "break" : "remove"] [I].") return TRUE -/mob/living/carbon/human/replace_records_name(oldname,newname) // Only humans have records right now, move this up if changed. - for(var/list/L in list(GLOB.data_core.general,GLOB.data_core.medical,GLOB.data_core.security,GLOB.data_core.locked)) - var/datum/data/record/R = find_record("name", oldname, L) - if(R) - R.fields["name"] = newname +/mob/living/carbon/human/replace_records_name(oldname, newname) // Only humans have records right now, move this up if changed. + var/datum/record/crew/crew_record = find_record(oldname, GLOB.manifest.general) + var/datum/record/locked/locked_record = find_record(oldname, GLOB.manifest.locked) + + if(crew_record) + crew_record.name = newname + if(locked_record) + locked_record.name = newname /mob/living/carbon/human/get_total_tint() . = ..() @@ -1356,9 +1300,6 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/carbon/human/species) /mob/living/carbon/human/species/skeleton race = /datum/species/skeleton -/mob/living/carbon/human/species/supersoldier - race = /datum/species/human/supersoldier - /mob/living/carbon/human/species/vampire race = /datum/species/vampire diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index f324895862b01..4f0fdbe51b51e 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -636,8 +636,6 @@ to_chat(src, "You succesfuly remove the durathread strand.") remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) return - visible_message("[src] examines [p_them()]self.", \ - "You check yourself for injuries.") check_self_for_injuries() @@ -770,8 +768,7 @@ var/broken_plural var/damaged_plural //Sets organs into their proper list - for(var/O in internal_organs) - var/obj/item/organ/organ = O + for(var/obj/item/organ/organ as anything in internal_organs) if(organ.organ_flags & ORGAN_FAILING) if(broken.len) broken += ", " @@ -806,7 +803,7 @@ to_chat(src, "Your [damaged_message] [damaged_plural ? "are" : "is"] hurt.") if(length(mind?.quirks)) - to_chat(src, "You have these quirks: [mind.get_quirk_string()].") + to_chat(src, "You have these quirks: [get_quirk_string()].") /mob/living/carbon/human/damage_clothes(damage_amount, damage_type = BRUTE, damage_flag = 0, def_zone) if(damage_type != BRUTE && damage_type != BURN) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index f268c0dae5a83..10c54c71430a2 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -7,6 +7,8 @@ //Useful when player do something with computers /mob/living/carbon/human/proc/get_assignment(if_no_id = "No id", if_no_job = "No job", hand_first = TRUE) var/obj/item/card/id/id = get_idcard(hand_first) + if(HAS_TRAIT(src, TRAIT_UNKNOWN)) + return if_no_id if(id) . = id.assignment else @@ -22,6 +24,8 @@ //Useful when player do something with computers /mob/living/carbon/human/proc/get_authentification_name(if_no_id = "Unknown") var/obj/item/card/id/id = get_idcard(FALSE) + if(HAS_TRAIT(src, TRAIT_UNKNOWN)) + return if_no_id if(id) return id.registered_name var/obj/item/modular_computer/pda = wear_id @@ -31,10 +35,17 @@ //repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a separate proc as it'll be useful elsewhere /mob/living/carbon/human/get_visible_name() - var/face_name = get_face_name("") - var/id_name = get_id_name("") - if(name_override) - return name_override + if(HAS_TRAIT(src, TRAIT_UNKNOWN)) + return "Unknown" + var/list/identity = list(null, null, null) + SEND_SIGNAL(src, COMSIG_HUMAN_GET_VISIBLE_NAME, identity) + var/signal_face = LAZYACCESS(identity, VISIBLE_NAME_FACE) + var/signal_id = LAZYACCESS(identity, VISIBLE_NAME_ID) + var/force_set = LAZYACCESS(identity, VISIBLE_NAME_FORCED) + if(force_set) // our name is overriden by something + return signal_face // no need to null-check, because force_set will always set a signal_face + var/face_name = !isnull(signal_face) ? signal_face : get_face_name("") + var/id_name = !isnull(signal_id) ? signal_id : get_id_name("") if(face_name) if(id_name && (id_name != face_name)) return "[face_name] (as [id_name])" @@ -45,6 +56,8 @@ //Returns "Unknown" if facially disfigured and real_name if not. Useful for setting name when Fluacided or when updating a human's name variable /mob/living/carbon/human/proc/get_face_name(if_no_face="Unknown") + if(HAS_TRAIT(src, TRAIT_UNKNOWN)) + return if_no_face //We're Unknown, no face information for you if( wear_mask && (wear_mask.flags_inv&HIDEFACE) ) //Wearing a mask which hides our face, use id-name if possible return if_no_face if( head && (head.flags_inv&HIDEFACE) ) @@ -60,6 +73,13 @@ var/obj/item/storage/wallet/wallet = wear_id var/obj/item/modular_computer/tablet/tablet = wear_id var/obj/item/card/id/id = wear_id + var/list/identity = list(null, null, null) + SEND_SIGNAL(src, COMSIG_HUMAN_GET_FORCED_NAME, identity) + if(HAS_TRAIT(src, TRAIT_UNKNOWN)) + . = if_no_id //You get NOTHING, no id name, good day sir + if(identity[VISIBLE_NAME_FORCED]) + . = identity[VISIBLE_NAME_FACE] // to return forced names when unknown, instead of ID + return if(istype(wallet)) id = wallet.front_id if(istype(id)) @@ -241,6 +261,15 @@ return FALSE +/mob/living/carbon/human/proc/get_job_id() //Used in secHUD icon generation (the new one) + var/obj/item/card/id/I = wear_id.GetID() + if(!I) + return + var/I_hud = I.hud_state + if(I_hud) + return I_hud + return "unknown" + /mob/living/carbon/human/can_see_reagents() . = ..() if(.) //No need to run through all of this if it's already true. diff --git a/code/modules/mob/living/carbon/human/init_signals.dm b/code/modules/mob/living/carbon/human/init_signals.dm new file mode 100644 index 0000000000000..4c6824712ebad --- /dev/null +++ b/code/modules/mob/living/carbon/human/init_signals.dm @@ -0,0 +1,11 @@ +/mob/living/carbon/human/register_init_signals() + . = ..() + + RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_UNKNOWN), SIGNAL_REMOVETRAIT(TRAIT_UNKNOWN)), PROC_REF(on_unknown_trait)) + +/// Gaining or losing [TRAIT_UNKNOWN] updates our name and our sechud +/mob/living/carbon/human/proc/on_unknown_trait(datum/source) + SIGNAL_HANDLER + + name = get_visible_name() + sec_hud_set_ID() diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 1aad46e02ee31..8bf860ee5c775 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -18,6 +18,8 @@ . = ..() /mob/living/carbon/human/GetVoice() + if(HAS_TRAIT(src, TRAIT_UNKNOWN)) + return ("Unknown") var/current_name = real_name if(GetSpecialVoice()) current_name = GetSpecialVoice() diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index a937df100d483..920df474a4349 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -159,6 +159,9 @@ GLOBAL_LIST_EMPTY(features_by_species) /// Do we try to prevent reset_perspective() from working? Useful for Dullahans to stop perspective changes when they're looking through their head. var/prevent_perspective_change = FALSE + //Should we preload this species's organs? + var/preload = TRUE + /////////// // PROCS // /////////// @@ -272,9 +275,10 @@ GLOBAL_LIST_EMPTY(features_by_species) * C - carbon, the owner of the species datum AKA whoever we're regenerating organs in * old_species - datum, used when regenerate organs is called in a switching species to remove old mutant organs. * replace_current - boolean, forces all old organs to get deleted whether or not they pass the species' ability to keep that organ - * excluded_zones - list, add zone defines to block organs inside of the zones from getting handled. see headless mutation for an example - */ -/datum/species/proc/regenerate_organs(mob/living/carbon/C,datum/species/old_species,replace_current=TRUE,list/excluded_zones) + * * excluded_zones - list, add zone defines to block organs inside of the zones from getting handled. see headless mutation for an example + * * visual_only - boolean, only load organs that change how the species looks. Do not use for normal gameplay stuff + */ +/datum/species/proc/regenerate_organs(mob/living/carbon/C, datum/species/old_species, replace_current = TRUE, list/excluded_zones, visual_only = FALSE) //what should be put in if there is no mutantorgan (brains handled seperately) var/list/slot_mutantorgans = list( ORGAN_SLOT_BRAIN = mutantbrain, @@ -310,8 +314,12 @@ GLOBAL_LIST_EMPTY(features_by_species) var/obj/item/organ/oldorgan = C.getorganslot(slot) //used in removing var/obj/item/organ/neworgan = slot_mutantorgans[slot] //used in adding + + if(visual_only && !initial(neworgan.visual)) + continue + var/used_neworgan = FALSE - neworgan = new neworgan() + neworgan = SSwardrobe.provide_type(neworgan) var/should_have = neworgan.get_availability(src) //organ proc that points back to a species trait (so if the species is supposed to have this organ) if(oldorgan && (!should_have || replace_current) && !(oldorgan.zone in excluded_zones) && !(oldorgan.organ_flags & (ORGAN_UNREMOVABLE))) @@ -351,7 +359,7 @@ GLOBAL_LIST_EMPTY(features_by_species) for(var/organ_path in mutant_organs) var/obj/item/organ/current_organ = C.getorgan(organ_path) if(!current_organ || replace_current) - var/obj/item/organ/replacement = new organ_path() + var/obj/item/organ/replacement = SSwardrobe.provide_type(organ_path) // If there's an existing mutant organ, we're technically replacing it. // Let's abuse the snowflake proc. Basically retains // feature parity with every other organ too. @@ -421,7 +429,7 @@ GLOBAL_LIST_EMPTY(features_by_species) C.mob_biotypes = inherent_biotypes - regenerate_organs(C,old_species) + regenerate_organs(C, old_species, visual_only = C.visual_only_organs) if(exotic_bloodtype && C.dna.blood_type != exotic_bloodtype) C.dna.blood_type = exotic_bloodtype @@ -2955,3 +2963,23 @@ GLOBAL_LIST_EMPTY(features_by_species) //Use this to return dynamic heights, such as making felinids shorter on halloween or something /datum/species/proc/get_species_height() return species_height + +/datum/species/proc/get_types_to_preload() + var/list/to_store = list() + to_store += mutant_organs + //for(var/obj/item/organ/external/horny as anything in external_organs) + // to_store += horny //Haha get it? + + //Don't preload brains, cause reuse becomes a horrible headache + to_store += mutantheart + to_store += mutantlungs + to_store += mutanteyes + to_store += mutantears + to_store += mutanttongue + to_store += mutantliver + to_store += mutantstomach + to_store += mutantappendix + //Store wings for now... + to_store += mutantwings + //We don't cache mutant hands because it's not constrained enough, too high a potential for failure + return to_store diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index b092d7ba1f149..17a6a73e58717 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -150,6 +150,7 @@ desc = "An alien organ that twists and writhes when exposed to light." icon = 'icons/obj/surgery.dmi' icon_state = "demon_heart-on" + visual = TRUE color = "#1C1C1C" var/respawn_progress = 0 var/obj/item/light_eater/blade diff --git a/code/modules/mob/living/carbon/human/species_types/supersoldier.dm b/code/modules/mob/living/carbon/human/species_types/supersoldier.dm deleted file mode 100644 index c4c5f36d1cdb4..0000000000000 --- a/code/modules/mob/living/carbon/human/species_types/supersoldier.dm +++ /dev/null @@ -1,20 +0,0 @@ -/datum/species/human/supersoldier - name = "Super Soldier" //inherited from the real species, for health scanners and things - id = SPECIES_SUPERSOLDIER - examine_limb_id = SPECIES_HUMAN - species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,NOTRANSSTING) //all of these + whatever we inherit from the real species - inherent_traits = list(TRAIT_NOLIMBDISABLE,TRAIT_NOHUNGER,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_IGNORESLOWDOWN,TRAIT_IGNOREDAMAGESLOWDOWN,TRAIT_STUNIMMUNE,TRAIT_CONFUSEIMMUNE,TRAIT_SLEEPIMMUNE,TRAIT_PUSHIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOSLIPALL,TRAIT_THERMAL_VISION,TRAIT_STRONG_GRABBER,TRAIT_LAW_ENFORCEMENT_METABOLISM,TRAIT_ALWAYS_CLEAN,TRAIT_FEARLESS) - mutanteyes = /obj/item/organ/eyes/night_vision - changesource_flags = MIRROR_BADMIN | ERT_SPAWN - -/datum/species/human/supersoldier/spec_life(mob/living/carbon/human/H) - if(H.stat == DEAD) - return - var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing - if(isturf(H.loc)) //else, there's considered to be no light - var/turf/T = H.loc - light_amount = min(1,T.get_lumcount()) - 0.5 - if(light_amount > 0) //if there's any light, heal - H.heal_overall_damage(1,1, 0, BODYTYPE_ORGANIC) - H.adjustToxLoss(-1) - H.adjustOxyLoss(-1) diff --git a/code/modules/mob/living/inhand_holder.dm b/code/modules/mob/living/inhand_holder.dm index 5e499032c7da6..029d2e41346e6 100644 --- a/code/modules/mob/living/inhand_holder.dm +++ b/code/modules/mob/living/inhand_holder.dm @@ -99,7 +99,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/clothing/head/mob_holder) CREATION_TEST_IGNORE_SUBTYPES(/obj/item/clothing/head/mob_holder/rabbit) /obj/item/clothing/head/mob_holder/rabbit/Initialize(mapload, mob/living/M, worn_state, head_icon, lh_icon, rh_icon, worn_slot_flags = NONE) - var/mob/living/simple_animal/chicken/rabbit/normal/rabbit = new(src) + var/mob/living/simple_animal/chicken/rabbit/easter/rabbit = new(src) return ..(mapload, rabbit, rabbit.held_state, rabbit.head_icon, rabbit.held_lh, rabbit.held_rh, rabbit.worn_slot_flags) /obj/item/clothing/head/mob_holder/drone/deposit(mob/living/L) diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index a3d1f2fda902c..a38d479c67ed0 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -7,11 +7,6 @@ sync_mind() mind.show_memory(src, 0) - //Round specific stuff - if(SSticker.mode) - switch(SSticker.mode.name) - if("sandbox") - CanBuild() update_damage_hud() update_health_hud() diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 9c8352a214138..d5ac9e90095f7 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -634,8 +634,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/silicon/ai) if("Crew Member") var/list/personnel_list = list() - for(var/datum/data/record/record_datum in GLOB.data_core.locked)//Look in data core locked. - personnel_list["[record_datum.fields["name"]]: [record_datum.fields["rank"]]"] = record_datum.fields["character_appearance"]//Pull names, rank, and image. + for(var/datum/record/crew/record in GLOB.manifest.locked)//Look in data core locked. + personnel_list["[record.name]: [record.rank]"] = record.character_appearance//Pull names, rank, and image. if(!length(personnel_list)) alert("No suitable records found. Aborting.") @@ -819,12 +819,19 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/silicon/ai) var/hrefpart = "" var/jobpart = "Unknown" - if (ishuman(speaker)) - var/mob/living/carbon/human/S = speaker - if(S.wear_id) - var/obj/item/card/id/I = S.wear_id.GetID() - if(I) - jobpart = "[I.assignment]" + if(!HAS_TRAIT(speaker, TRAIT_UNKNOWN)) //don't fetch the speaker's job in case they have something that conseals their identity completely + if(iscarbon(speaker)) + var/mob/living/carbon/human/living_speaker = speaker + if(living_speaker.wear_id) + var/obj/item/card/id/has_id = living_speaker.wear_id.GetID() + if(has_id) + jobpart = "[has_id.assignment]" + if(istype(speaker, /obj/effect/overlay/holo_pad_hologram)) + var/obj/effect/overlay/holo_pad_hologram/holo = speaker + if(holo.Impersonation?.job) + jobpart = "[holo.Impersonation.job]" + else if(usr?.job) // not great, but AI holograms have no other usable ref + jobpart = "[usr.job]" // duplication part from `game/say.dm` to make a language icon var/language_icon = "" diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 7e4e3979bd3db..5c498dd31ad53 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -163,9 +163,9 @@ return FALSE refresh_spam = TRUE if(params["list"] == "medical") - medical_records = GLOB.data_core.get_general_records() + medical_records = GLOB.manifest.get_general_records() if(params["list"] == "security") - security_records = GLOB.data_core.get_security_records() + security_records = GLOB.manifest.get_security_records() ui.send_full_update(bypass_cooldown = TRUE) addtimer(CALLBACK(src, PROC_REF(refresh_again)), 3 SECONDS) if("remote_signaler") diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 4da9f1bce6878..be4a10a2fad77 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -89,6 +89,7 @@ GLOBAL_VAR(medibot_unique_id_gen) radio_channel = RADIO_CHANNEL_SYNDICATE heal_threshold = 30 reagent_glass = new /obj/item/reagent_containers/cup/beaker/large/nanites + faction = list(FACTION_SYNDICATE, "neutral", "silicon") /mob/living/simple_animal/bot/medbot/filled skin = MEDBOT_SKIN_ADVANCED diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index c3ae98f78d06e..bc713706c04f2 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -220,28 +220,6 @@ l_pocket = /obj/item/paper/fluff/bee_objectives mask = /obj/item/clothing/mask/rat/bee -/obj/effect/mob_spawn/human/corpse/sniper - name = "Sniper" - outfit = /datum/outfit/sniper - skin_tone = "caucasian1" - hair_style = "Bald" - facial_hair_style = "Full beard" - id_job = JOB_NAME_WARDEN - mob_gender = MALE - -/datum/outfit/sniper - name = "Sniper" - uniform = /obj/item/clothing/under/syndicate/camo - suit = /obj/item/clothing/suit/armor/bulletproof - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat - belt = /obj/item/storage/belt/military/assault - mask = /obj/item/clothing/mask/cigarette/cigar - head = /obj/item/clothing/head/beret/corpwarden - glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch - back = /obj/item/storage/backpack/satchel/sec - id = /obj/item/card/id/job/warden - /obj/effect/mob_spawn/human/corpse/psychost name = "Psycho" hair_style = "Bald" @@ -272,6 +250,33 @@ suit = /obj/item/clothing/suit/jacket/straight_jacket head = /obj/item/reverse_bear_trap +/obj/effect/mob_spawn/human/corpse/zombie + name = "zombie" + mob_species = /datum/species/zombie + brute_damage = 100 + +/obj/effect/mob_spawn/human/corpse/sniper + name = "Sniper" + outfit = /datum/outfit/sniper + skin_tone = "caucasian1" + hair_style = "Bald" + facial_hair_style = "Full beard" + id_job = JOB_NAME_WARDEN + mob_gender = MALE + +/datum/outfit/sniper + name = "Sniper" + uniform = /obj/item/clothing/under/syndicate/camo + suit = /obj/item/clothing/suit/armor/bulletproof + shoes = /obj/item/clothing/shoes/combat + gloves = /obj/item/clothing/gloves/combat + belt = /obj/item/storage/belt/military/assault + mask = /obj/item/clothing/mask/cigarette/cigar + head = /obj/item/clothing/head/beret/corpwarden + glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch + back = /obj/item/storage/backpack/satchel/sec + id = /obj/item/card/id/job/warden + /obj/effect/mob_spawn/human/corpse/heavy name = "Heavy gunner" brute_damage = 300 @@ -288,42 +293,5 @@ gloves = /obj/item/clothing/gloves/combat mask = /obj/item/clothing/mask/gas/sechailer/swat/emagged suit = /obj/item/clothing/suit/armor/heavy - back = /obj/item/minigunpack + //back = /obj/item/minigunpack - you REALLY wish you could snag a minigun backpack off them don't you? head = /obj/item/clothing/head/helmet/swat - -/obj/effect/mob_spawn/human/corpse/zombie - name = "zombie" - mob_species = /datum/species/zombie - brute_damage = 100 - -/obj/effect/mob_spawn/human/corpse/suicidezombie - mob_species = /datum/species/zombie - brute_damage = 100 - outfit = /datum/outfit/suicidezombie - -/datum/outfit/suicidezombie - name = "Guy with a grenade" - mask = /obj/item/clothing/mask/gas/cyborg - uniform = /obj/item/clothing/under/pants/camo - belt = /obj/item/storage/belt/bandolier - shoes = /obj/item/clothing/shoes/combat - -/obj/effect/mob_spawn/human/corpse/facboss - name = "Factory boss" - mob_species = /datum/species/ipc - brute_damage = 800 - burn_damage = 100 - hair_style = "Crewcut" - facial_hair_style = "Shaved" - skin_tone = "caucasian1" - mob_gender = MALE - outfit = /datum/outfit/facboss - -/datum/outfit/facboss - name = "The head of The Factory" - glasses = /obj/item/clothing/glasses/hud/terminator - uniform = /obj/item/clothing/under/syndicate - suit = /obj/item/clothing/suit/jacket/leather - shoes = /obj/item/clothing/shoes/combat/swat - gloves = /obj/item/clothing/gloves/fingerless - id = /obj/item/card/id/gold diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 3be955412f16c..dbd3850d2c8f1 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -368,3 +368,19 @@ validColors = list("plain") gold_core_spawnable = FRIENDLY_SPAWN chat_color = "#FFDC9B" + +/mob/living/simple_animal/chicken/rabbit + name = "\improper rabbit" + desc = "It's a rabbit, everyone knows what a rabbit is." + icon = 'icons/mob/easter.dmi' + icon_state = "b_rabbit_white" + icon_living = "b_rabbit_white" + icon_dead = "b_rabbit_white_dead" + speak = null + speak_emote = list("sniffles","twitches") + emote_hear = list("hops.") + emote_see = list("hops around","bounces up and down") + icon_prefix = "b_rabbit" + feedMessages = list("It nibbles happily.","It noms happily.") + butcher_results = list(/obj/item/food/meat/slab = 1) + food_type = /obj/item/food/grown/carrot diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index d76476a02d804..e1c2063a3d0c1 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -4,7 +4,7 @@ #define BEE_PROB_GOHOME 35 //Probability to go home when idle is below BEE_IDLE_GOHOME #define BEE_PROB_GOROAM 5 //Probability to go roaming when idle is above BEE_IDLE_ROAMING #define BEE_TRAY_RECENT_VISIT 200 //How long in deciseconds until a tray can be visited by a bee again -#define BEE_DEFAULT_COLOUR "#e5e500" //the colour we make the stripes of the bee if our reagent has no colour (or we have no reagent) +#define BEE_DEFAULT_COLOUR "#bc721a" //the colour we make the stripes of the bee if our reagent has no colour (or we have no reagent) #define BEE_POLLINATE_YIELD_CHANCE 33 #define BEE_POLLINATE_PEST_CHANCE 33 @@ -114,11 +114,11 @@ var/static/mutable_appearance/greyscale_overlay greyscale_overlay = greyscale_overlay || mutable_appearance('icons/mob/bees.dmi') - greyscale_overlay.icon_state = "[icon_base]_grey" + greyscale_overlay.icon_state = "bee_grey" greyscale_overlay.color = col add_overlay(greyscale_overlay) - add_overlay("[icon_base]_wings") + add_overlay("bee_wings") //We don't attack beekeepers/people dressed as bees//Todo: bee costume diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 028284cc89c73..57608c8c906fd 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -243,10 +243,10 @@ /mob/living/simple_animal/hostile/carp/advanced name = "advanced space carp" desc = "A ferocious, fang-bearing creature that resembles a fish." - maxHealth = 40 - health = 40 + maxHealth = 80 + health = 80 gold_core_spawnable = NO_SPAWN - obj_damage = 15 + obj_damage = 25 /mob/living/simple_animal/hostile/carp/advanced/examine(mob/user) . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 4a8ca4571e682..b27ec348215ef 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -55,6 +55,8 @@ var/lose_patience_timer_id //id for a timer to call LoseTarget(), used to stop mobs fixating on a target they can't reach var/lose_patience_timeout = 300 //30 seconds by default, so there's no major changes to AI behaviour, beyond actually bailing if stuck forever + var/backup_nosound = FALSE //Should it not play a sound if it's requesting backup? + /mob/living/simple_animal/hostile/Initialize(mapload) . = ..() wanted_objects = typecacheof(wanted_objects) @@ -367,7 +369,8 @@ /mob/living/simple_animal/hostile/proc/summon_backup(distance, exact_faction_match) do_alert_animation(src) - playsound(loc, 'sound/machines/chime.ogg', 50, 1, -1) + if(!backup_nosound) + playsound(loc, 'sound/machines/chime.ogg', 50, 1, -1) var/atom/target_from = GET_TARGETS_FROM(src) for(var/mob/living/simple_animal/hostile/M in oview(distance, target_from)) if(faction_check_mob(M, TRUE)) @@ -604,3 +607,5 @@ target = new_target if(target) RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(handle_target_del)) + + diff --git a/code/modules/mob/living/simple_animal/hostile/psycho.dm b/code/modules/mob/living/simple_animal/hostile/psycho.dm new file mode 100644 index 0000000000000..22c1b99f2efd5 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/psycho.dm @@ -0,0 +1,161 @@ + + +/mob/living/simple_animal/hostile/psycho + name = "Psycho" + desc = "They're wearing a pretty uncomfortable jacket." + icon = 'icons/mob/simple_human.dmi' + icon_state = "psycho" + icon_living = "psycho" + attack_verb_continuous = "bites" + attack_verb_simple = "bite" + mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) + turns_per_move = 0 + del_on_death = TRUE + speak_chance = 5 + attack_sound = 'sound/weapons/bite.ogg' + speak = list("I'm not mad!","What insanity?","Kill") + speed = -2 + maxHealth = 100 + health = 100 + atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) + unsuitable_atmos_damage = 5 + faction = list("psycho") + move_to_delay = 3 + rapid_melee = 2 + in_melee = TRUE + approaching_target = TRUE + environment_smash = ENVIRONMENT_SMASH_NONE + obj_damage = 5 + sidestep_per_cycle = 0 + stat_attack = HARD_CRIT + melee_damage = 15 + lose_patience_timeout = 350 + loot = list(/obj/effect/mob_spawn/human/corpse/psychost) + +/mob/living/simple_animal/hostile/psycho/regular + var/cooldown = 0 + var/static/list/idle_sounds + +/mob/living/simple_animal/hostile/psycho/regular/Initialize(mapload) + . = ..() + idle_sounds = list('sound/creatures/psycidle1.ogg','sound/creatures/psycidle2.ogg','sound/creatures/psycidle3.ogg') + +/mob/living/simple_animal/hostile/psycho/regular/Life() + ..() + if(Aggro() || stat) + return + if(prob(20)) + var/chosen_sound = pick(idle_sounds) + playsound(src, chosen_sound, 50, FALSE) + +/mob/living/simple_animal/hostile/psycho/regular/Aggro() + ..() + var/list/possible_sounds = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + +/mob/living/simple_animal/hostile/psycho/regular/death(gibbed) + var/list/possible_sounds = list('sound/creatures/psycdeath1.ogg','sound/creatures/psycdeath2.ogg') + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/psycho/fast + move_to_delay = 2 + speed = -5 + maxHealth = 70 + health = 70 + +/mob/living/simple_animal/hostile/psycho/muzzle + icon_state = "psychomuzzle" + icon_living = "psychomuzzle" + attack_sound = null + speak_chance = 0 + melee_damage = 9 + var/cooldown = 0 + var/static/list/idle_sounds + speed = 0 + loot = list(/obj/effect/mob_spawn/human/corpse/psychost/muzzle) + +/mob/living/simple_animal/hostile/psycho/muzzle/Initialize(mapload) + . = ..() + idle_sounds = list('sound/creatures/psychidle.ogg','sound/creatures/psychidle2.ogg') + +/mob/living/simple_animal/hostile/psycho/muzzle/death(gibbed) + var/list/possible_sounds = list('sound/creatures/psychdeath.ogg','sound/creatures/psychdeath2.ogg',) + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/psycho/muzzle/Aggro() + ..() + var/list/possible_sounds = list('sound/creatures/psychsight.ogg','sound/creatures/psychsight2.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + +/mob/living/simple_animal/hostile/psycho/muzzle/AttackingTarget() + ..() + playsound(get_turf(src), 'sound/creatures/psychattack1.ogg', 70, TRUE, 0) + +/mob/living/simple_animal/hostile/psycho/muzzle/Life() + ..() + if(Aggro() || stat) + return + if(prob(20)) + var/chosen_sound = pick(idle_sounds) + playsound(src, chosen_sound, 50, TRUE) + +/mob/living/simple_animal/hostile/psycho/trap + desc = "This one has a strange device on his head." + icon_state = "psychotrap" + icon_living = "psychotrap" + speak_chance = 0 + speed = -3 + move_to_delay = 2 + melee_damage = 15 + attack_sound = null + loot = list(/obj/effect/mob_spawn/human/corpse/psychost/trap) + var/cooldown = 0 + var/static/list/idle_sounds + +/mob/living/simple_animal/hostile/psycho/trap/Aggro() + ..() + var/list/possible_sounds = list('sound/creatures/psychsight.ogg','sound/creatures/psychsight2.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + +/mob/living/simple_animal/hostile/psycho/trap/Initialize(mapload) + . = ..() + idle_sounds = list('sound/creatures/psychidle.ogg','sound/creatures/psychidle2.ogg') + +/mob/living/simple_animal/hostile/psycho/trap/Life() + ..() + if(Aggro() || stat) + return + if(prob(20)) + var/chosen_sound = pick(idle_sounds) + playsound(src, chosen_sound, 50, FALSE) + if(health < maxHealth) + playsound(src, 'sound/machines/beep.ogg', 80, FALSE) + addtimer(CALLBACK(src, PROC_REF(death)), 200) + +/mob/living/simple_animal/hostile/psycho/trap/AttackingTarget() + var/list/possible_sounds = list('sound/creatures/psychhead.ogg','sound/creatures/psychhead2.ogg') + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 100, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/psycho/trap/death(gibbed) + var/list/possible_sounds = list('sound/creatures/psychdeath.ogg','sound/creatures/psychdeath2.ogg') + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 70, 0, 0) + playsound(get_turf(src), 'sound/effects/snap.ogg', 75, TRUE, 0) + playsound(get_turf(src), 'sound/effects/splat.ogg', 90, TRUE, 0) + visible_message("The device activates!") + ..() diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm index eba7425a5995a..a7165dc4e4b17 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm @@ -43,6 +43,8 @@ flags_1 = PREVENT_CONTENTS_EXPLOSION_1 melee_damage = 35 mob_size = MOB_SIZE_LARGE + see_in_dark = NIGHTVISION_FOV_RANGE + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE armour_penetration = 30 pixel_x = -16 turns_per_move = 5 @@ -88,6 +90,7 @@ small_sprite = new small_sprite.Grant(src) ADD_TRAIT(src, TRAIT_FREE_HYPERSPACE_MOVEMENT, INNATE_TRAIT) + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE /mob/living/simple_animal/hostile/space_dragon/proc/living_revive(source) SIGNAL_HANDLER @@ -382,7 +385,6 @@ target.add_filter("anger_glow", 3, list("type" = "outline", "color" = "#ff330030", "size" = 2)) target.add_movespeed_modifier(/datum/movespeed_modifier/rift_empowerment) addtimer(CALLBACK(src, PROC_REF(end_carp_speedboost), target), 8 SECONDS) - /** * Remove the speed boost from carps when hit by space dragon's flame breath * diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index ee81f657b0bb3..ac56ae9eb5210 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -304,3 +304,119 @@ /mob/living/simple_animal/hostile/viscerator/Initialize(mapload) . = ..() AddComponent(/datum/component/swarming) + + +/mob/living/simple_animal/hostile/syndicate/sniper + name = "Syndicate Sniper" + desc = "One of the best snipers the syndicate has to offer. Take cover or get shot!" + icon_state = "fsniper" + icon_living = "fsniper" + ranged = TRUE + speed = 1 + dodge_prob = 40 + ranged_cooldown_time = 40 + check_friendly_fire = 1 + sidestep_per_cycle = 3 + minimum_distance = 4 + turns_per_move = 6 + melee_queue_distance = 2 + health = 250 + maxHealth = 250 + melee_damage = 20 + rapid_melee = 3 + attack_verb_continuous = "hits" + attack_verb_simple = "hit" + attack_sound = 'sound/weapons/genhit3.ogg' + projectilesound = 'sound/weapons/sniper_shot.ogg' + speak_chance = 2 + var/cooldown = 0 + speak = list("You're pretty good.","You can't dodge everything!","Fall down already!") + loot = list(/obj/item/gun/ballistic/sniper_rifle, + /obj/effect/mob_spawn/human/corpse/sniper, + /obj/item/ammo_box/magazine/sniper_rounds, + /obj/item/ammo_box/magazine/sniper_rounds/penetrator, + /obj/item/ammo_box/magazine/sniper_rounds/soporific) + backup_nosound = TRUE + +/mob/living/simple_animal/hostile/syndicate/sniper/Aggro() + ..() + ranged_cooldown = 30 + if (cooldown < world.time) + cooldown = world.time + 150 + summon_backup(10) + playsound(get_turf(src), 'sound/weapons/sniper_rack.ogg', 80, TRUE) + say("I've got you in my scope.") + +/mob/living/simple_animal/hostile/syndicate/sniper/Shoot() + var/allowed_projectile_types = list(/obj/item/ammo_casing/p50, /obj/item/ammo_casing/p50/penetrator) + casingtype = pick(allowed_projectile_types) + ..() + +/mob/living/simple_animal/hostile/syndicate/sniper/death(gibbed) + playsound(get_turf(src), 'sound/creatures/wardendeath.ogg', 100, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/syndicate/heavy + name = "Heavy gunner" + desc = "They didn't get that backpack for nothing." + icon_state = "Heavy" + icon_living = "Heavy" + sidestep_per_cycle = 0 + minimum_distance = 5 + approaching_target = TRUE + ranged = TRUE + rapid = 65 + rapid_fire_delay = 0.5 + projectiletype = /obj/projectile/beam + ranged_cooldown_time = 110 + vision_range = 9 + speak_chance = 0 + speak = null + aggro_vision_range = 9 + attack_verb_continuous = "hits" + attack_verb_simple = "hit" + attack_sound = 'sound/weapons/genhit3.ogg' + retreat_distance = 2 + melee_queue_distance = 1 + melee_damage = 25 + move_to_delay = 4 + projectilesound = null + speed = 15 + health = 300 + maxHealth = 300 + loot = list(/obj/effect/mob_spawn/human/corpse/heavy) + var/cooldown = 0 + +/mob/living/simple_animal/hostile/syndicate/heavy/Initialize(mapload) + ..() + +/mob/living/simple_animal/hostile/syndicate/heavy/Aggro() + ..() + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), 'sound/creatures/heavysight1.ogg', 80, 0, 0) + +/mob/living/simple_animal/hostile/syndicate/heavy/OpenFire(atom/A) + playsound(get_turf(src), 'sound/weapons/heavyminigunstart.ogg', 80, 0, 0) + move_to_delay = 6//slowdown when shoot + speed = 30 + sleep(15) + playsound(get_turf(src), 'sound/weapons/heavyminigunshoot.ogg', 90, 0, 0) + if(CheckFriendlyFire(A)) + return + if(!(simple_mob_flags & SILENCE_RANGED_MESSAGE)) + visible_message("[src] [ranged_message] at [A]!") + if(rapid > 1) + var/datum/callback/cb = CALLBACK(src, PROC_REF(Shoot), A) + for(var/i in 1 to rapid) + addtimer(cb, (i - 1)*rapid_fire_delay) + else + Shoot(A) + ranged_cooldown = world.time + ranged_cooldown_time + playsound(get_turf(src), 'sound/weapons/heavyminigunstop.ogg', 80, 0, 0) + move_to_delay = initial(move_to_delay)//restore speed + speed = initial(speed) + +/mob/living/simple_animal/hostile/syndicate/heavy/death(gibbed) + playsound(get_turf(src), 'sound/creatures/heavydeath1.ogg', 80, TRUE, 0) + ..() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 60568ac0b5070..6a3b0ae8dcd1a 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -304,6 +304,15 @@ /mob/proc/get_item_by_slot(slot_id) return null +/// Gets what slot the item on the mob is held in. +/// Returns null if the item isn't in any slots on our mob. +/// Does not check if the passed item is null, which may result in unexpected outcoms. +/mob/proc/get_slot_by_item(obj/item/looking_for) + if(looking_for in held_items) + return ITEM_SLOT_HANDS + + return null + ///Is the mob incapacitated /mob/proc/incapacitated(flags) return @@ -1011,7 +1020,7 @@ /** * Fully update the name of a mob * - * This will update a mob's name, real_name, mind.name, GLOB.data_core records, pda, id and traitor text + * This will update a mob's name, real_name, mind.name, GLOB.manifest records, pda, id and traitor text * * Calling this proc without an oldname will only update the mob and skip updating the pda, id and records ~Carn */ @@ -1030,7 +1039,7 @@ log_played_names(mind.key,newname) //Just in case the mind is unsynced at the moment. if(oldname) - //update the datacore records! This is goig to be a bit costly. + //update the manifest records! This is goig to be a bit costly. replace_records_name(oldname,newname) //update our pda and id if we have them on our person @@ -1043,7 +1052,7 @@ obj.update_explanation_text() return 1 -///Updates GLOB.data_core records with new name , see mob/living/carbon/human +///Updates GLOB.manifest records with new name , see mob/living/carbon/human /mob/proc/replace_records_name(oldname,newname) return diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm index a0a9ed32d700e..6c88d1e639b5d 100644 --- a/code/modules/modular_computers/computers/item/tablet.dm +++ b/code/modules/modular_computers/computers/item/tablet.dm @@ -22,7 +22,9 @@ var/finish_color = null var/list/contained_item = list(/obj/item/pen, /obj/item/toy/crayon, /obj/item/lipstick, /obj/item/flashlight/pen, /obj/item/clothing/mask/cigarette) + //This is the typepath to load "into" the pda var/obj/item/insert_type = /obj/item/pen + //This is the currently inserted item var/obj/item/inserted_item /// If this tablet can be detonated with detomatix (needs to be refactored into a signal) @@ -329,6 +331,8 @@ var/mob/living/silicon/robot/robo = borgo robo.lamp_color = COLOR_RED //Syndicate likes it red +GLOBAL_LIST_EMPTY(PDAs) + // Round start tablets /obj/item/modular_computer/tablet/pda @@ -406,3 +410,20 @@ inserted_item = new insert_type(src) // show the inserted item update_icon() + +/// Return a list of types you want to pregenerate and use later +/// Do not pass in things that care about their init location, or expect extra input +/// Also as a courtesy to me, don't pass in any bombs +/obj/item/modular_computer/tablet/pda/proc/get_types_to_preload() + var/list/preload = list() + //preload += default_cartridge + preload += insert_type + return preload + +/// Callbacks for preloading pdas +/obj/item/modular_computer/tablet/pda/proc/display_pda() + GLOB.PDAs += src + +/// See above, we don't want jerry from accounting to try and message nullspace his new bike +/obj/item/modular_computer/tablet/pda/proc/cloak_pda() + GLOB.PDAs -= src diff --git a/code/modules/modular_computers/file_system/programs/card.dm b/code/modules/modular_computers/file_system/programs/card.dm index d20e3d132b6b7..fa71dd84b6dcc 100644 --- a/code/modules/modular_computers/file_system/programs/card.dm +++ b/code/modules/modular_computers/file_system/programs/card.dm @@ -155,7 +155,7 @@ if(!card_slot2) return if(target_id_card) - GLOB.data_core.manifest_modify(target_id_card.registered_name, target_id_card.assignment, target_id_card.hud_state) + GLOB.manifest.modify(target_id_card.registered_name, target_id_card.assignment, target_id_card.hud_state) return card_slot2.try_eject(user) else var/obj/item/I = user.get_active_held_item() diff --git a/code/modules/modular_computers/file_system/programs/crewmanifest.dm b/code/modules/modular_computers/file_system/programs/crewmanifest.dm index aed34cb19176c..7ec4a45687338 100644 --- a/code/modules/modular_computers/file_system/programs/crewmanifest.dm +++ b/code/modules/modular_computers/file_system/programs/crewmanifest.dm @@ -16,7 +16,7 @@ /datum/computer_file/program/crew_manifest/ui_static_data(mob/user) var/list/data = list() - data["manifest"] = GLOB.data_core.get_manifest() + data["manifest"] = GLOB.manifest.get_manifest() return data /datum/computer_file/program/crew_manifest/ui_data(mob/user) @@ -45,7 +45,7 @@ if(computer && printer) //This option should never be called if there is no printer var/contents = {"
Crew Manifest
- [GLOB.data_core ? GLOB.data_core.get_manifest_html(0) : ""] + [GLOB.manifest ? GLOB.manifest.get_html(0) : ""] "} if(!printer.print_text(contents,"crew manifest ([station_time_timestamp()])")) to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") diff --git a/code/modules/modular_computers/file_system/programs/records.dm b/code/modules/modular_computers/file_system/programs/records.dm index 5b084fec0fdfb..53be8d10a0ede 100644 --- a/code/modules/modular_computers/file_system/programs/records.dm +++ b/code/modules/modular_computers/file_system/programs/records.dm @@ -37,42 +37,34 @@ switch(mode) if("security") - for(var/datum/data/record/person in GLOB.data_core.general) - var/datum/data/record/security_person = find_record("id", person.fields["id"], GLOB.data_core.security) + for(var/datum/record/crew/person in GLOB.manifest.general) var/list/current_record = list() - if(security_person) - current_record["wanted"] = security_person.fields["criminal"] - - current_record["id"] = person.fields["id"] - current_record["name"] = person.fields["name"] - current_record["rank"] = person.fields["rank"] - current_record["gender"] = person.fields["gender"] - current_record["age"] = person.fields["age"] - current_record["species"] = person.fields["species"] - current_record["fingerprint"] = person.fields["fingerprint"] + current_record["age"] = person.age + current_record["fingerprint"] = person.fingerprint + current_record["gender"] = person.gender + current_record["name"] = person.name + current_record["rank"] = person.rank + current_record["species"] = person.species + current_record["wanted"] = person.wanted_status all_records += list(current_record) if("medical") - for(var/datum/data/record/person in GLOB.data_core.general) + for(var/datum/record/crew/person in GLOB.manifest.general) var/list/current_record = list() - current_record["id"] = person.fields["id"] - current_record["name"] = person.fields["name"] - current_record["rank"] = person.fields["rank"] - current_record["gender"] = person.fields["gender"] - current_record["age"] = person.fields["age"] - current_record["species"] = person.fields["species"] - - var/datum/data/record/medical_person = find_record("id", person.fields["id"], GLOB.data_core.medical) - - if(medical_person) - current_record["b_dna"] = medical_person.fields["b_dna"] - current_record["bloodtype"] = medical_person.fields["blood_type"] - current_record["mi_dis"] = medical_person.fields["mi_dis"] - current_record["ma_dis"] = medical_person.fields["ma_dis"] - current_record["notes"] = medical_person.fields["notes"] - current_record["cnotes"] = medical_person.fields["notes_d"] + current_record["name"] = person.name + current_record["rank"] = person.rank + current_record["species"] = person.species + current_record["gender"] = person.gender + current_record["age"] = person.age + current_record["b_dna"] = person.dna_string + current_record["bloodtype"] = person.blood_type + current_record["ma_dis"] = person.major_disabilities_desc + current_record["mi_dis"] = person.minor_disabilities_desc + current_record["physical_status"] = person.physical_status + current_record["mental_status"] = person.mental_status + current_record["notes"] = person.medical_notes all_records += list(current_record) diff --git a/code/modules/modular_computers/file_system/programs/robocontrol.dm b/code/modules/modular_computers/file_system/programs/robocontrol.dm index a5aa76972600b..747f5a8d4f778 100644 --- a/code/modules/modular_computers/file_system/programs/robocontrol.dm +++ b/code/modules/modular_computers/file_system/programs/robocontrol.dm @@ -92,7 +92,7 @@ if(!computer || !card_slot) return if(id_card) - GLOB.data_core.manifest_modify(id_card.registered_name, id_card.assignment, id_card.hud_state) + GLOB.manifest.modify(id_card.registered_name, id_card.assignment, id_card.hud_state) card_slot.try_eject(current_user) else playsound(get_turf(computer.ui_host()) , 'sound/machines/buzz-sigh.ogg', 25, FALSE) diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 60e03f12459c5..cc81cf49017fe 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -117,25 +117,13 @@ var/virgin = 1 /obj/structure/filingcabinet/security/proc/populate() - if(virgin) - for(var/datum/data/record/G in GLOB.data_core.general) - var/datum/data/record/S = find_record("name", G.fields["name"], GLOB.data_core.security) - if(!S) - continue - var/obj/item/paper/sec_record_paper = new /obj/item/paper(src) - var/sec_record_text = "
" - sec_record_text += "Name: [G.fields["name"]] ID: [G.fields["id"]]
\nGender: [G.fields["gender"]]
\nAge: [G.fields["age"]]
\nFingerprint: [G.fields["fingerprint"]]
\nPhysical Status: [G.fields["p_stat"]]
\nMental Status: [G.fields["m_stat"]]
" - sec_record_text += "
\n
\nCriminal Status: [S.fields["criminal"]]
\n
\nCrimes: [S.fields["crim"]]
\nDetails: [S.fields["crim_d"]]
\n
\nImportant Notes:
\n\t[S.fields["notes"]]
\n
\n
" - var/counter = 1 - while(S.fields["com_[counter]"]) - sec_record_text += "[S.fields["com_[counter]"]]
" - counter++ - sec_record_text += "" - sec_record_paper.name = "paper - '[G.fields["name"]]'" - sec_record_paper.add_raw_text(sec_record_text) - sec_record_paper.update_appearance() - virgin = 0 //tabbing here is correct- it's possible for people to try and use it - //before the records have been generated, so we do this inside the loop. + if(!virgin) + return + for(var/datum/record/crew/target in GLOB.manifest.general) + var/obj/item/paper/rapsheet = target.get_rapsheet() + rapsheet.forceMove(src) + virgin = FALSE //tabbing here is correct- it's possible for people to try and use it + //before the records have been generated, so we do this inside the loop. /obj/structure/filingcabinet/security/attack_hand() populate() @@ -152,24 +140,12 @@ var/virgin = 1 /obj/structure/filingcabinet/medical/proc/populate() - if(virgin) - for(var/datum/data/record/G in GLOB.data_core.general) - var/datum/data/record/M = find_record("name", G.fields["name"], GLOB.data_core.medical) - if(!M) - continue - var/obj/item/paper/med_record_paper = new /obj/item/paper(src) - var/med_record_text = "
" - med_record_text += "Name: [G.fields["name"]] ID: [G.fields["id"]]
\nGender: [G.fields["gender"]]
\nAge: [G.fields["age"]]
\nFingerprint: [G.fields["fingerprint"]]
\nPhysical Status: [G.fields["p_stat"]]
\nMental Status: [G.fields["m_stat"]]
" - med_record_text += "
\n
\nBlood Type: [M.fields["blood_type"]]
\nDNA: [M.fields["b_dna"]]
\n
\nMinor Disabilities: [M.fields["mi_dis"]]
\nDetails: [M.fields["mi_dis_d"]]
\n
\nMajor Disabilities: [M.fields["ma_dis"]]
\nDetails: [M.fields["ma_dis_d"]]
\n
\nAllergies: [M.fields["alg"]]
\nDetails: [M.fields["alg_d"]]
\n
\nCurrent Diseases: [M.fields["cdi"]] (per disease info placed in log/comment section)
\nDetails: [M.fields["cdi_d"]]
\n
\nImportant Notes:
\n\t[M.fields["notes"]]
\n
\n
" - var/counter = 1 - while(M.fields["com_[counter]"]) - med_record_text += "[M.fields["com_[counter]"]]
" - counter++ - med_record_text += "" - med_record_paper.add_raw_text(med_record_text) - med_record_paper.name = "paper - '[G.fields["name"]]'" - med_record_paper.update_appearance() - virgin = 0 //tabbing here is correct- it's possible for people to try and use it + if(!virgin) + return + for(var/datum/record/crew/record in GLOB.manifest.general) + var/obj/item/paper/med_record_paper = record.get_medical_sheet() + med_record_paper.forceMove(src) + virgin = FALSE //tabbing here is correct- it's possible for people to try and use it //before the records have been generated, so we do this inside the loop. //ATTACK HAND IGNORING PARENT RETURN VALUE @@ -202,13 +178,10 @@ GLOBAL_LIST_EMPTY(employmentCabinets) /obj/structure/filingcabinet/employment/proc/fillCurrent() //This proc fills the cabinet with the current crew. - for(var/record in GLOB.data_core.locked) - var/datum/data/record/G = record - if(!G) - continue - var/datum/mind/M = G.fields["mindref"] - if(M && ishuman(M.current)) - addFile(M.current) + for(var/datum/record/locked/target in GLOB.manifest.locked) + var/datum/mind/mind = target.weakref_mind.resolve() + if(mind && ishuman(mind.current)) + addFile(mind.current) /obj/structure/filingcabinet/employment/proc/addFile(mob/living/carbon/human/employee) diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm index 2850766882b1a..63ce226fe9019 100644 --- a/code/modules/paperwork/paper_premade.dm +++ b/code/modules/paperwork/paper_premade.dm @@ -135,3 +135,15 @@
\
signed: Kevin Firewind
\Glory to Nanotrasen
" + +/obj/item/paper/pamphlet/centcom/visitor_info + name = "Visitor Info Pamphlet" + default_raw_text = " XCC-P5831 Visitor Information\ + Greetings, visitor, to XCC-P5831! As you may know, this outpost was once \ + used as Nanotrasen's CENTRAL COMMAND STATION, organizing and coordinating company \ + projects across the vastness of space.
\ + Since the completion of the much more efficient CC-A5831 on March 8, 2553, XCC-P5831 no longer \ + acts as NT's base of operations but still plays a very important role its corporate affairs; \ + serving as a supply and repair depot, as well as being host to its most important legal proceedings\ + and the thrilling pay-per-view broadcasts of PLASTEEL CHEF and THUNDERDOME LIVE.
\ + We hope you enjoy your stay!" diff --git a/code/modules/photography/photos/album.dm b/code/modules/photography/photos/album.dm index 4ec8baa143b8b..0795dae13682c 100644 --- a/code/modules/photography/photos/album.dm +++ b/code/modules/photography/photos/album.dm @@ -16,7 +16,7 @@ /obj/item/storage/photo_album/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) - STR.can_hold = typecacheof(list(/obj/item/photo)) + STR.set_holdable(list(/obj/item/photo)) STR.max_combined_w_class = 42 STR.max_items = 21 LAZYADD(SSpersistence.photo_albums, src) diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm index 7a79332566807..6622600c7e0e2 100644 --- a/code/modules/power/lighting/light.dm +++ b/code/modules/power/lighting/light.dm @@ -650,10 +650,19 @@ light_type = /obj/item/light/bulb fitting = "bulb" +GLOBAL_VAR_INIT(s_flickering_lights, FALSE) + +/// Flickers all lights the next time we sleep, or yield to byond. +/// Concatenates all the flicking operations together. /proc/flicker_all_lights() - for(var/obj/machinery/light/L in GLOB.machines) - if(is_station_level(L.z)) - addtimer(CALLBACK(L, TYPE_PROC_REF(/obj/machinery/light, flicker), rand(3, 6)), rand(0, 15)) + if (GLOB.s_flickering_lights) + return + GLOB.s_flickering_lights = TRUE + spawn(0) + GLOB.s_flickering_lights = FALSE + for(var/obj/machinery/light/L in GLOB.machines) + if(is_station_level(L.z)) + addtimer(CALLBACK(L, TYPE_PROC_REF(/obj/machinery/light, flicker), rand(3, 6)), rand(0, 15)) #undef LIGHT_ON_DELAY_UPPER #undef LIGHT_ON_DELAY_LOWER diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 341d6b80022c1..a5e743d4e929d 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -540,3 +540,24 @@ req_access_txt = "100" welded = TRUE use_power = FALSE + +///Weird emitter that doesn't use power, used as the source for the wabbajack +/obj/machinery/power/emitter/energycannon + name = "Energy Cannon" + desc = "A heavy duty industrial laser." + icon = 'icons/obj/singularity.dmi' + icon_state = "emitter_+a" + anchored = TRUE + density = TRUE + resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF + + use_power = NO_POWER_USE + idle_power_usage = 0 + active_power_usage = 0 + + active = TRUE + locked = TRUE + welded = TRUE + +/obj/machinery/power/emitter/energycannon/RefreshParts() + return diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 3893537271c32..9f4e0189d4cc1 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -429,3 +429,16 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/anomaly/singularity/deadchat_controlled) "down" = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), src, SOUTH), "left" = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), src, WEST), "right" = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), src, EAST))) + +/// The immobile, close pulling singularity +/obj/anomaly/singularity/stationary + move_self = FALSE + +/obj/anomaly/singularity/stationary/Initialize(mapload) + . = ..() + var/datum/component/singularity/singularity = singularity_component.resolve() + singularity?.grav_pull = TRUE + +/obj/anomaly/singularity/stationary/process(delta_time) + if(DT_PROB(0.5, delta_time)) + mezzer() diff --git a/code/modules/projectiles/boxes_magazines/internal/revolver.dm b/code/modules/projectiles/boxes_magazines/internal/revolver.dm index b4f0f0bcf178a..66fcc363c51be 100644 --- a/code/modules/projectiles/boxes_magazines/internal/revolver.dm +++ b/code/modules/projectiles/boxes_magazines/internal/revolver.dm @@ -7,6 +7,17 @@ /obj/item/ammo_box/magazine/internal/cylinder/rev38/rubber ammo_type = /obj/item/ammo_casing/c38/match/bouncy +/obj/item/ammo_box/magazine/internal/cylinder/rev38/random + start_empty = TRUE //We have to handle adding dynamic ammo types on init + +/obj/item/ammo_box/magazine/internal/cylinder/rev38/random/Initialize(mapload) + var/obj/item/ammo_casing/c38/boolet + var/list/possible_boolets = typesof(/obj/item/ammo_casing/c38) -/obj/item/ammo_casing/c38/dart -/obj/item/ammo_casing/caseless/mime + for(var/i in 1 to max_ammo) + boolet = pick(possible_boolets) + stored_ammo += new boolet(src) + . = ..() + /obj/item/ammo_box/magazine/internal/der38 name = "derringer internal chambering" ammo_type = /obj/item/ammo_casing/c38/match diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 31ef884c8478d..8d613f010e14f 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -77,6 +77,10 @@ mag_type = /obj/item/ammo_box/magazine/m50 can_suppress = FALSE mag_display = TRUE + rack_sound = "sound/weapons/deaglerack.ogg" + bolt_drop_sound = "sound/weapons/deagleslidedrop.ogg" + lock_back_sound = "sound/weapons/deaglelock.ogg" + fire_sound = "sound/weapons/deagleshot.ogg" /obj/item/gun/ballistic/automatic/pistol/deagle/gold desc = "A gold plated Desert Eagle folded over a million times by superior martian gunsmiths. Uses .50 AE ammo." diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 6c6d06c9463e5..b4c9789ea8be8 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -114,6 +114,10 @@ mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38 unique_reskin_icon = null +/obj/item/gun/ballistic/revolver/detective/random + name = "\improper Colt .38 revolver" + mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38/random + /obj/item/gun/ballistic/revolver/detective/reskin_obj(mob/M) if(isnull(unique_reskin)) unique_reskin = list( diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 710d0f7f38de1..051ae85b13267 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -380,3 +380,41 @@ else return ..() +///Lever action shotgun, formerly on thefactory.dm + +/obj/item/gun/ballistic/shotgun/lever_action + name = "lever action shotgun" + desc = "A really old shotgun with five shell capacity. This one can fit in a backpack." + w_class = WEIGHT_CLASS_LARGE + dual_wield_spread = 0 + fire_sound_volume = 60 //tried on 90 my eardrums said goodbye + item_state = "leveraction" + icon_state = "leveraction" + worn_icon_state = "shotgun" + rack_sound = "sound/weapons/leveractionrack.ogg" + fire_sound = "sound/weapons/leveractionshot.ogg" + vary_fire_sound = FALSE + rack_sound_vary = FALSE + recoil = 1 + mag_type = /obj/item/ammo_box/magazine/internal/shot/lever + pb_knockback = 5 + +/obj/item/gun/ballistic/shotgun/lever_action/examine(mob/user) + . = ..() + . += "You will instantly reload it after a shot if you have another hand free." + +/obj/item/gun/ballistic/shotgun/lever_action/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1) + ..() + if(user.get_inactive_held_item()) + return + else + rack() + +/obj/item/gun/ballistic/shotgun/lever_action/rack(mob/user = null) + if (user) + to_chat(user, "You rack the [bolt_wording] of \the [src].") + process_chamber(!chambered, FALSE) + playsound(src, rack_sound, rack_sound_volume, rack_sound_vary) + update_icon() + if(user.get_inactive_held_item() && prob(50) && chambered) + user.visible_message("With a single move of [user.p_their()] arm, [user] flips \the [src] and loads the chamber with a shell.") diff --git a/code/modules/projectiles/guns/energy/dueling.dm b/code/modules/projectiles/guns/energy/dueling.dm index 588abbc15ba09..edc404569a104 100644 --- a/code/modules/projectiles/guns/energy/dueling.dm +++ b/code/modules/projectiles/guns/energy/dueling.dm @@ -311,7 +311,7 @@ var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_SMALL STR.max_items = 2 - STR.can_hold = typecacheof(list(/obj/item/gun/energy/dueling)) + STR.set_holdable(list(/obj/item/gun/energy/dueling)) /obj/item/storage/lockbox/dueling/PopulateContents() . = ..() diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index 730186f0f3488..a4736732c647c 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -111,6 +111,11 @@ can_charge = TRUE recharge_rate = 1 +/obj/item/gun/magic/wand/resurrection/inert + name = "weakened wand of healing" + desc = "This wand uses healing magics to heal and revive. The years of the cold have weakened the magic inside the wand." + max_charges = 5 + ///////////////////////////////////// //WAND OF POLYMORPH ///////////////////////////////////// @@ -211,3 +216,9 @@ ..() explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2, magic = TRUE) charges-- + +/obj/item/gun/magic/wand/fireball/inert + name = "weakened wand of fireball" + desc = "This wand shoots scorching balls of fire that explode into destructive flames. The years of the cold have weakened the magic inside the wand." + max_charges = 4 + diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 978e3e6851040..685c7398a0589 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -477,8 +477,6 @@ // Calling CanAllowThrough introduces side effects if(target.pass_flags_self & pass_flags) return FALSE - if ((pass_flags & PASSTRANSPARENT) && target.alpha < 255 && prob(100 - (target.alpha/2.55))) - return FALSE if(!ignore_source_check && firer) var/mob/M = firer if((target == firer) || ((target == firer.loc) && ismecha(firer.loc)) || (target in firer.buckled_mobs) || (istype(M) && (M.buckled == target))) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 345901695efff..7f77bce0a5215 100755 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -341,7 +341,6 @@ chem_flags = CHEMICAL_RNG_GENERAL | CHEMICAL_RNG_FUN | CHEMICAL_RNG_BOTANY taste_description = "salt" - /datum/reagent/consumable/sodiumchloride/reaction_turf(turf/T, reac_volume) //Creates an umbra-blocking salt pile if(!istype(T)) return @@ -665,19 +664,35 @@ /datum/reagent/consumable/maltodextrin name = "Maltodextrin" description = "A common filler found in processed foods. Foods containing it will leave you feeling full for a much shorter time." - color = "#ffffff" + color = "#d4e1ee" chem_flags = CHEMICAL_RNG_GENERAL taste_mult = 0.1 // Taste the salt and sugar not the cheap carbs taste_description = "processed goodness" - nutriment_factor = 0 + nutriment_factor = -0.3 metabolization_rate = 0.05 * REAGENTS_METABOLISM //Each unit will last 50 ticks -/datum/reagent/consumable/maltodextrin/on_mob_life(mob/living/carbon/M) - M.adjust_nutrition(-0.3) //Each unit will match nutriment 1:1 when completely processed - ..() +/datum/reagent/consumable/maltodextrin/microplastics + name = "Microplastics" + description = "A byproduct of industrial clothing, Cloths containing it will weaken you in the long term!" + color = "#dbd6cb" + chem_flags = CHEMICAL_RNG_GENERAL | CHEMICAL_RNG_FUN // The funny + taste_description = "Plastic" + nutriment_factor = -0.15 // it's plastic after all, it taste really good and it's real special! + metabolization_rate = 0.025 * REAGENTS_METABOLISM //A bit more than maltodextrin -////Lavaland Flora Reagents//// +/datum/reagent/consumable/maltodextrin/microplastics/on_mob_metabolize(mob/living/carbon/human/H) + . = ..() + if(!istype(H)) + return + H.physiology.tox_mod *= 2 + +/datum/reagent/consumable/maltodextrin/microplastics/on_mob_end_metabolize(mob/living/carbon/human/H) + . = ..() + if(!istype(H)) + return + H.physiology.tox_mod *= 0.5 +////Lavaland Flora Reagents//// /datum/reagent/consumable/entpoly name = "Entropic Polypnium" @@ -834,3 +849,16 @@ if(prob(10)) M.say(pick("I hate my wife.", "I just want to grill for God's sake.", "I wish I could just go on my lawnmower and cut the grass.", "Yep, Quake. That was a good game...", "Yeah, my PDA has wi-fi. A wife I hate."), forced = /datum/reagent/consumable/char) ..() + +/datum/reagent/consumable/nutriment/cloth + name = "Cloth" + description = "The finest fabric in the universe..." + reagent_state = SOLID + color = "#c2bbb7" + chem_flags = CHEMICAL_RNG_GENERAL | CHEMICAL_RNG_FUN | CHEMICAL_GOAL_BOTANIST_HARVEST + taste_description = "a roll of gauze" + metabolization_rate = 2 * REAGENTS_METABOLISM //speedy metabolization (per tick) + +/datum/reagent/consumable/nutriment/cloth/on_mob_metabolize(mob/living/carbon/M) + holder.add_reagent(/datum/reagent/consumable/nutriment, 1) + holder.add_reagent(/datum/reagent/consumable/maltodextrin/microplastics, 1) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index cc3fbc9afc681..e0ac8168052d7 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -81,9 +81,8 @@ M.blood_volume = BLOOD_VOLUME_NORMAL M.cure_all_traumas(TRAUMA_RESILIENCE_MAGIC) - for(var/organ in M.internal_organs) - var/obj/item/organ/O = organ - O.setOrganDamage(0) + for(var/obj/item/organ/organ as anything in M.internal_organs) + organ.setOrganDamage(0) for(var/thing in M.diseases) var/datum/disease/D = thing if(D.danger == DISEASE_BENEFICIAL || D.danger == DISEASE_POSITIVE) diff --git a/code/modules/reagents/reagent_containers/cups/drinks.dm b/code/modules/reagents/reagent_containers/cups/drinks.dm index f5b50d8473a31..60e547eeb8cfe 100644 --- a/code/modules/reagents/reagent_containers/cups/drinks.dm +++ b/code/modules/reagents/reagent_containers/cups/drinks.dm @@ -293,19 +293,15 @@ cap_on = FALSE // Admin spawn -/obj/item/reagent_containers/cup/glass/waterbottle/relic +/obj/item/reagent_containers/cup/glass/waterbottle/random name = "mysterious bottle" - desc = "A bottle quite similar to a water bottle, but with some words scribbled on with a marker. It seems to be radiating some kind of energy." + desc = "A bottle quite similar to a water bottle, with some faded words scribbled on with a marker. It seems to be radiating some kind of energy." flip_chance = 100 // FLIPP + list_reagents = list() -/obj/item/reagent_containers/cup/glass/waterbottle/relic/Initialize(mapload) - var/reagent_id = get_random_reagent_id() - var/datum/reagent/random_reagent = new reagent_id - list_reagents = list(random_reagent.type = 50) +/obj/item/reagent_containers/cup/glass/waterbottle/random/Initialize(mapload) + list_reagents = list(get_random_reagent_id(CHEMICAL_RNG_FUN) = 50) . = ..() - desc += "The writing reads '[random_reagent.name]'." - update_appearance() - /obj/item/reagent_containers/cup/glass/sillycup name = "paper cup" diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm index f8f00ac416a61..a9180e678bd38 100644 --- a/code/modules/reagents/reagent_containers/cups/glassbottle.dm +++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm @@ -39,6 +39,7 @@ if(!ranged && thrower) thrower.put_in_hands(B) B.mimic_broken(src, target) + B.item_state = broken_item_state qdel(src) target.Bumped(B) @@ -434,7 +435,7 @@ icon_state = "champagne_bottle" base_icon_state = "champagne_bottle" reagent_flags = TRANSPARENT - spillable = FALSE + //spillable = FALSE //This bottle should really be using a cork, but we'll leave it alone for now list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100) /obj/item/reagent_containers/cup/glass/bottle/blazaam diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm index d665e38bf7f5b..79c2240b5c260 100644 --- a/code/modules/recycling/conveyor.dm +++ b/code/modules/recycling/conveyor.dm @@ -198,6 +198,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/conveyor) SSmove_manager.stop_looping(convayable, SSconveyors) /obj/machinery/conveyor/proc/start_conveying(atom/movable/moving) + if(QDELETED(moving)) + return var/datum/move_loop/move/moving_loop = SSmove_manager.processing_on(moving, SSconveyors) if(moving_loop) moving_loop.direction = movedir diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index 06c9c53f85c4f..2485ec93d6edf 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -72,11 +72,11 @@ category = list("Computer Boards") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE -/datum/design/board/med_data +/datum/design/board/records/medical name = "Computer Design (Medical Records)" desc = "Allows for the construction of circuit boards used to build a medical records console." - id = "med_data" - build_path = /obj/item/circuitboard/computer/med_data + id = "records/medical" + build_path = /obj/item/circuitboard/computer/records/medical category = list("Computer Boards") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL @@ -132,7 +132,7 @@ name = "Computer Design (Security Records Console)" desc = "Allows for the construction of circuit boards used to build a security records console." id = "secdata" - build_path = /obj/item/circuitboard/computer/secure_data + build_path = /obj/item/circuitboard/computer/records/security category = list("Computer Boards") departmental_flags = DEPARTMENTAL_FLAG_SECURITY diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index ca47b76fc5945..6c0e232ad9890 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -753,3 +753,19 @@ id = "shieldwallgen_atmos" build_path = /obj/item/circuitboard/machine/shieldwallgen/atmos category = list("Misc. Machinery") + +/datum/design/board/photobooth + name = "Photobooth Board" + desc = "The circuit board for a photobooth." + id = "photobooth" + build_path = /obj/item/circuitboard/machine/photobooth + category = list("Misc. Machinery") + departmental_flags = DEPARTMENTAL_FLAG_SERVICE + +/datum/design/board/security_photobooth + name = "Security Photobooth Board" + desc = "The circuit board for a security photobooth." + id = "security_photobooth" + build_path = /obj/item/circuitboard/machine/photobooth/security + category = list("Misc. Machinery") + departmental_flags = DEPARTMENTAL_FLAG_SECURITY diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 1edfdb7a992e9..f14845c77ea4c 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1097,9 +1097,11 @@ "idcardconsole", "libraryconsole", "mining", + "photobooth", "objective", "rdcamera", "seccamera", + "security_photobooth", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000) export_price = 5000 @@ -1164,7 +1166,7 @@ prereq_ids = list("comptech") design_ids = list( "automated_announcement", - "med_data", + "records/medical", "prisonmanage", "secdata", "vendor", diff --git a/code/modules/security/genpop.dm b/code/modules/security/genpop.dm index 861b476af35a8..9d1ad56ea795b 100644 --- a/code/modules/security/genpop.dm +++ b/code/modules/security/genpop.dm @@ -595,13 +595,14 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/genpop_interface) user.log_message("[key_name(user)] created a prisoner ID with sentence: [desired_sentence / 600] for [desired_sentence / 600] min", LOG_ATTACK) if(desired_crime) - var/datum/data/record/R = find_record("name", desired_name, GLOB.data_core.general) - if(R) - R.fields["criminal"] = "Incarcerated" - var/crime = GLOB.data_core.createCrimeEntry(desired_crime, null, user.real_name, station_time_timestamp()) - GLOB.data_core.addCrime(R.fields["id"], crime) - investigate_log("New Crime: [desired_crime] | Added to [R.fields["name"]] by [key_name(user)]", INVESTIGATE_RECORDS) - say("Criminal record for [R.fields["name"]] successfully updated.") + var/datum/record/crew/target_record = find_record(desired_name, GLOB.manifest.general) + if(target_record) + target_record.wanted_status = WANTED_PRISONER + var/datum/crime_record/new_crime = new(desired_crime, null, "General Populace") + target_record.crimes += new_crime + investigate_log("New Crime: [desired_crime] | Added to [target_record.name] by [key_name(user)]", INVESTIGATE_RECORDS) + say("Criminal record for [target_record.name] successfully updated.") + update_matching_security_huds(target_record.name) playsound(loc, 'sound/machines/ping.ogg', 50, 1) var/obj/item/card/id/id = new /obj/item/card/id/prisoner(get_turf(src), desired_sentence * 0.1, desired_crime, desired_name) @@ -744,9 +745,9 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/card/id/prisoner) update_label(registered_name, assignment) playsound(loc, 'sound/machines/ping.ogg', 50, 1) - var/datum/data/record/R = find_record("name", registered_name, GLOB.data_core.general) + var/datum/record/crew/R = find_record(registered_name, GLOB.manifest.general) if(R) - R.fields["criminal"] = "Discharged" + R.wanted_status = WANTED_DISCHARGED if(isliving(loc)) to_chat(loc, "You have served your sentence! You may now exit prison through the turnstiles and collect your belongings.") diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 65859a5902198..66e482320f19a 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -149,8 +149,6 @@ All ShuttleMove procs go here update_light() if(rotation) shuttleRotate(rotation) - if(proximity_monitor) - proximity_monitor.HandleMove() return TRUE @@ -401,7 +399,3 @@ All ShuttleMove procs go here id = "mining_public" //It will not move with the base, but will become enabled as a docking point. return FALSE -/obj/effect/abstract/proximity_checker/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock, list/obj/docking_port/mobile/towed_shuttles) - //timer so it only happens once - addtimer(CALLBACK(monitor, TYPE_PROC_REF(/datum/proximity_monitor, SetRange), monitor.current_range, TRUE), 0, TIMER_UNIQUE) - return FALSE diff --git a/code/modules/shuttle/super_cruise/orbital_poi_generator/loot/artifact_defenses.dm b/code/modules/shuttle/super_cruise/orbital_poi_generator/loot/artifact_defenses.dm index 3a566db4119ce..60b0b94ea0b05 100644 --- a/code/modules/shuttle/super_cruise/orbital_poi_generator/loot/artifact_defenses.dm +++ b/code/modules/shuttle/super_cruise/orbital_poi_generator/loot/artifact_defenses.dm @@ -16,6 +16,8 @@ icon_state = "watcher" var/cooldown = 0 var/range //Trigger range + ///Proximity monitor associated with this atom, needed for proximity checks. + var/datum/proximity_monitor/proximity_monitor /obj/structure/alien_artifact/watcher/Initialize(mapload) . = ..() diff --git a/code/modules/spells/spell_types/bloodcrawl.dm b/code/modules/spells/spell_types/bloodcrawl.dm index 02676bfa6d547..381f19aa0ab0a 100644 --- a/code/modules/spells/spell_types/bloodcrawl.dm +++ b/code/modules/spells/spell_types/bloodcrawl.dm @@ -13,6 +13,7 @@ action_icon_state = "bloodcrawl" action_background_icon_state = "bg_demon" var/phased = FALSE + COOLDOWN_DECLARE(resurface_cooldown) /obj/effect/proc_holder/spell/bloodcrawl/choose_targets(mob/user = usr) for(var/obj/effect/decal/cleanable/target in view(range, get_turf(user))) @@ -23,14 +24,20 @@ to_chat(user, "There must be a nearby source of blood!") /obj/effect/proc_holder/spell/bloodcrawl/perform(obj/effect/decal/cleanable/target, recharge = 1, mob/living/user = usr) - if(istype(user)) - if(phased) - if(user.phasein(target)) - phased = FALSE - else - if(user.phaseout(target)) - phased = TRUE - start_recharge() + if(!istype(user)) + revert_cast() + to_chat(user, "You are unable to blood crawl!") return - revert_cast() - to_chat(user, "You are unable to blood crawl!") + + if(phased) + if(!COOLDOWN_FINISHED(src, resurface_cooldown)) + to_chat(user, "You need to wait until you can resurface!") + return + if(user.phasein(target)) + phased = FALSE + else + if(user.phaseout(target)) + phased = TRUE + COOLDOWN_START(src, resurface_cooldown, 5 SECONDS) + start_recharge() + diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm index fd80037bdd387..0bb5a62728985 100644 --- a/code/modules/spells/spell_types/wizard.dm +++ b/code/modules/spells/spell_types/wizard.dm @@ -159,7 +159,7 @@ clothes_req = FALSE say_destination = FALSE // Santa moves in mysterious ways -/obj/effect/proc_holder/spell/aoe_turf/conjure/timestop +/obj/effect/proc_holder/spell/aoe_turf/timestop name = "Stop Time" desc = "This spell stops time for everyone except for you, allowing you to move freely while your enemies and even projectiles are frozen." charge_max = 500 @@ -168,10 +168,12 @@ invocation_type = INVOCATION_SHOUT range = 0 cooldown_min = 100 - summon_amt = 1 action_icon_state = "time" + var/timestop_range = 2 + var/timestop_duration = 100 - summon_type = list(/obj/effect/timestop/wizard) +/obj/effect/proc_holder/spell/aoe_turf/timestop/cast(list/targets, mob/user = usr) + new /obj/effect/timestop/magic(get_turf(user), timestop_range, timestop_duration, list(user)) /obj/effect/proc_holder/spell/aoe_turf/conjure/carp name = "Summon Carp" diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index d4ec2353a5462..b82dbeebeafca 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -500,11 +500,12 @@ C = owner no_update = FALSE - if(HAS_TRAIT(C, TRAIT_HUSK) && IS_ORGANIC_LIMB(src)) - dmg_overlay_type = "" //no damage overlay shown when husked - is_husked = TRUE - else - is_husked = FALSE + if(IS_ORGANIC_LIMB(src)) + if(C && HAS_TRAIT(C, TRAIT_HUSK)) + dmg_overlay_type = "" //no damage overlay shown when husked + is_husked = TRUE + else + is_husked = FALSE if(!dropping_limb && C.dna?.check_mutation(HULK)) //Please remove hulk from the game. I beg you. mutation_color = "00aa00" diff --git a/code/modules/surgery/organs/appendix.dm b/code/modules/surgery/organs/appendix.dm index d1f1b92de12c8..48b907a6f983d 100644 --- a/code/modules/surgery/organs/appendix.dm +++ b/code/modules/surgery/organs/appendix.dm @@ -1,6 +1,7 @@ /obj/item/organ/appendix name = "appendix" icon_state = "appendix" + visual = FALSE zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_APPENDIX diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 9e9f261f60d61..43fc7e56dd065 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -2,6 +2,7 @@ /obj/item/organ/cyberimp name = "cybernetic implant" desc = "A state-of-the-art implant that improves a baseline's functionality." + visual = FALSE status = ORGAN_ROBOTIC organ_flags = ORGAN_SYNTHETIC var/implant_color = "#FFFFFF" diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm index 8467f138e462b..003fc32518659 100644 --- a/code/modules/surgery/organs/ears.dm +++ b/code/modules/surgery/organs/ears.dm @@ -4,6 +4,7 @@ desc = "There are three parts to the ear. Inner, middle and outer. Only one of these parts should be normally visible." zone = BODY_ZONE_HEAD slot = ORGAN_SLOT_EARS + visual = FALSE gender = PLURAL healing_factor = STANDARD_ORGAN_HEALING @@ -96,6 +97,7 @@ icon = 'icons/obj/clothing/head/costume.dmi' worn_icon = 'icons/mob/clothing/head/costume.dmi' icon_state = "kitty" + visual = TRUE bang_protect = -2 /obj/item/organ/ears/cat/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE, pref_load = FALSE) diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 0c2294f1f1d9c..bd693ae55f4ea 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -2,6 +2,7 @@ name = BODY_ZONE_PRECISE_EYES icon_state = "eyeballs" desc = "I see you!" + visual = TRUE zone = BODY_ZONE_PRECISE_EYES slot = ORGAN_SLOT_EYES gender = PLURAL @@ -35,31 +36,35 @@ ///Can these eyes every be cured of blind? - Each eye atom should handle this themselves, don't make this make you blind var/can_see = TRUE -/obj/item/organ/eyes/Insert(mob/living/carbon/M, special = FALSE, drop_if_replaced = FALSE, initialising, pref_load = FALSE) +/obj/item/organ/eyes/Insert(mob/living/carbon/eye_owner, special = FALSE, drop_if_replaced = FALSE, initialising, pref_load = FALSE) . = ..() - if(ishuman(owner)) - var/mob/living/carbon/human/HMN = owner - old_eye_color = HMN.eye_color + if(ishuman(eye_owner)) + var/mob/living/carbon/human/human_owner = eye_owner + old_eye_color = human_owner.eye_color if(eye_color) - HMN.eye_color = eye_color + human_owner.eye_color = eye_color else - eye_color = HMN.eye_color - if(HAS_TRAIT(HMN, TRAIT_NIGHT_VISION) && !lighting_alpha) + eye_color = human_owner.eye_color + if(HAS_TRAIT(human_owner, TRAIT_NIGHT_VISION) && !lighting_alpha) lighting_alpha = LIGHTING_PLANE_ALPHA_NV_TRAIT - M.update_tint() + eye_owner.update_tint() owner.update_sight() - if(M.has_dna() && ishuman(M)) - M.dna.species.handle_body(M) //updates eye icon + if(eye_owner.has_dna() && ishuman(eye_owner)) + eye_owner.dna.species.handle_body(eye_owner) //updates eye icon -/obj/item/organ/eyes/Remove(mob/living/carbon/M, special = 0, pref_load = FALSE) +/obj/item/organ/eyes/Remove(mob/living/carbon/eye_owner, special = 0, pref_load = FALSE) ..() - if(ishuman(M) && eye_color) - var/mob/living/carbon/human/HMN = M - HMN.eye_color = old_eye_color - HMN.update_body() - M.update_tint() - M.update_sight() - + if(ishuman(eye_owner) && eye_color) + var/mob/living/carbon/human/human_owner = eye_owner + human_owner.eye_color = old_eye_color + human_owner.update_body() + eye_owner.update_tint() + eye_owner.update_sight() + +//Gotta reset the eye color, because that persists +/obj/item/organ/eyes/enter_wardrobe() + . = ..() + eye_color = initial(eye_color) /obj/item/organ/eyes/on_life() ..() @@ -398,7 +403,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/abstract/eye_lighting) /obj/item/organ/eyes/moth name = "moth eyes" - desc = "These eyes seem to have increased sensitivity to bright light, with no improvement to low light vision." + desc = "These eyes seem to have increased sensitivity to bright light, with a small improvement to low light vision." + see_in_dark = NIGHTVISION_FOV_RANGE/2 //4 tiles compared to 8 of the apids flash_protect = -1 /obj/item/organ/eyes/snail diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 860b57b037acd..1e00b6aef4be7 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -2,6 +2,7 @@ name = "heart" desc = "I feel bad for the heartless bastard who lost this." icon_state = "heart-on" + visual = FALSE zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_HEART @@ -186,7 +187,8 @@ /obj/item/organ/heart/cybernetic name = "cybernetic heart" desc = "An electronic device designed to mimic the functions of an organic human heart. Also holds an emergency dose of epinephrine, used automatically after facing severe trauma." - icon_state = "heart-c" + icon_state = "heart-c-on" + icon_base = "heart-c" organ_flags = ORGAN_SYNTHETIC status = ORGAN_ROBOTIC var/dose_available = TRUE @@ -211,7 +213,8 @@ /obj/item/organ/heart/cybernetic/upgraded name = "upgraded cybernetic heart" desc = "An electronic device designed to mimic the functions of an organic human heart. Also holds an emergency dose of epinephrine, used automatically after facing severe trauma. This upgraded model can regenerate its dose after use." - icon_state = "heart-c-u" + icon_state = "heart-c-u-on" + icon_base = "heart-c-u" /obj/item/organ/heart/cybernetic/upgraded/used_dose() . = ..() diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index d4962a1048ba2..52137eff8f8b0 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -4,6 +4,7 @@ /obj/item/organ/liver name = "liver" icon_state = "liver" + visual = FALSE w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_LIVER diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 2f00674d27b44..f48cb3f50a008 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -7,6 +7,7 @@ var/operated = FALSE //whether we can still have our damages fixed through surgery name = "lungs" icon_state = "lungs" + visual = FALSE zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_LUNGS gender = PLURAL diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index af54623dc1a0c..c03abb503fd95 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -30,6 +30,9 @@ var/useable = TRUE var/list/food_reagents = list(/datum/reagent/consumable/nutriment = 5) + ///Do we effect the appearance of our mob. Used to save time in preference code + var/visual = TRUE + // Players can look at prefs before atoms SS init, and without this // they would not be able to see external organs, such as moth wings. // This is also necessary because assets SS is before atoms, and so @@ -38,6 +41,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) /obj/item/organ/Initialize(mapload) . = ..() + START_PROCESSING(SSobj, src) if(organ_flags & ORGAN_EDIBLE) AddComponent(/datum/component/edible,\ initial_reagents = food_reagents,\ @@ -125,10 +129,14 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) . += "[src] is starting to look discolored." . += "[src] fit[name[length(name)] == "s" ? "" : "s"] in the [parse_zone(zone)]." -/obj/item/organ/Initialize(mapload) - . = ..() +///Used as callbacks by object pooling +/obj/item/organ/proc/exit_wardrobe() START_PROCESSING(SSobj, src) +//See above +/obj/item/organ/proc/enter_wardrobe() + STOP_PROCESSING(SSobj, src) + /obj/item/organ/Destroy() if(owner) // The special flag is important, because otherwise mobs can die diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index 7fa8137a84036..a41defa1d7389 100755 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -1,6 +1,7 @@ /obj/item/organ/stomach name = "stomach" icon_state = "stomach" + visual = FALSE w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_STOMACH diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm index 445752fefd923..60f3fb6d6146d 100644 --- a/code/modules/surgery/organs/tails.dm +++ b/code/modules/surgery/organs/tails.dm @@ -3,6 +3,7 @@ /obj/item/organ/tail name = "tail" desc = "A severed tail. What did you cut this off of?" + visual = TRUE icon_state = "severedtail" zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_TAIL diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index b1cead0edcf8f..29b39806745f5 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -2,6 +2,7 @@ name = "tongue" desc = "A fleshy muscle mostly used for lying." icon_state = "tonguenormal" + visual = FALSE zone = BODY_ZONE_PRECISE_MOUTH slot = ORGAN_SLOT_TONGUE attack_verb_continuous = list("licks", "slobbers", "slaps", "frenches", "tongues") @@ -352,8 +353,8 @@ desc = "It's long and noodly." say_mod = "flutters" icon_state = "tonguemoth" - liked_food = VEGETABLES | DAIRY | CLOTH - disliked_food = FRUIT | GROSS | GORE + liked_food = FRUIT | VEGETABLES | DAIRY | CLOTH + disliked_food = GROSS | GORE toxic_food = MEAT | RAW /obj/item/organ/tongue/teratoma diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 947be4928b74e..b57a867f0354c 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -7,6 +7,7 @@ /obj/item/organ/vocal_cords //organs that are activated through speech with the :x/MODE_KEY_VOCALCORDS channel name = "vocal cords" icon_state = "appendix" + visual = FALSE zone = BODY_ZONE_PRECISE_MOUTH slot = ORGAN_SLOT_VOICE gender = PLURAL diff --git a/code/modules/surgery/organs/wings.dm b/code/modules/surgery/organs/wings.dm index 0f9c1bbdf39b0..096446f21ba42 100644 --- a/code/modules/surgery/organs/wings.dm +++ b/code/modules/surgery/organs/wings.dm @@ -2,6 +2,7 @@ name = "Pair of wings" desc = "A pair of wings. They look skinny and useless" icon_state = "angelwings" + visual = TRUE zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_WINGS var/flight_level = WINGS_COSMETIC diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index a7bfdce998b28..6a8bf96075e3f 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -36,6 +36,7 @@ #include "food_edibility_check.dm" #include "gamemode_sanity.dm" #include "greyscale_config.dm" +#include "handcuff_tests.dm" #include "heretic_knowledge.dm" #include "heretic_rituals.dm" #include "icon_smoothing_unit_test.dm" @@ -44,6 +45,7 @@ #include "metabolizing.dm" #include "missing_icons.dm" #include "ntnetwork_tests.dm" +#include "outfit_sanity.dm" #include "preference_species.dm" #include "preferences.dm" #include "projectiles.dm" diff --git a/code/modules/unit_tests/handcuff_tests.dm b/code/modules/unit_tests/handcuff_tests.dm new file mode 100644 index 0000000000000..fd12f55c229e3 --- /dev/null +++ b/code/modules/unit_tests/handcuff_tests.dm @@ -0,0 +1,16 @@ +/datum/unit_test/handcuffs/Run() + var/mob/living/carbon/human/first = allocate(/mob/living/carbon/human/consistent) + var/mob/living/carbon/human/second = allocate(/mob/living/carbon/human/consistent) + var/obj/item/restraints/handcuffs/cuffs = allocate(/obj/item/restraints/handcuffs) + // Put the test client inside them + second.Move(get_step(second, NORTH), NORTH) + TEST_ASSERT_EQUAL(second.Adjacent(first), TRUE, "The 2 mobs should be adjacent to each other") + first.a_intent = INTENT_GRAB + first.ClickOn(second) + TEST_ASSERT_EQUAL(second.pulledby, first, "Second mob should be pulled by the first") + first.put_in_active_hand(cuffs) + TEST_ASSERT_EQUAL(first.get_active_held_item(), cuffs, "First mob should be holding handcuffs") + first.ClickOn(second) + TEST_ASSERT_NOTNULL(second.handcuffed, "Second mob should be handcuffed") + // Gah... we need to be able to mock clients.. + TEST_ASSERT_EQUAL(HAS_TRAIT(second, TRAIT_RESTRAINED), TRUE, "The mob should not be able to move while grabbed") diff --git a/code/modules/unit_tests/outfit_sanity.dm b/code/modules/unit_tests/outfit_sanity.dm new file mode 100644 index 0000000000000..b10c321c9f3a4 --- /dev/null +++ b/code/modules/unit_tests/outfit_sanity.dm @@ -0,0 +1,58 @@ +#define CHECK_OUTFIT_SLOT(outfit_key, slot_name) if (outfit.##outfit_key) { \ + H.equip_to_slot_or_del(new outfit.##outfit_key(H), ##slot_name, TRUE); \ + /* We don't check the result of equip_to_slot_or_del because it returns false for random jumpsuits, as they delete themselves on init */ \ + var/obj/item/outfit_item = H.get_item_by_slot(##slot_name); \ + if (!outfit_item) { \ + TEST_FAIL("[outfit.name]'s [#outfit_key] is invalid! Could not equip a [outfit.##outfit_key] into that slot."); \ + } \ + else { \ + outfit_item.on_outfit_equip(H, FALSE, ##slot_name); \ + } \ +} + +/datum/unit_test/outfit_sanity/Run() + var/datum/outfit/prototype_outfit = /datum/outfit + var/prototype_name = initial(prototype_outfit.name) + var/mob/living/carbon/human/H = allocate(/mob/living/carbon/human/consistent) + + for (var/outfit_type in subtypesof(/datum/outfit)) + // Only make one human and keep undressing it because it's much faster + for (var/obj/item/I in H.get_equipped_items(include_pockets = TRUE)) + qdel(I) + + var/datum/outfit/outfit = new outfit_type + + if(outfit.name == prototype_name) + TEST_FAIL("[outfit.type]'s name is invalid! Uses default outfit name!") + outfit.pre_equip(H, TRUE) + + CHECK_OUTFIT_SLOT(uniform, ITEM_SLOT_ICLOTHING) + CHECK_OUTFIT_SLOT(suit, ITEM_SLOT_OCLOTHING) + CHECK_OUTFIT_SLOT(belt, ITEM_SLOT_BELT) + CHECK_OUTFIT_SLOT(gloves, ITEM_SLOT_GLOVES) + CHECK_OUTFIT_SLOT(shoes, ITEM_SLOT_FEET) + CHECK_OUTFIT_SLOT(head, ITEM_SLOT_HEAD) + CHECK_OUTFIT_SLOT(mask, ITEM_SLOT_MASK) + CHECK_OUTFIT_SLOT(neck, ITEM_SLOT_NECK) + CHECK_OUTFIT_SLOT(ears, ITEM_SLOT_EARS) + CHECK_OUTFIT_SLOT(glasses, ITEM_SLOT_EYES) + CHECK_OUTFIT_SLOT(back, ITEM_SLOT_BACK) + CHECK_OUTFIT_SLOT(id, ITEM_SLOT_ID) + CHECK_OUTFIT_SLOT(l_pocket, ITEM_SLOT_LPOCKET) + CHECK_OUTFIT_SLOT(r_pocket, ITEM_SLOT_RPOCKET) + CHECK_OUTFIT_SLOT(suit_store, ITEM_SLOT_SUITSTORE) + if (outfit.backpack_contents || outfit.box) + var/list/backpack_contents = outfit.backpack_contents?.Copy() + if (outfit.box) + if (!backpack_contents) + backpack_contents = list() + backpack_contents.Insert(1, outfit.box) + backpack_contents[outfit.box] = 1 + + for (var/path in backpack_contents) + var/number = backpack_contents[path] || 1 + for (var/_ in 1 to number) + if (!H.equip_to_slot_or_del(new path(H), ITEM_SLOT_BACKPACK, TRUE)) + TEST_FAIL("[outfit.name]'s backpack_contents are invalid! Couldn't add [path] to backpack.") + +#undef CHECK_OUTFIT_SLOT diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index cb65de6ebfe1f..9d1df727cad87 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -264,6 +264,14 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list( cost = 30 purchasable_from = UPLINK_NUKE_OPS +/datum/uplink_item/bundles_TC/machoman + name = "The Macho Wrestler Bundle" + desc = "For the STRONGEST operatives! Master your wrasslin' abilities with this bundle. \ + Contains: A wrestling belt, only for the strongest machos, an adrenaline implanter, a luchador mask to strike fear into your enemies, and a combat hypospray!" + item = /obj/item/storage/backpack/duffelbag/syndie/macho + cost = 18 + purchasable_from = UPLINK_NUKE_OPS + /datum/uplink_item/bundles_TC/contract_kit name = "Contract Kit" desc = "The Syndicate have offered you the chance to become a contractor, take on kidnapping contracts for TC and cash payouts. Upon purchase, \ diff --git a/code/modules/vehicles/mecha/mech_bay.dm b/code/modules/vehicles/mecha/mech_bay.dm index f4f7813010d4c..35afdc8c28d6c 100644 --- a/code/modules/vehicles/mecha/mech_bay.dm +++ b/code/modules/vehicles/mecha/mech_bay.dm @@ -59,19 +59,20 @@ if(!recharging_mech) recharging_mech = locate(/obj/vehicle/sealed/mecha) in recharging_turf if(recharging_mech) - recharge_console.update_icon() - recharge_console.ui_update() - if(recharging_mech && recharging_mech.cell) - if(recharging_mech.cell.charge < recharging_mech.cell.maxcharge) - var/delta = min(recharge_power * delta_time, recharging_mech.cell.maxcharge - recharging_mech.cell.charge) - recharging_mech.give_power(delta) - use_power(delta*150) - else - recharge_console.update_icon() - if(recharging_mech.loc != recharging_turf) - recharging_mech = null - recharge_console.update_icon() + recharge_console.update_appearance() recharge_console.ui_update() + if(!recharging_mech?.cell) + return + if(recharging_mech.cell.charge < recharging_mech.cell.maxcharge) + var/delta = min(recharge_power * delta_time, recharging_mech.cell.maxcharge - recharging_mech.cell.charge) + recharging_mech.give_power(delta) + use_power(delta*150) + else + recharge_console.update_appearance() + if(recharging_mech.loc != recharging_turf) + recharging_mech = null + recharge_console.update_appearance() + recharge_console.ui_update() /obj/machinery/mech_bay_recharge_port/attackby(obj/item/I, mob/user, params) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index ade32c6578524..947d4163f75b9 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -20,8 +20,8 @@ * * A datum that represents a product that is vendable */ -/datum/data/vending_product - name = "generic" +/datum/vending_product + var/name = "generic" ///Typepath of the product that is created when this record "sells" var/product_path = null ///How many of this product we currently have @@ -291,7 +291,7 @@ while (found_anything) found_anything = FALSE for(var/record in shuffle(product_records)) - var/datum/data/vending_product/R = record + var/datum/vending_product/R = record //first dump any of the items that have been returned, in case they contain the nuke disk or something for(var/obj/returned_obj_to_dump in R.returned_products) @@ -320,10 +320,10 @@ /** * Build the inventory of the vending machine from it's product and record lists * - * This builds up a full set of /datum/data/vending_products from the product list of the vending machine type + * This builds up a full set of /datum/vending_products from the product list of the vending machine type * Arguments: * * productlist - the list of products that need to be converted - * * recordlist - the list containing /datum/data/vending_product datums + * * recordlist - the list containing /datum/vending_product datums * * startempty - should we set vending_product record amount from the product list (so it's prefilled at roundstart) */ /obj/machinery/vending/proc/build_inventory(list/productlist, list/recordlist, list/categories, start_empty = FALSE) @@ -340,7 +340,7 @@ amount = 0 var/atom/temp = typepath - var/datum/data/vending_product/R = new /datum/data/vending_product() + var/datum/vending_product/R = new /datum/vending_product() R.name = initial(temp.name) R.product_path = typepath if(!start_empty) @@ -424,7 +424,7 @@ /obj/machinery/vending/proc/refill_inventory(list/productlist, list/recordlist) . = 0 for(var/R in recordlist) - var/datum/data/vending_product/record = R + var/datum/vending_product/record = R var/diff = min(record.max_amount - record.amount, productlist[record.product_path]) if (diff) productlist[record.product_path] -= diff @@ -454,7 +454,7 @@ /obj/machinery/vending/proc/unbuild_inventory(list/recordlist) . = list() for(var/R in recordlist) - var/datum/data/vending_product/record = R + var/datum/vending_product/record = R .[record.product_path] += record.amount /// Put stuff in product_categories if the products have a category, otherwise put them in products @@ -466,7 +466,7 @@ var/list/categories_to_index = list() - for (var/datum/data/vending_product/record as anything in product_records) + for (var/datum/vending_product/record as anything in product_records) var/list/category = record.category var/has_category = !isnull(category) @@ -596,7 +596,7 @@ for(var/i in 1 to freebies) playsound(src, 'sound/machines/machine_vend.ogg', 50, TRUE, extrarange = -3) - for(var/datum/data/vending_product/R in shuffle(product_records)) + for(var/datum/vending_product/R in shuffle(product_records)) if(R.amount <= 0) //Try to use a record that actually has something to dump. continue @@ -718,7 +718,7 @@ return FALSE to_chat(user, "You insert [I] into [src]'s input compartment.") - for(var/datum/data/vending_product/product_datum in product_records + coin_records + hidden_records) + for(var/datum/vending_product/product_datum in product_records + coin_records + hidden_records) if(ispath(I.type, product_datum.product_path)) product_datum.amount++ LAZYADD(product_datum.returned_products, I) @@ -839,7 +839,7 @@ var/list/out_records = list() - for (var/datum/data/vending_product/record as anything in records) + for (var/datum/vending_product/record as anything in records) var/list/static_record = list( path = replacetext(replacetext("[record.product_path]", "/obj/item/", ""), "/", "-"), name = record.name, @@ -881,15 +881,15 @@ .["user"]["cash"] = H.get_accessible_cash() .["user"]["job"] = "No Job" .["user"]["department_bitflag"] = 0 - var/datum/data/record/R = find_record("name", card?.registered_account?.account_holder, GLOB.data_core.general) + var/datum/record/crew/R = find_record(card?.registered_account?.account_holder, GLOB.manifest.general) if(card?.registered_account?.account_job) .["user"]["job"] = card.registered_account.account_job.title .["user"]["department_bitflag"] = card.registered_account.active_departments if(R) - .["user"]["job"] = R.fields["rank"] + .["user"]["job"] = R.rank .["stock"] = list() - for (var/datum/data/vending_product/product_record in product_records + coin_records + hidden_records) + for (var/datum/vending_product/product_record in product_records + coin_records + hidden_records) var/list/product_data = list( name = product_record.name, amount = product_record.amount, @@ -923,7 +923,7 @@ . = TRUE if(!can_vend(usr)) return - var/datum/data/vending_product/product = locate(params["ref"]) + var/datum/vending_product/product = locate(params["ref"]) var/atom/fake_atom = product.product_path var/list/allowed_configs = list() @@ -960,7 +960,7 @@ if(!can_vend(usr)) return vend_ready = FALSE //One thing at a time!! - var/datum/data/vending_product/R = locate(params["ref"]) + var/datum/vending_product/R = locate(params["ref"]) var/list/record_to_check = product_records + coin_records if(extended_inventory) record_to_check = product_records + coin_records + hidden_records @@ -998,7 +998,8 @@ flick(icon_deny,src) vend_ready = TRUE return - else if(!C.registered_account.account_job) + // Department cards cannot be used to order stuff in vendors, we make an exception for the debug card + else if(!C.registered_account.account_job && !istype(C, /obj/item/card/id/syndicate/debug)) say("Departmental accounts have been blacklisted from personal expenses due to embezzlement.") flick(icon_deny, src) vend_ready = TRUE @@ -1103,7 +1104,7 @@ if(!target || target.incorporeal_move >= INCORPOREAL_MOVE_BASIC) return FALSE - for(var/datum/data/vending_product/R in shuffle(product_records)) + for(var/datum/vending_product/R in shuffle(product_records)) if(R.amount <= 0) //Try to use a record that actually has something to dump. continue var/dump_path = R.product_path diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm index 5a9064031ae23..bf9b9c1a86d30 100644 --- a/code/modules/wiremod/shell/brain_computer_interface.dm +++ b/code/modules/wiremod/shell/brain_computer_interface.dm @@ -3,6 +3,7 @@ desc = "An implant that can be placed in a user's head to control circuits using their brain." icon = 'icons/obj/wiremod.dmi' icon_state = "bci" + visual = FALSE zone = BODY_ZONE_HEAD w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index 839198b55b3f5..42724f41b98b1 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -4,6 +4,7 @@ zone = BODY_ZONE_HEAD slot = ORGAN_SLOT_ZOMBIE icon_state = "blacktumor" + visual = FALSE var/causes_damage = TRUE var/datum/species/old_species = /datum/species/human var/living_transformation_time = 30 diff --git a/html/admin/view_variables.css b/html/admin/view_variables.css index b646e4ced161a..adff3f990a088 100644 --- a/html/admin/view_variables.css +++ b/html/admin/view_variables.css @@ -7,6 +7,11 @@ body { font-size: 8pt; display: inline-block; } +.value.colorbox { + font-size: 7pt; + border: 1px solid black; +} + table.matrix { border-collapse: collapse; border-spacing: 0; diff --git a/html/changelog.html b/html/changelog.html index c62329c656fcc..f2b7c0e011032 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,7 +56,220 @@ -->
+
GoonStation 13 Development Team
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b2572c8408c1e..5050722ff4323 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -44875,9 +44875,147 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- bugfix: Stops the cyborg Hyperkinetic Dampening projector field being visible
sometimes when the projector is deleted.
2024-10-31:
+ Aramix:
+ - bugfix: fixed being unable to toggle mulebot power or auto-return
+ - bugfix: fixed getting irrelevant "access denied" messages in chat whenever trying
+ to change settings of an unlocked bot that you normally don't have access to
+ - bugfix: silicons don't have to unlock bots to change their settings anymore
+ - code_imp: cleaned up bot access code
+ - code_imp: changed ui_act() return value to TRUE if unsuccessful or interrupted
+ (as previously expected in some places)
Therealdoooc213:
- balance: syndicate hardsuits are fully acid proof now
XeonMations:
- bugfix: Fixed a missing icon for greyscale tapes
ktlwjec:
- bugfix: Helmet of justice will no longer be invisible when turned on.
+2024-11-01:
+ RDS88-beeman:
+ - bugfix: IPCs no longer contain fleshy human hearts in disguise.
+2024-11-02:
+ PowerfulBacon:
+ - bugfix: Clockcult shadow shackles will now properly prevent the target from moving.
+ - bugfix: Clockwork slab progress bars now display correctly.
+ - bugfix: Fixes progress bars appearing when dragging mobs onto yourself
+ XeonMations, Aramix:
+ - bugfix: fixed health assemblies not working
+2024-11-03:
+ ktlwjec:
+ - bugfix: Mysterious bottle can be interacted with.
+ - bugfix: Mysterious bottle isn't empty.
+2024-11-04:
+ PowerfulBacon:
+ - tweak: Dynamic will no longer be forced to run high-impact rulesets after 100
+ minutes, and will instead resort to spawning whatever it wants.
+2024-11-06:
+ mqiib:
+ - bugfix: Light step now stops your shoes from getting dirty again
+2024-11-07:
+ Therealdoooc213:
+ - bugfix: paramedic bags can now fit all the items they spawn with
+ ghost:
+ - bugfix: Ghosts can now correctly jump to C4's planted on walls/floors when they
+ get the notification
+2024-11-08:
+ Therealdoooc213:
+ - bugfix: Oppenheimer is no longer shot by their own turrets
+ TsunamiAnt:
+ - balance: reduced the billy club's structure damage, you can no longer destroy
+ reinforced walls with it.
+2024-11-09:
+ PestoVerde322:
+ - rscdel: Removed the awaymission content and maps
+ PowerfulBacon:
+ - bugfix: Fixes a callproc exploit.
+ Therealdoooc213:
+ - rscdel: Supersoldier species is removed
+ Tsar-Salat:
+ - bugfix: simplemobs should be able to break down walls again
+ - bugfix: champagne can be poured again
+ - admin: fixed debug id not working with vending machines
+2024-11-10:
+ EvilDragonfiend:
+ - code_imp: minor notification for proc call warning
+ MarkusLarsson421:
+ - tweak: Tweaked Fland a bunch.
+ - bugfix: Removed double plasteel in Robotics.
+ - tweak: Added a second thermo machine in toxins.
+ - tweak: Added Pipe Dispenser to Exploration.
+ PestoVerde322:
+ - tweak: Moths now see better in the dark
+ - balance: Moths can now eat fruit with ease.
+ - balance: Clothing is now contains microplastics
+ - rscadd: Adds microplastics reagent as a subtype of maltodextrin, with half the
+ power and half the metabolization rate. Also makes the mob ingesting them weaker
+ to toxin damage.
+ PowerfulBacon:
+ - bugfix: Fixes some admin actions erronously showing a null user.
+ Rukofamicom:
+ - balance: Gatfruit now spawn .38 revolvers instead of .357. Gatfruit revolvers
+ will have random ammunition loaded into them.
+ Szyszkrzyneczka:
+ - rscdel: Removes gang code
+ - rscdel: Removes sandbox and meteor gamemode
+ Therealdoooc213:
+ - rscadd: A new nuclear operative bundle, The Macho Wrestler! Contains everything
+ you need to wrestle the captain into giving you the disk.
+ - balance: CQC Kick and Chokehold do 10 and 15 seconds of sleep respectively now
+2024-11-11:
+ XeonMations:
+ - tweak: Moths can now eat cloth and cloth subtypes.
+2024-11-13:
+ EvilDragonfiend:
+ - code_imp: VV now shows which color a RGB text refers to.
+2024-11-14:
+ PowerfulBacon:
+ - bugfix: Fixes some issues related to mass explosions
+2024-11-15:
+ mystery3525:
+ - balance: Bloodcrawl now forces you to be in it for at least 5 seconds after entering
+ it.
+ - balance: Now, all slaughter demons drop bodies on death instead of deleting them.
+2024-11-16:
+ ? ''
+ : - imageadd: added new bar signage
+ BriggsIDP:
+ - tweak: Changed the bee sprite
+ mc-oofert, toastgoats, therealdoooc:
+ - rscadd: Trying to put down a rift as a space dragon in a invalid area now shows
+ a balloon alert.
+ - balance: Dragons now have night vision.
+ - balance: Carp have more health and deal more object damage.
+ ninjanomnom, Ghommie, Metekillot, MrMelbert, necromanceranner, Sealed101, XeonMations:
+ - tweak: Potted plants now hide your name when equipped.
+ - rscadd: Added TRAIT_UNKNOWN, when you have this trait, people will not be able
+ to make out anything about you.
+ - refactor: Potted plants are no longer snowflake code, instead uses the tactical
+ component.
+ rkz, Akrilla, Mothblocks, LemonInTheDark, Firecage, MrMelbert:
+ - refactor: Preferences menu will now re-use shared wardrobe items, making previews
+ update faster.
+ - code_imp: Adds unit test for the wardrobe system
+ - refactor: Refactors survivalboxes to be less copypaste
+ - code_imp: Standardizes storage holdability
+ - bugfix: Fixes runtime when loading dummies in prefs or select-equipment context
+ verb
+ rkz, Ghommie, Tastyfish:
+ - refactor: refactored proximity monitors(AOE spells like timestop, peaceborg dampeners,
+ and facehugger ranges) to be less CPU-intensive
+2024-11-17:
+ marshmellow10, thevandie:
+ - rscadd: Added badges for the Detective and Security
+2024-11-18:
+ MarkusLarsson421:
+ - bugfix: Fixed Syndicate Outpost Rabbit laying error eggs.
+ Marshmellow105:
+ - bugfix: fixed the officer and detective badges visual bug
+ PowerfulBacon:
+ - balance: Removes alpha passthrough on laser projectiles
+ ? jlsnow301, robbertapir, atosti, lessthnthree, JupiterJaeden, NamelessFairy, Vincent983,
+ JohnFulpWillard, 00-Steven, GoldenAlpharex, Archemagus, XeonMations
+ : - refactor: Refactored the security, medical and general manifests to TGUI.
+2024-11-19:
+ itsmeow:
+ - bugfix: Fix TGFont icons (nonbinary character icon, Nanotrasen, Syndicate, etc.)
+ not displaying in TGUIs on the live server.
+ - code_imp: Re-adds TGFont to the juke build process.
diff --git a/html/changelogs/AutoChangeLog-pr-11747.yml b/html/changelogs/AutoChangeLog-pr-11747.yml
deleted file mode 100644
index 34b2253f8600e..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-11747.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: Aramix
-delete-after: true
-changes:
- - bugfix: fixed being unable to toggle mulebot power or auto-return
- - bugfix: fixed getting irrelevant "access denied" messages in chat whenever trying
- to change settings of an unlocked bot that you normally don't have access to
- - bugfix: silicons don't have to unlock bots to change their settings anymore
- - code_imp: cleaned up bot access code
- - code_imp: changed ui_act() return value to TRUE if unsuccessful or interrupted
- (as previously expected in some places)
diff --git a/icons/mob/accessories.dmi b/icons/mob/accessories.dmi
index 8d9f5eafddc99..9da325b3a7f70 100644
Binary files a/icons/mob/accessories.dmi and b/icons/mob/accessories.dmi differ
diff --git a/icons/mob/bees.dmi b/icons/mob/bees.dmi
index 23bc030175661..c455d8bb45308 100644
Binary files a/icons/mob/bees.dmi and b/icons/mob/bees.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index cd708071faf38..cda07d5a8a15a 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/obj/barsigns.dmi b/icons/obj/barsigns.dmi
index 74cffb2056398..b9694968e55da 100644
Binary files a/icons/obj/barsigns.dmi and b/icons/obj/barsigns.dmi differ
diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi
index f316100a3bf40..c272da5d4db13 100644
Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ
diff --git a/icons/obj/machines/photobooth.dmi b/icons/obj/machines/photobooth.dmi
new file mode 100644
index 0000000000000..c4e812bdf47f1
Binary files /dev/null and b/icons/obj/machines/photobooth.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 91da670af4212..95ee4cdd84204 100755
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/tgui/packages/tgui/interfaces/CloningConsole.js b/tgui/packages/tgui/interfaces/CloningConsole.js
index 6a3de0b8a3a42..3264ad4c42a26 100644
--- a/tgui/packages/tgui/interfaces/CloningConsole.js
+++ b/tgui/packages/tgui/interfaces/CloningConsole.js
@@ -11,6 +11,8 @@ export const CloningConsole = (props, context) => {
const lacksMachine = data.lacksMachine || [];
const diskData = data.diskData || [];
const records = data.records || [];
+ const diskette = data.diskette;
+
return (
19 November 2024
+itsmeow updated:
+-
+
- Fix TGFont icons (nonbinary character icon, Nanotrasen, Syndicate, etc.) not displaying in TGUIs on the live server. +
- Re-adds TGFont to the juke build process. +
18 November 2024
+MarkusLarsson421 updated:
+-
+
- Fixed Syndicate Outpost Rabbit laying error eggs. +
Marshmellow105 updated:
+-
+
- fixed the officer and detective badges visual bug +
PowerfulBacon updated:
+-
+
- Removes alpha passthrough on laser projectiles +
jlsnow301, robbertapir, atosti, lessthnthree, JupiterJaeden, NamelessFairy, Vincent983, JohnFulpWillard, 00-Steven, GoldenAlpharex, Archemagus, XeonMations updated:
+-
+
- Refactored the security, medical and general manifests to TGUI. +
17 November 2024
+marshmellow10, thevandie updated:
+-
+
- Added badges for the Detective and Security +
16 November 2024
+updated:
+-
+
- added new bar signage +
BriggsIDP updated:
+-
+
- Changed the bee sprite +
mc-oofert, toastgoats, therealdoooc updated:
+-
+
- Trying to put down a rift as a space dragon in a invalid area now shows a balloon alert. +
- Dragons now have night vision. +
- Carp have more health and deal more object damage. +
ninjanomnom, Ghommie, Metekillot, MrMelbert, necromanceranner, Sealed101, XeonMations updated:
+-
+
- Potted plants now hide your name when equipped. +
- Added TRAIT_UNKNOWN, when you have this trait, people will not be able to make out anything about you. +
- Potted plants are no longer snowflake code, instead uses the tactical component. +
rkz, Akrilla, Mothblocks, LemonInTheDark, Firecage, MrMelbert updated:
+-
+
- Preferences menu will now re-use shared wardrobe items, making previews update faster. +
- Adds unit test for the wardrobe system +
- Refactors survivalboxes to be less copypaste +
- Standardizes storage holdability +
- Fixes runtime when loading dummies in prefs or select-equipment context verb +
rkz, Ghommie, Tastyfish updated:
+-
+
- refactored proximity monitors(AOE spells like timestop, peaceborg dampeners, and facehugger ranges) to be less CPU-intensive +
15 November 2024
+mystery3525 updated:
+-
+
- Bloodcrawl now forces you to be in it for at least 5 seconds after entering it. +
- Now, all slaughter demons drop bodies on death instead of deleting them. +
14 November 2024
+PowerfulBacon updated:
+-
+
- Fixes some issues related to mass explosions +
13 November 2024
+EvilDragonfiend updated:
+-
+
- VV now shows which color a RGB text refers to. +
11 November 2024
+XeonMations updated:
+-
+
- Moths can now eat cloth and cloth subtypes. +
10 November 2024
+EvilDragonfiend updated:
+-
+
- minor notification for proc call warning +
MarkusLarsson421 updated:
+-
+
- Tweaked Fland a bunch. +
- Removed double plasteel in Robotics. +
- Added a second thermo machine in toxins. +
- Added Pipe Dispenser to Exploration. +
PestoVerde322 updated:
+-
+
- Moths now see better in the dark +
- Moths can now eat fruit with ease. +
- Clothing is now contains microplastics +
- Adds microplastics reagent as a subtype of maltodextrin, with half the power and half the metabolization rate. Also makes the mob ingesting them weaker to toxin damage. +
PowerfulBacon updated:
+-
+
- Fixes some admin actions erronously showing a null user. +
Rukofamicom updated:
+-
+
- Gatfruit now spawn .38 revolvers instead of .357. Gatfruit revolvers will have random ammunition loaded into them. +
Szyszkrzyneczka updated:
+-
+
- Removes gang code +
- Removes sandbox and meteor gamemode +
Therealdoooc213 updated:
+-
+
- A new nuclear operative bundle, The Macho Wrestler! Contains everything you need to wrestle the captain into giving you the disk. +
- CQC Kick and Chokehold do 10 and 15 seconds of sleep respectively now +
09 November 2024
+PestoVerde322 updated:
+-
+
- Removed the awaymission content and maps +
PowerfulBacon updated:
+-
+
- Fixes a callproc exploit. +
Therealdoooc213 updated:
+-
+
- Supersoldier species is removed +
Tsar-Salat updated:
+-
+
- simplemobs should be able to break down walls again +
- champagne can be poured again +
- fixed debug id not working with vending machines +
08 November 2024
+Therealdoooc213 updated:
+-
+
- Oppenheimer is no longer shot by their own turrets +
TsunamiAnt updated:
+-
+
- reduced the billy club's structure damage, you can no longer destroy reinforced walls with it. +
07 November 2024
+Therealdoooc213 updated:
+-
+
- paramedic bags can now fit all the items they spawn with +
ghost updated:
+-
+
- Ghosts can now correctly jump to C4's planted on walls/floors when they get the notification +
06 November 2024
+mqiib updated:
+-
+
- Light step now stops your shoes from getting dirty again +
04 November 2024
+PowerfulBacon updated:
+-
+
- Dynamic will no longer be forced to run high-impact rulesets after 100 minutes, and will instead resort to spawning whatever it wants. +
03 November 2024
+ktlwjec updated:
+-
+
- Mysterious bottle can be interacted with. +
- Mysterious bottle isn't empty. +
02 November 2024
+PowerfulBacon updated:
+-
+
- Clockcult shadow shackles will now properly prevent the target from moving. +
- Clockwork slab progress bars now display correctly. +
- Fixes progress bars appearing when dragging mobs onto yourself +
XeonMations, Aramix updated:
+-
+
- fixed health assemblies not working +
01 November 2024
+RDS88-beeman updated:
+-
+
- IPCs no longer contain fleshy human hearts in disguise. +
31 October 2024
+Aramix updated:
+-
+
- fixed being unable to toggle mulebot power or auto-return +
- fixed getting irrelevant "access denied" messages in chat whenever trying to change settings of an unlocked bot that you normally don't have access to +
- silicons don't have to unlock bots to change their settings anymore +
- cleaned up bot access code +
- changed ui_act() return value to TRUE if unsuccessful or interrupted (as previously expected in some places) +
Therealdoooc213 updated:
- syndicate hardsuits are fully acid proof now @@ -872,247 +1085,6 @@
- fixes mind nulls upon transformation. Should resolve antag datums leaving lings and mobs losing the ability to speak after transforming
- regen organs now considers unremovable organs, like heretic hearts. You wont have your heretic heart qdel'd if you are ahealed.
rkz, cobby updated:
17 September 2024
-PowerfulBacon updated:
--
-
- Implements the ability to lint for required neighbors in maplint. -
16 September 2024
-Tsar-Salat updated:
--
-
- deletes some unused UI assets -
15 September 2024
-DarnTheMarn updated:
--
-
- Removed an unused AI lawset referencing American politics -
MarkusLarsson421 updated:
--
-
- Changed pre-made AI shells to spawn with a tier 1 cell instead of a null cell. -
Programs-The-Station updated:
--
-
- Ashwalkers always spawn on Lavaland now. -
13 September 2024
-Generic DM, PositiveEntropy, Markus Larsson, ClownMoff, XeonMations updated:
--
-
- Added crate shelves to the game! -
MarkusLarsson421 updated:
--
-
- Allows Cyborgs to have their selected module reset via a pulse. -
12 September 2024
-HowToLoLu updated:
--
-
- Introduces a new mapping linter check for windows and doors on space -
Rukofamicom updated:
--
-
- Races with a mutant heart will always spawn with their heart now. This means nightmares are no longer totally heartless. This means nightmares spawn with a light eater again, since this is directly tied to them having a heart. We love spaghetti in coderhaus -
XeonMations updated:
--
-
- Fixed the player panel showing an error when opened. -
11 September 2024
-HowToLoLu updated:
--
-
- Fixed a bad del on vending machines due to two unused variables being qdeleted. -
XeonMations updated:
--
-
- Tapes now hold 20 minutes worth of recordings, 10 on each side. -
- Added more sounds to the universal recorder. -
rkz, TiviPlus, TemporalOroboros, Timberpoes, MLGTASTICa updated:
--
-
- refactors mech initialization -
- refactors medical mech tools -
- adds lazylist support for vehicle occupants -
- Phazons no longer can exponentially increase speed by phasing through certain things... -
10 September 2024
-PowerfulBacon, AffectedArc updated:
--
-
- Enforces warnings in OD lints aggressively. -
SyncIt21, 13spacemen, SuperSayu, ZephyrTFA, MrMelbert, TiviPlus, AnturK, LemonInTheDark, Kylerace, Ghilker, Fikou, Ben10Omintrix, Ghommie, ShizCalev, SyncIt21, Timberpoes, stylemistake, MacBlaze1, robbertapir, timothymtorres, haukeschuemann, JohnFulpWillard, XeonMations updated:
--
-
- Updated assembly code to be more in line with TG"s -
- Updated beam datum code to be more in line with TG"s as well -
- Fixed infrared sensors creating two beams when thrown diagonally -
- Added the ability to place assemblies on welding tanks -
rkz, Tralezab, Timberpoes, Ghommie updated:
--
-
- refactors species.dm organs and features -
- folded default_features into mutant_bodyparts -
- fixed hacky override for lizards, now spines work in the preference menu from the get-go. -
- sensory regeneration no longer sprouts new tails -
09 September 2024
-Aramix updated:
--
-
- fixed nanite comms programs (forced speech, skull echo, hallucination) to work with nanite communication remote -
PestoVerde322 updated:
--
-
- Fixed repeating categories in the crafting menu. -
- Sorted and standardized all the recipes, please DO NOT put the recipes outside of that folder and stick to the format of all the other recipes. -
- Rebalanced the times to craft and interaction of some recipes. -
PowerfulBacon updated:
--
-
- Holoparasites, Mindslave Lasso and The Blast Cannon are no longer purchasable by wizards or traitors due to being broken. -
Tsar-Salat updated:
--
-
- fixes clothing eating checks -
- eating clothes is now based on what tongue you have, rather than what species you are -
rkz, PaxilManiac, Kryson, Qustinnus, nightred, Greniza, junkgle01 updated:
--
-
- Separates plates from food sprites, into their own item. They come in three sizes, and break when thrown! -
- Serving Trays can now be attached to belts, anticipating its increased usage. -
- resprites brioche, Vanilla, and ChocolateStrawberry cakes -
- removed duplicate update of plane, when layer is already changed -
08 September 2024
-Ghommie, XeonMations updated:
--
-
- Fixed space movement -
- Proper floating animations when in no gravity -
- Possibly fixed an oversight which involved highpop and floating animations -
Patience updated:
--
-
- Bandanas can now be worn in the head/neck slots without error texture -
PowerfulBacon updated:
--
-
- Fixes flaky tests not running -
- Fixes a race condition in the prison holodeck. -
- Fixes shuttle loading taking 30 seconds. -
- Fixes race condition in atmos processing which results in unit tests failing due to shuttles loading post-roundstart. -
- Fixes a maploading race condition that would result in invalid caches being used while loading maps. -
Rukofamicom updated:
--
-
- Players are no longer limited to a single positronic brain per round. -
- Cyborgs may no longer have duplicate names, unless they are being rebuilt from the same brain that was previously a cyborg - if you are respawning as a fresh cyborg and do not choose a different character profile first, you will be given the default cyborg name instead of becoming a second copy of the same cyborg. -
- Service borg glasses and graspers are no longer covered in industrial glue and can actually be used to serve drinks again -
- Service and Medical cyborgs can now synthesize standard, 50u drinking glasses and beakers respectively with their graspers. Simply use their grasping tool with nothing in it to produce one. -
- Medical and service cyborgs can both hold a much wider variety of reagent containers now -
- Service cyborgs can now synthesize a wider variety of drinks instead of being primarily focused on alcoholic beverages. -
SuperPantsHero updated:
--
-
- fixed RCD and RPD upgrades -
07 September 2024
-ToasterBiome updated:
--
-
- Centcom Ban DB is now accessible again through PP -
05 September 2024
-Varo, Bombyy, PigeonVerde updated:
--
-
- BoxStation: Reworked the service area and maintenance -
- BoxStation: Reworked the medbay area and maintenance -
- BoxStation: a room for the psychiatrist in medbay -
- BoxStation: fixed chaplain backroom having a weird shape -
- BoxStation: Added a new area, apc and air alarm for the captain room -
- BoxStation: Fixes floating cameras and doble pipes and cables errors -
- BoxStation: Fixes stools directions and types -
04 September 2024
-Programs-The-Station, Rukofamicom updated:
--
-
- You can now Latejoin directly as an on-station posibrain. -
- Due to Job-code, Positronic Brain is now a job. -
03 September 2024
-Geatish updated:
--
-
- Empty blood packs can now be printed from the med lathe -
- health analyzer is no longer printable from a hacked autolathe -
02 September 2024
-PowerfulBacon updated:
--
-
- Fixes some mapping issues with DeltaStation. -
- Fixes a bunch of mapping issues with CorgStation -
Rukofamicom, Fikou updated:
--
-
- Concussive gauntlets have arrived! Shaft miners will find that the diamond pickaxe can no longer be found in tendril chests, and instead they may find concussive gauntlets! -
- Tumor shards will now poll ghosts for control of lavaland elites if the original player has left the body. There is still no guarantee of having a new pet if alternatives are not available. -
- Gibtonite fuses are no longer variable so that miners with good timing are more consistently rewarded for risking life and limb to try and defuse it. -
- PKA modkits have been standardized to cost either 0%, 25%, or 50% capacity. This means it is now possible to utilize 100% of the weapon's potential and up to four impactful mods may now be installed! -
- PKA modkits that do AoE damage have had their power doubled, but still have an upper limit of 80% normal power. It is now far more practical to install AoE damage mods, but will still weaken the power of the weapon overall in exchange for versatility. -
- Damage increasing modkits have had their power halved. This was overlooked during the major lavaland rebalance that halved the HP of all fauna and halved the damage of mining tools. Damage modkits are supposed to increase damage by 25% of base power, not 50%. -
- All modkits are now compatible with mine bots, and the special cooldown reduction mod has been removed since the normal cooldown mod works on them now. Mine bots have the same capacity for mods as a PKA. -
- Explorer webbing can now hold additional mining tools and items: shovel, survival knife, emergency oxygen tank, PKA and plasma cutters. It can no longer hold kitchen knives. -
- Cleaned up some variable names and unnecessary code within the kinetic_accelerator file. -
01 September 2024
-Aramix updated:
--
-
- pacified all pets spawned by Xenobiology's Stabilized Gold -
MarkusLarsson421 updated:
--
-
- Fixed so that Efficiency Law board can be printed. -
- Changed the name of the Crewsimov board from "Default" to "Crewsimov". -
Penwin0 updated:
--
-
- Plague Doctor hat no longer covers the face and doesn't look like a biohood when held. -
PowerfulBacon updated:
--
-
- Adds in a new mapping helper for mapping disposal networks. -
XeonMations updated:
--
-
- Bodybags can no longer be heirlooms. -
- Medical flashlight pens, scalpels and suit sensors can now be heirlooms. -
rkz updated:
--
-
- 15 base stamina damage is dealt every time a failed jump is attempted on a multi-z map -
31 August 2024
-PowerfulBacon updated:
--
-
- Fixes some mapping issues with RuntimeStation -
30 August 2024
-XeonMations updated:
--
-
- Fixed revenants being able to fall down z levels -
- Certain FLYING checks now also check for FLOATING movetypes. -