[command_name()] Update
" + if(!sender_override) + announcement += "[command_name()] Update
" + else + announcement += "[sender_override]
" if (title && length(title) > 0) announcement += "[html_encode(title)]
" - if(title == "") - GLOB.news_network.SubmitArticle(text, "Central Command Update", "Station Announcements", null) - else - GLOB.news_network.SubmitArticle(title + "" + text, "Central Command", "Station Announcements", null) + + if(!sender_override) + if(title == "") + GLOB.news_network.SubmitArticle(text, "Central Command Update", "Station Announcements", null) + else + GLOB.news_network.SubmitArticle(title + "
" + text, "Central Command", "Station Announcements", null) announcement += "
[html_encode(text)]
" announcement += "
" @@ -38,14 +43,11 @@ if(announce) priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/ai/commandreport.ogg') - for(var/obj/machinery/computer/communications/C in GLOB.machines) - if(!(C.stat & (BROKEN|NOPOWER)) && (C.z in GLOB.station_z_levels)) - var/obj/item/paper/P = new /obj/item/paper(C.loc) - P.name = "paper - '[title]'" - P.info = text - C.messagetitle.Add("[title]") - C.messagetext.Add(text) - P.update_icon() + var/datum/comm_message/M = new + M.title = title + M.content = text + + SScommunications.send_message(M) /proc/minor_announce(message, title = "Attention:", alert) if(!message) diff --git a/code/__HELPERS/stat_tracking.dm b/code/__HELPERS/stat_tracking.dm new file mode 100644 index 0000000000..007cd2695d --- /dev/null +++ b/code/__HELPERS/stat_tracking.dm @@ -0,0 +1,13 @@ +/proc/render_stats(list/stats, user, sort = /proc/cmp_generic_stat_item_time) + sortTim(stats, sort, TRUE) + + var/list/lines = list() + + for (var/entry in stats) + var/list/data = stats[entry] + lines += "[entry] => [num2text(data[STAT_ENTRY_TIME], 10)]ms ([data[STAT_ENTRY_COUNT]]) (avg:[num2text(data[STAT_ENTRY_TIME]/(data[STAT_ENTRY_COUNT] || 1), 99)])" + + if (user) + user << browse("
- [lines.Join("
- ")]
" var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar if(G) - var/time_info + var/time_info = G.get_arrival_time(FALSE) var/time_name if(G.seconds_until_activation) - time_info = G.seconds_until_activation time_name = "until the Ark activates" else if(G.grace_period) - time_info = G.grace_period time_name = "of grace period remaining" else if(G.progress_in_seconds) - time_info = GATEWAY_RATVAR_ARRIVAL - G.progress_in_seconds time_name = "until the Ark finishes summoning" if(time_info) textlist += "[time_info / 60] minutes [time_name].
" diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index 12253cc550..58f0fb18a2 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -1,175 +1,177 @@ - -/mob - var/list/screens = list() - -/mob/proc/overlay_fullscreen(category, type, severity) - var/obj/screen/fullscreen/screen - if(screens[category]) - screen = screens[category] - if(screen.type != type) - clear_fullscreen(category, FALSE) - return .() - else if(!severity || severity == screen.severity) - return null - else - screen = new type() - - screen.icon_state = "[initial(screen.icon_state)][severity]" - screen.severity = severity - - screens[category] = screen - if(client && screen.should_show_to(src)) - client.screen += screen - return screen - -/mob/proc/clear_fullscreen(category, animated = 10) - var/obj/screen/fullscreen/screen = screens[category] - if(!screen) - return - - screens -= category - - if(animated) - animate(screen, alpha = 0, time = animated) - addtimer(CALLBACK(src, .proc/clear_fullscreen_after_animate, screen), animated, TIMER_CLIENT_TIME) - else - if(client) - client.screen -= screen - qdel(screen) - -/mob/proc/clear_fullscreen_after_animate(obj/screen/fullscreen/screen) - if(client) - client.screen -= screen - qdel(screen) - -/mob/proc/clear_fullscreens() - for(var/category in screens) - clear_fullscreen(category) - -/mob/proc/hide_fullscreens() - if(client) - for(var/category in screens) - client.screen -= screens[category] - -/mob/proc/reload_fullscreen() - if(client) - var/obj/screen/fullscreen/screen - for(var/category in screens) - screen = screens[category] - if(screen.should_show_to(src)) - client.screen |= screen - else - client.screen -= screen - -/obj/screen/fullscreen - icon = 'icons/mob/screen_full.dmi' - icon_state = "default" - screen_loc = "CENTER-7,CENTER-7" - layer = FULLSCREEN_LAYER - plane = FULLSCREEN_PLANE - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - var/severity = 0 - var/show_when_dead = FALSE - -/obj/screen/fullscreen/proc/should_show_to(mob/mymob) - if(!show_when_dead && mymob.stat == DEAD) - return FALSE - return TRUE - -/obj/screen/fullscreen/Destroy() - severity = 0 - . = ..() - -/obj/screen/fullscreen/brute - icon_state = "brutedamageoverlay" - layer = UI_DAMAGE_LAYER - plane = FULLSCREEN_PLANE - -/obj/screen/fullscreen/oxy - icon_state = "oxydamageoverlay" - layer = UI_DAMAGE_LAYER - plane = FULLSCREEN_PLANE - -/obj/screen/fullscreen/crit - icon_state = "passage" - layer = CRIT_LAYER - plane = FULLSCREEN_PLANE - -/obj/screen/fullscreen/crit/vision - icon_state = "oxydamageoverlay" - layer = BLIND_LAYER - -/obj/screen/fullscreen/blind - icon_state = "blackimageoverlay" - layer = BLIND_LAYER - plane = FULLSCREEN_PLANE - -/obj/screen/fullscreen/curse - icon_state = "curse" - layer = CURSE_LAYER - plane = FULLSCREEN_PLANE - -/obj/screen/fullscreen/impaired - icon_state = "impairedoverlay" - -/obj/screen/fullscreen/blurry - icon = 'icons/mob/screen_gen.dmi' - screen_loc = "WEST,SOUTH to EAST,NORTH" - icon_state = "blurry" - -/obj/screen/fullscreen/flash - icon = 'icons/mob/screen_gen.dmi' - screen_loc = "WEST,SOUTH to EAST,NORTH" - icon_state = "flash" - -/obj/screen/fullscreen/flash/static - icon = 'icons/mob/screen_gen.dmi' - screen_loc = "WEST,SOUTH to EAST,NORTH" - icon_state = "noise" - -/obj/screen/fullscreen/high - icon = 'icons/mob/screen_gen.dmi' - screen_loc = "WEST,SOUTH to EAST,NORTH" - icon_state = "druggy" - -/obj/screen/fullscreen/color_vision - icon = 'icons/mob/screen_gen.dmi' - screen_loc = "WEST,SOUTH to EAST,NORTH" - icon_state = "flash" - alpha = 80 - -/obj/screen/fullscreen/color_vision/green - color = "#00ff00" - -/obj/screen/fullscreen/color_vision/red - color = "#ff0000" - -/obj/screen/fullscreen/color_vision/blue - color = "#0000ff" - -/obj/screen/fullscreen/lighting_backdrop - icon = 'icons/mob/screen_gen.dmi' - icon_state = "flash" - transform = matrix(200, 0, 0, 0, 200, 0) - plane = LIGHTING_PLANE - blend_mode = BLEND_OVERLAY - show_when_dead = TRUE - -//Provides darkness to the back of the lighting plane -/obj/screen/fullscreen/lighting_backdrop/lit - invisibility = INVISIBILITY_LIGHTING - layer = BACKGROUND_LAYER+21 - color = "#000" - show_when_dead = TRUE - -//Provides whiteness in case you don't see lights so everything is still visible -/obj/screen/fullscreen/lighting_backdrop/unlit - layer = BACKGROUND_LAYER+20 - show_when_dead = TRUE - -/obj/screen/fullscreen/see_through_darkness - icon_state = "nightvision" - plane = LIGHTING_PLANE - layer = LIGHTING_LAYER - blend_mode = BLEND_ADD - show_when_dead = TRUE +/mob + var/list/screens = list() + +/mob/proc/overlay_fullscreen(category, type, severity) + var/obj/screen/fullscreen/screen = screens[category] + if (!screen || screen.type != type) + // needs to be recreated + clear_fullscreen(category, FALSE) + screens[category] = screen = new type() + else if ((!severity || severity == screen.severity) && (!client || screen.screen_loc != "CENTER-7,CENTER-7" || screen.view == client.view)) + // doesn't need to be updated + return screen + + screen.icon_state = "[initial(screen.icon_state)][severity]" + screen.severity = severity + if (client && screen.should_show_to(src)) + client.screen += screen + if (screen.screen_loc == "CENTER-7,CENTER-7" && screen.view != client.view) + var/scale = (1 + 2 * client.view) / 15 + screen.view = client.view + screen.transform = matrix(scale, 0, 0, 0, scale, 0) + + return screen + +/mob/proc/clear_fullscreen(category, animated = 10) + var/obj/screen/fullscreen/screen = screens[category] + if(!screen) + return + + screens -= category + + if(animated) + animate(screen, alpha = 0, time = animated) + addtimer(CALLBACK(src, .proc/clear_fullscreen_after_animate, screen), animated, TIMER_CLIENT_TIME) + else + if(client) + client.screen -= screen + qdel(screen) + +/mob/proc/clear_fullscreen_after_animate(obj/screen/fullscreen/screen) + if(client) + client.screen -= screen + qdel(screen) + +/mob/proc/clear_fullscreens() + for(var/category in screens) + clear_fullscreen(category) + +/mob/proc/hide_fullscreens() + if(client) + for(var/category in screens) + client.screen -= screens[category] + +/mob/proc/reload_fullscreen() + if(client) + var/obj/screen/fullscreen/screen + for(var/category in screens) + screen = screens[category] + if(screen.should_show_to(src)) + client.screen |= screen + else + client.screen -= screen + +/obj/screen/fullscreen + icon = 'icons/mob/screen_full.dmi' + icon_state = "default" + screen_loc = "CENTER-7,CENTER-7" + layer = FULLSCREEN_LAYER + plane = FULLSCREEN_PLANE + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + var/view = 7 + var/severity = 0 + var/show_when_dead = FALSE + +/obj/screen/fullscreen/proc/should_show_to(mob/mymob) + if(!show_when_dead && mymob.stat == DEAD) + return FALSE + return TRUE + +/obj/screen/fullscreen/Destroy() + severity = 0 + . = ..() + +/obj/screen/fullscreen/brute + icon_state = "brutedamageoverlay" + layer = UI_DAMAGE_LAYER + plane = FULLSCREEN_PLANE + +/obj/screen/fullscreen/oxy + icon_state = "oxydamageoverlay" + layer = UI_DAMAGE_LAYER + plane = FULLSCREEN_PLANE + +/obj/screen/fullscreen/crit + icon_state = "passage" + layer = CRIT_LAYER + plane = FULLSCREEN_PLANE + +/obj/screen/fullscreen/crit/vision + icon_state = "oxydamageoverlay" + layer = BLIND_LAYER + +/obj/screen/fullscreen/blind + icon_state = "blackimageoverlay" + layer = BLIND_LAYER + plane = FULLSCREEN_PLANE + +/obj/screen/fullscreen/curse + icon_state = "curse" + layer = CURSE_LAYER + plane = FULLSCREEN_PLANE + +/obj/screen/fullscreen/impaired + icon_state = "impairedoverlay" + +/obj/screen/fullscreen/blurry + icon = 'icons/mob/screen_gen.dmi' + screen_loc = "WEST,SOUTH to EAST,NORTH" + icon_state = "blurry" + +/obj/screen/fullscreen/flash + icon = 'icons/mob/screen_gen.dmi' + screen_loc = "WEST,SOUTH to EAST,NORTH" + icon_state = "flash" + +/obj/screen/fullscreen/flash/static + icon = 'icons/mob/screen_gen.dmi' + screen_loc = "WEST,SOUTH to EAST,NORTH" + icon_state = "noise" + +/obj/screen/fullscreen/high + icon = 'icons/mob/screen_gen.dmi' + screen_loc = "WEST,SOUTH to EAST,NORTH" + icon_state = "druggy" + +/obj/screen/fullscreen/color_vision + icon = 'icons/mob/screen_gen.dmi' + screen_loc = "WEST,SOUTH to EAST,NORTH" + icon_state = "flash" + alpha = 80 + +/obj/screen/fullscreen/color_vision/green + color = "#00ff00" + +/obj/screen/fullscreen/color_vision/red + color = "#ff0000" + +/obj/screen/fullscreen/color_vision/blue + color = "#0000ff" + +/obj/screen/fullscreen/lighting_backdrop + icon = 'icons/mob/screen_gen.dmi' + icon_state = "flash" + transform = matrix(200, 0, 0, 0, 200, 0) + plane = LIGHTING_PLANE + blend_mode = BLEND_OVERLAY + show_when_dead = TRUE + +//Provides darkness to the back of the lighting plane +/obj/screen/fullscreen/lighting_backdrop/lit + invisibility = INVISIBILITY_LIGHTING + layer = BACKGROUND_LAYER+21 + color = "#000" + show_when_dead = TRUE + +//Provides whiteness in case you don't see lights so everything is still visible +/obj/screen/fullscreen/lighting_backdrop/unlit + layer = BACKGROUND_LAYER+20 + show_when_dead = TRUE + +/obj/screen/fullscreen/see_through_darkness + icon_state = "nightvision" + plane = LIGHTING_PLANE + layer = LIGHTING_LAYER + blend_mode = BLEND_ADD + show_when_dead = TRUE + diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 79271d1d6d..45bfbeb4fa 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -539,7 +539,7 @@ screen_loc = ui_healthdoll /obj/screen/splash - icon = 'config/title_screens/images/title1.dmi' + icon = 'icons/blank_title.png' icon_state = "" screen_loc = "1,1" layer = SPLASHSCREEN_LAYER diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index de1dfdbf67..acdccba3df 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -1,12 +1,29 @@ /obj/item/proc/melee_attack_chain(mob/user, atom/target, params) - if(pre_attackby(target, user, params)) + if(!tool_check(user, target) && pre_attackby(target, user, params)) // Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example) var/resolved = target.attackby(src, user, params) if(!resolved && target && !QDELETED(src)) afterattack(target, user, 1, params) // 1: clicking something Adjacent +//Checks if the item can work as a tool, calling the appropriate tool behavior on the target +/obj/item/proc/tool_check(mob/user, atom/target) + switch(tool_behaviour) + if(TOOL_NONE) + return FALSE + if(TOOL_CROWBAR) + return target.crowbar_act(user, src) + if(TOOL_MULTITOOL) + return target.multitool_act(user, src) + if(TOOL_SCREWDRIVER) + return target.screwdriver_act(user, src) + if(TOOL_WRENCH) + return target.wrench_act(user, src) + if(TOOL_WIRECUTTER) + return target.wirecutter_act(user, src) + + // Called when the item is in the active hand, and clicked; alternately, there is an 'activate held object' verb or you can hit pagedown. /obj/item/proc/attack_self(mob/user) SendSignal(COMSIG_ITEM_ATTACK_SELF, user) @@ -118,5 +135,4 @@ attack_message = "[user] has [message_verb] [src][message_hit_area] with [I]!" visible_message("[attack_message]", \ "[attack_message]", null, COMBAT_MESSAGE_RANGE) - return 1 - + return 1 \ No newline at end of file diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index 55f3e83b61..5ca74b8eee 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -53,23 +53,19 @@ if(user.client) if(IsAdminGhost(user)) attack_ai(user) - if(user.client.prefs.inquisitive_ghost) + else if(user.client.prefs.inquisitive_ghost) user.examinate(src) +/mob/living/attack_ghost(mob/dead/observer/user) + if(user.client && user.health_scan) + healthscan(user, src, 1, TRUE) + return + ..() + // --------------------------------------- // And here are some good things for free: // Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu -/obj/machinery/teleport/hub/attack_ghost(mob/user) - var/atom/l = loc - var/obj/machinery/computer/teleporter/com = locate(/obj/machinery/computer/teleporter, locate(l.x - 2, l.y, l.z)) - if(com && com.locked) - user.forceMove(get_turf(com.locked)) - -/obj/effect/portal/attack_ghost(mob/user) - if(linked) - user.forceMove(get_turf(linked)) - /obj/machinery/gateway/centerstation/attack_ghost(mob/user) if(awaygate) user.forceMove(awaygate.loc) diff --git a/code/citadel/cit_clothes.dm b/code/citadel/cit_clothes.dm new file mode 100644 index 0000000000..dd83c6b769 --- /dev/null +++ b/code/citadel/cit_clothes.dm @@ -0,0 +1,31 @@ +/*///////////////////////////////////////////////////////////////////////////////// +/////// /////// +/////// Cit's exclusive jumpsuits, uniforms, etc. go here /////// +/////// /////// +*////////////////////////////////////////////////////////////////////////////////// + + +/obj/item/clothing/under/rank/security/skirt + name = "security skirt" + desc = "A tactical security skirt for officers complete with Nanotrasen belt buckle." + icon = 'icons/obj/clothing/cit_clothes.dmi' + icon_state = "secskirt" + icon_override = 'icons/mob/citadel/uniforms.dmi' + item_state = "r_suit" + item_color = "secskirt" + +/obj/item/clothing/under/rank/head_of_security/skirt + name = "head of security's skirt" + desc = "A security skirt decorated for those few with the dedication to achieve the position of Head of Security." + icon = 'icons/obj/clothing/cit_clothes.dmi' + icon_state = "hosskirt" + icon_override = 'icons/mob/citadel/uniforms.dmi' + item_state = "gy_suit" + item_color = "hosskirt" + +/obj/item/clothing/suit/armor/hos/trenchcoat/cloak + name = "armored trenchcloak" + desc = "A trenchcoat enchanced with a special lightweight kevlar. This one appears to be designed to be draped over one's shoulders rather than worn normally.." + alternate_worn_icon = 'icons/mob/citadel/suit.dmi' + icon_state = "hostrench" + item_state = "hostrench" \ No newline at end of file diff --git a/code/citadel/cit_displaycases.dm b/code/citadel/cit_displaycases.dm new file mode 100644 index 0000000000..f660475cfc --- /dev/null +++ b/code/citadel/cit_displaycases.dm @@ -0,0 +1,5 @@ +/obj/structure/displaycase/clown + desc = "In the event of clown, honk glass." + alert = 1 + start_showpiece_type = /obj/item/bikehorn + req_access = list(ACCESS_CENT_GENERAL) diff --git a/code/citadel/cit_guns.dm b/code/citadel/cit_guns.dm index 8a90e75a6b..d4008b18ae 100644 --- a/code/citadel/cit_guns.dm +++ b/code/citadel/cit_guns.dm @@ -180,6 +180,7 @@ icon_state = "toy9magazine" max_ammo = 30 multiple_sprites = 2 + materials = list(MAT_METAL = 200) /obj/item/gun/ballistic/automatic/x9/toy name = "\improper Foam Force X9" @@ -193,6 +194,7 @@ spread = 90 //MAXIMUM XCOM MEMES (actually that'd be 180 spread) w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY + origin_tech = "combat=1;magnets=1" /datum/design/foam_x9 name = "Foam Force X9 Rifle" @@ -213,6 +215,8 @@ damage = 15 armour_penetration = 10 light_range = 2 + speed = 1.2 + range = 25 light_color = LIGHT_COLOR_RED /obj/item/projectile/bullet/nlmags //non-lethal boolets @@ -220,9 +224,11 @@ icon_state = "magjectile-nl" damage = 1 knockdown = 0 - stamina = 25 + stamina = 30 armour_penetration = -10 light_range = 2 + speed = 1.2 + range = 25 light_color = LIGHT_COLOR_BLUE @@ -289,6 +295,7 @@ /obj/item/gun/ballistic/automatic/pistol/mag/nopin pin = null + spawnwithmagazine = FALSE /datum/design/magpistol name = "Magpistol" @@ -347,6 +354,7 @@ fire_sound = 'sound/weapons/magpistol.ogg' slot_flags = SLOT_BELT w_class = WEIGHT_CLASS_SMALL + origin_tech = "combat=1;magnets=1" /obj/item/ammo_box/foambox/mag name = "ammo box (Magnetic Foam Darts)" @@ -378,19 +386,23 @@ /obj/item/projectile/bullet/magrifle icon = 'icons/obj/guns/cit_guns.dmi' icon_state = "magjectile-large" - damage = 25 + damage = 20 armour_penetration = 25 light_range = 3 + speed = 1.2 + range = 35 light_color = LIGHT_COLOR_RED /obj/item/projectile/bullet/nlmagrifle //non-lethal boolets icon = 'icons/obj/guns/cit_guns.dmi' icon_state = "magjectile-large-nl" - damage = 2 + damage = 1 knockdown = 0 - stamina = 30 + stamina = 35 armour_penetration = -10 light_range = 3 + speed = 1.0 + range = 35 light_color = LIGHT_COLOR_BLUE ///ammo casings/// @@ -451,6 +463,7 @@ /obj/item/gun/ballistic/automatic/magrifle/nopin pin = null + spawnwithmagazine = FALSE /datum/design/magrifle name = "Magrifle" @@ -489,15 +502,16 @@ max_ammo = 15 multiple_sprites = 2 ammo_type = /obj/item/ammo_casing/caseless/foam_dart/mag + materials = list(MAT_METAL = 200) /obj/item/gun/ballistic/automatic/magrifle/toy name = "foamag rifle" desc = "A foam launching magnetic rifle. Ages 8 and up." icon_state = "foamagrifle" - needs_permit = 0 + needs_permit = FALSE mag_type = /obj/item/ammo_box/magazine/toy/foamag casing_ejector = FALSE - origin_tech = "combat=2;engineering=2;magnets=2" + origin_tech = "combat=1;engineering=1;magnets=1" spread = 60 w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY @@ -631,6 +645,7 @@ charge_delay = 2 recoil = 2 cell_type = /obj/item/stock_parts/cell/toymagburst + origin_tech = "combat=1;magnets=1" /obj/item/stock_parts/cell/toymagburst name = "toy mag burst rifle power supply" @@ -687,6 +702,7 @@ fire_delay = 0 spread = 60 actions_types = list() + origin_tech = "combat=1;magnets=1" /obj/item/gun/ballistic/automatic/toy/pistol/stealth/update_icon() ..() @@ -913,6 +929,7 @@ obj/item/projectile/bullet/c10mm/soporific desc = "A toy laser with a classic, retro feel and look. Compatible with existing laser tag systems." ammo_type = list(/obj/item/ammo_casing/energy/laser/raytag) selfcharge = TRUE + origin_tech = "combat=1;magnets=1" /datum/design/toyray name = "RayTag Gun" @@ -1060,6 +1077,7 @@ obj/item/projectile/bullet/c10mm/soporific if(arm_color_input) arm_color = sanitize_hexcolor(arm_color_input, desired_format=6, include_crunch=1) update_icon() + A.UpdateButtonIcon() else ..() @@ -1070,12 +1088,16 @@ obj/item/projectile/bullet/c10mm/soporific name = "9mm frangible bullet" damage = 15 stamina = 0 + speed = 1.0 + range = 20 armour_penetration = -25 /obj/item/projectile/bullet/c9mm/rubber name = "9mm rubber bullet" - damage = 2 - stamina = 25 + damage = 5 + stamina = 30 + speed = 1.2 + range = 14 knockdown = 0 /obj/item/ammo_casing/c9mm/frangible @@ -1120,9 +1142,9 @@ obj/item/projectile/bullet/c10mm/soporific name = "Box of 9mm Frangible Bullets" id = "9mm_frag" build_type = AUTOLATHE - materials = list(MAT_METAL = 30000) + materials = list(MAT_METAL = 25000) build_path = /obj/item/ammo_box/c9mm/frangible - category = list("initial", "Security") + category = list("hacked", "Security") /datum/design/c9mmrubber name = "Box of 9mm Rubber Bullets" @@ -1157,10 +1179,13 @@ obj/item/projectile/bullet/c10mm/soporific name = "\improper Foam Force Mk.37F" desc = "A licensed foam-firing reproduction of a handgun with a toggle-locking mechanism manufactured by CX Armories. This model is coated with a special polychromic material. Uses standard foam pistol magazines." icon_state = "p37_foam" + pin = /obj/item/device/firing_pin spawnwithmagazine = TRUE + needs_permit = FALSE mag_type = /obj/item/ammo_box/magazine/toy/pistol can_suppress = FALSE actions_types = list(/datum/action/item_action/pick_color) + origin_tech = "combat=1;magnets=1" /datum/design/foam_p37 name = "Foam Force Mk.37F" @@ -1196,6 +1221,10 @@ obj/item/gun/energy/e_gun/cx/update_icon() body_overlay.color = body_color add_overlay(body_overlay) + if(ismob(loc)) + var/mob/M = loc + M.update_inv_hands() + obj/item/gun/energy/e_gun/cx/ui_action_click(mob/user, var/datum/action/A) if(istype(A, /datum/action/item_action/pick_color)) if(alert("Are you sure you want to repaint your gun?", "Confirm Repaint", "Yes", "No") == "Yes") @@ -1203,6 +1232,7 @@ obj/item/gun/energy/e_gun/cx/ui_action_click(mob/user, var/datum/action/A) if(body_color_input) body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1) update_icon() + A.UpdateButtonIcon() else ..() @@ -1211,4 +1241,8 @@ obj/item/gun/energy/e_gun/cx/worn_overlays(isinhands, icon_file) if(isinhands) var/mutable_appearance/body_inhand = mutable_appearance(icon_file, "cxe_body") body_inhand.color = body_color - . += body_inhand \ No newline at end of file + . += body_inhand + +/obj/item/ammo_box/magazine/toy/pistol //forcing this might be a bad idea, but it'll fix the foam gun infinite material exploit + ..() + materials = list(MAT_METAL = 200) \ No newline at end of file diff --git a/code/citadel/cit_weapons.dm b/code/citadel/cit_weapons.dm index 466a41e427..c709fe90e9 100644 --- a/code/citadel/cit_weapons.dm +++ b/code/citadel/cit_weapons.dm @@ -32,6 +32,10 @@ set_light(0) update_icon() + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtonIcon() + add_fingerprint(user) /obj/item/toy/sword/cx/update_icon() @@ -49,6 +53,10 @@ if(active) add_overlay(blade_overlay) + if(ismob(loc)) + var/mob/M = loc + M.update_inv_hands() + /obj/item/toy/sword/cx/ui_action_click(mob/user, var/datum/action/A) if(istype(A, /datum/action/item_action/pick_color)) if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes") @@ -56,10 +64,8 @@ if(energy_color_input) light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1) update_icon() - if(ismob(loc)) - var/mob/M = loc - M.update_inv_hands() update_light() + A.UpdateButtonIcon() else ..() @@ -72,6 +78,9 @@ blade_inhand.color = light_color . += blade_inhand +/obj/item/toy/sword/cx/attackby(obj/item/W, mob/living/user, params) + return //NO MORE MAKING DUAL ESWORDS + /*///autolathe memes/// I really need to stop doing this and find a proper way of adding in my toys /datum/design/toyneb @@ -143,6 +152,9 @@ update_icon() transform_messages(user, supress_message_text) add_fingerprint(user) + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtonIcon() return TRUE /obj/item/melee/transforming/energy/sword/cx/transform_messages(mob/living/user, supress_message_text) @@ -165,6 +177,10 @@ if(active) add_overlay(blade_overlay) + if(ismob(loc)) + var/mob/M = loc + M.update_inv_hands() + /obj/item/melee/transforming/energy/sword/cx/ui_action_click(mob/user, var/datum/action/A) if(istype(A, /datum/action/item_action/pick_color)) if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes") @@ -172,10 +188,8 @@ if(energy_color_input) light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1) update_icon() - if(ismob(loc)) - var/mob/M = loc - M.update_inv_hands() update_light() + A.UpdateButtonIcon() else ..() diff --git a/code/citadel/crew_objectives/cit_crewobjectives_science.dm b/code/citadel/crew_objectives/cit_crewobjectives_science.dm index f04f97b174..1fcba91e46 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_science.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_science.dm @@ -15,7 +15,7 @@ /datum/objective/crew/cyborgs/check_completion() var/borgcount = target_amount - for(var/mob/living/silicon/robot/R in GLOB.living_mob_list) + for(var/mob/living/silicon/robot/R in GLOB.alive_mob_list) if(!(R.stat == DEAD)) borgcount-- if(borgcount <= 0) @@ -42,4 +42,4 @@ if(S && S.files && S.files.known_designs) if(targetdesign in S.files.known_designs) return TRUE - return FALSE \ No newline at end of file + return FALSE diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm index 5358073dbe..92dcb9baf0 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -51,6 +51,11 @@ return FALSE return ..() +/datum/config_entry/proc/VASProcCallGuard(str_val) + . = !(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "ValidateAndSet" && GLOB.LastAdminCalledTargetRef == "[REF(src)]") + if(!.) + log_admin_private("Config set of [type] to [str_val] attempted by [key_name(usr)]") + /datum/config_entry/proc/ValidateAndSet(str_val) CRASH("Invalid config entry type!") diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 278424ca79..70be8cfa0c 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -124,7 +124,7 @@ GLOBAL_PROTECT(config_dir) stat("[name]:", statclick) /datum/controller/configuration/proc/Get(entry_type) - if(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Get" && GLOB.LastAdminCalledTargetRef == "\ref[src]") + if(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Get" && GLOB.LastAdminCalledTargetRef == "[REF(src)]") log_admin_private("Config access of [entry_type] attempted by [key_name(usr)]") return var/datum/config_entry/E = entry_type @@ -137,7 +137,7 @@ GLOBAL_PROTECT(config_dir) return E.value /datum/controller/configuration/proc/Set(entry_type, new_val) - if(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Set" && GLOB.LastAdminCalledTargetRef == "\ref[src]") + if(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Set" && GLOB.LastAdminCalledTargetRef == "[REF(src)]") log_admin_private("Config rewrite of [entry_type] to [new_val] attempted by [key_name(usr)]") return var/datum/config_entry/E = entry_type diff --git a/code/controllers/configuration/entries/config.dm b/code/controllers/configuration/entries/config.dm index f1ee6a557c..39739593fc 100644 --- a/code/controllers/configuration/entries/config.dm +++ b/code/controllers/configuration/entries/config.dm @@ -318,6 +318,8 @@ CONFIG_DEF(number/client_warn_version) CONFIG_DEF(string/client_warn_message) value = "Your version of byond may have issues or be blocked from accessing this server in the future." +CONFIG_DEF(flag/client_warn_popup) + CONFIG_DEF(number/client_error_version) value = null min_val = 500 @@ -372,3 +374,10 @@ CONFIG_TWEAK(number/mc_tick_rate/ValidateAndSet(str_val)) . = ..() if (.) Master.UpdateTickRate() + +CONFIG_DEF(flag/resume_after_initializations) + +CONFIG_TWEAK(flag/ValidateAndSet(str_val)) + . = ..() + if(. && Master.current_runlevel) + world.sleep_offline = !value diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index ea79ba81f3..1b58d86db2 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -163,9 +163,20 @@ CONFIG_DEF(flag/ooc_during_round) CONFIG_DEF(flag/emojis) CONFIG_DEF(number/run_delay) //Used for modifying movement speed for mobs. + var/static/value_cache = 0 + +CONFIG_TWEAK(number/run_delay/ValidateAndSet()) + . = ..() + if(.) + value_cache = value CONFIG_DEF(number/walk_delay) + var/static/value_cache = 0 +CONFIG_TWEAK(number/walk_delay/ValidateAndSet()) + . = ..() + if(.) + value_cache = value CONFIG_DEF(number/human_delay) //Mob specific modifiers. NOTE: These will affect different mob types in different ways CONFIG_DEF(number/robot_delay) @@ -251,3 +262,5 @@ CONFIG_DEF(number/emergency_shuttle_autocall_threshold) min_val = 0 max_val = 1 integer = FALSE + +CONFIG_DEF(flag/ic_printing) \ No newline at end of file diff --git a/code/controllers/globals.dm b/code/controllers/globals.dm index 6aca9c1911..095e69573a 100644 --- a/code/controllers/globals.dm +++ b/code/controllers/globals.dm @@ -40,18 +40,18 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars) stat("Globals:", statclick.update("Edit")) /datum/controller/global_vars/can_vv_get(var_name) - if(var_name in gvars_datum_protected_varlist) + if(gvars_datum_protected_varlist[var_name]) return FALSE return ..() /datum/controller/global_vars/vv_edit_var(var_name, var_value) - if((var_name in gvars_datum_protected_varlist)) + if(gvars_datum_protected_varlist[var_name]) return FALSE return ..() /datum/controller/global_vars/Initialize() gvars_datum_init_order = list() - gvars_datum_protected_varlist = list("gvars_datum_protected_varlist") + gvars_datum_protected_varlist = list("gvars_datum_protected_varlist" = TRUE) var/list/global_procs = typesof(/datum/controller/global_vars/proc) var/expected_len = vars.len - gvars_datum_in_built_vars.len if(global_procs.len != expected_len) diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 852437705b..568257e10f 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -189,10 +189,12 @@ GLOBAL_REAL(Master, /datum/controller/master) = new // Sort subsystems by display setting for easy access. sortTim(subsystems, /proc/cmp_subsystem_display) // Set world options. - world.sleep_offline = 1 + world.sleep_offline = TRUE world.fps = CONFIG_GET(number/fps) var/initialized_tod = REALTIMEOFDAY sleep(1) + if(CONFIG_GET(flag/resume_after_initializations)) + world.sleep_offline = FALSE initializations_finished_with_no_players_logged_in = initialized_tod < REALTIMEOFDAY - 10 // Loop. Master.StartProcessing(0) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index b5dbabb934..59b6fc34ef 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -27,6 +27,7 @@ SUBSYSTEM_DEF(air) var/list/hotspots = list() var/list/networks = list() var/list/obj/machinery/atmos_machinery = list() + var/list/pipe_init_dirs_cache = list() @@ -376,6 +377,16 @@ SUBSYSTEM_DEF(air) AM.build_network() CHECK_TICK +/datum/controller/subsystem/air/proc/get_init_dirs(type, dir) + if(!pipe_init_dirs_cache[type]) + pipe_init_dirs_cache[type] = list() + + if(!pipe_init_dirs_cache[type]["[dir]"]) + var/obj/machinery/atmospherics/temp = new type(null, FALSE, dir) + pipe_init_dirs_cache[type]["[dir]"] = temp.GetInitDirections() + qdel(temp) + + return pipe_init_dirs_cache[type]["[dir]"] #undef SSAIR_PIPENETS #undef SSAIR_ATMOSMACHINERY diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index 7a8748c20f..e86d32f76b 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -28,5 +28,19 @@ SUBSYSTEM_DEF(communications) log_talk(user,"[key_name(user)] has made a priority announcement: [input]",LOGSAY) message_admins("[key_name_admin(user)] has made a priority announcement.") +/datum/controller/subsystem/communications/proc/send_message(datum/comm_message/sending,print = TRUE,unique = FALSE) + for(var/obj/machinery/computer/communications/C in GLOB.machines) + if(!(C.stat & (BROKEN|NOPOWER)) && (C.z in GLOB.station_z_levels)) + if(unique) + C.add_message(sending) + else //We copy the message for each console, answers and deletions won't be shared + var/datum/comm_message/M = new(sending.title,sending.content,sending.possible_answers.Copy()) + C.add_message(M) + if(print) + var/obj/item/paper/P = new /obj/item/paper(C.loc) + P.name = "paper - '[sending.title]'" + P.info = sending.content + P.update_icon() + #undef COMMUNICATION_COOLDOWN #undef COMMUNICATION_COOLDOWN_AI diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 10978b7d32..bbf1fef8d9 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -186,7 +186,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table /datum/DBQuery/proc/warn_execute() . = Execute() if(!.) - to_chat(usr, "A SQL error occured during this operation, check the server logs.") + to_chat(usr, "A SQL error occurred during this operation, check the server logs.") /datum/DBQuery/proc/Execute(sql_query = sql, cursor_handler = default_cursor, log_error = TRUE) Close() diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index f435d7e819..3aa1747dee 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -133,7 +133,7 @@ SUBSYSTEM_DEF(events) var/magic = "" var/holiday = "" for(var/datum/round_event_control/E in SSevents.control) - dat = "
[E]" + dat = "
[E]" if(E.holidayID) holiday += dat else if(E.wizardevent) @@ -177,7 +177,7 @@ SUBSYSTEM_DEF(events) var/YY = text2num(time2text(world.timeofday, "YY")) // get the current year var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day - var/DDD = text2num(time2text(world.timeofday, "DDD")) // get the current weekday + var/DDD = time2text(world.timeofday, "DDD") // get the current weekday var/W = weekdayofthemonth() // is this the first monday? second? etc. for(var/H in subtypesof(/datum/holiday)) diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index ccfc041b21..6203f1b474 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -164,7 +164,7 @@ SUBSYSTEM_DEF(garbage) #endif var/type = D.type var/datum/qdel_item/I = items[type] - testing("GC: -- \ref[D] | [type] was unable to be GC'd --") + testing("GC: -- \ref[src] | [type] was unable to be GC'd --") I.failures++ if (GC_QUEUE_HARDDELETE) HardDelete(D) @@ -263,7 +263,7 @@ SUBSYSTEM_DEF(garbage) // Should be treated as a replacement for the 'del' keyword. // Datums passed to this will be given a chance to clean up references to allow the GC to collect them. -/proc/qdel(datum/D, force=FALSE) +/proc/qdel(datum/D, force=FALSE, ...) if(!istype(D)) del(D) return @@ -278,7 +278,7 @@ SUBSYSTEM_DEF(garbage) D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED var/start_time = world.time var/start_tick = world.tick_usage - var/hint = D.Destroy(force) // Let our friend know they're about to get fucked up. + var/hint = D.Destroy(arglist(args.Copy(2))) // Let our friend know they're about to get fucked up. if(world.time != start_time) I.slept_destroy++ else diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 5645f0527f..5daa0137af 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -575,7 +575,7 @@ SUBSYSTEM_DEF(job) /////////////////////////////////// /datum/controller/subsystem/job/proc/get_living_heads() . = list() - for(var/mob/living/carbon/human/player in GLOB.mob_list) + for(var/mob/living/carbon/human/player in GLOB.alive_mob_list) if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.command_positions)) . |= player.mind @@ -585,7 +585,8 @@ SUBSYSTEM_DEF(job) //////////////////////////// /datum/controller/subsystem/job/proc/get_all_heads() . = list() - for(var/mob/player in GLOB.mob_list) + for(var/i in GLOB.mob_list) + var/mob/player = i if(player.mind && (player.mind.assigned_role in GLOB.command_positions)) . |= player.mind @@ -594,7 +595,7 @@ SUBSYSTEM_DEF(job) ////////////////////////////////////////////// /datum/controller/subsystem/job/proc/get_living_sec() . = list() - for(var/mob/living/carbon/human/player in GLOB.mob_list) + for(var/mob/living/carbon/human/player in GLOB.carbon_list) if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.security_positions)) . |= player.mind @@ -603,6 +604,6 @@ SUBSYSTEM_DEF(job) //////////////////////////////////////// /datum/controller/subsystem/job/proc/get_all_sec() . = list() - for(var/mob/living/carbon/human/player in GLOB.mob_list) + for(var/mob/living/carbon/human/player in GLOB.carbon_list) if(player.mind && (player.mind.assigned_role in GLOB.security_positions)) - . |= player.mind \ No newline at end of file + . |= player.mind diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index ab2ba54431..03b7cdc095 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -18,6 +18,8 @@ SUBSYSTEM_DEF(mapping) var/list/shuttle_templates = list() var/list/shelter_templates = list() + var/list/areas_in_z = list() + var/loading_ruins = FALSE /datum/controller/subsystem/mapping/PreInit() @@ -124,7 +126,7 @@ SUBSYSTEM_DEF(mapping) query_round_map_name.Execute() if(config.minetype != "lavaland") - INIT_ANNOUNCE("WARNING: A map without lavaland set as it's minetype was loaded! This is being ignored! Update the maploader code!") + INIT_ANNOUNCE("WARNING: A map without lavaland set as its minetype was loaded! This is being ignored! Update the maploader code!") CreateSpace(ZLEVEL_SPACEMAX) diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index cbe9d5c245..1311ca1589 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -7,13 +7,15 @@ SUBSYSTEM_DEF(mobs) var/list/currentrun = list() /datum/controller/subsystem/mobs/stat_entry() - ..("P:[GLOB.mob_list.len]") + ..("P:[GLOB.mob_living_list.len]") /datum/controller/subsystem/mobs/fire(resumed = 0) var/seconds = wait * 0.1 if (!resumed) - src.currentrun = GLOB.mob_list.Copy() + src.currentrun = GLOB.mob_living_list.Copy() + if (GLOB.overminds.len) // blob cameras need to Life() + src.currentrun += GLOB.overminds //cache for sanic speed (lists are references anyways) var/list/currentrun = src.currentrun @@ -24,6 +26,6 @@ SUBSYSTEM_DEF(mobs) if(M) M.Life(seconds, times_fired) else - GLOB.mob_list.Remove(M) + GLOB.mob_living_list.Remove(M) if (MC_TICK_CHECK) return diff --git a/code/controllers/subsystem/processing/overlays.dm b/code/controllers/subsystem/overlays.dm similarity index 80% rename from code/controllers/subsystem/processing/overlays.dm rename to code/controllers/subsystem/overlays.dm index d7f260be0e..498890d430 100644 --- a/code/controllers/subsystem/processing/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -1,4 +1,4 @@ -PROCESSING_SUBSYSTEM_DEF(overlays) +SUBSYSTEM_DEF(overlays) name = "Overlay" flags = SS_TICKER wait = 1 @@ -6,62 +6,63 @@ PROCESSING_SUBSYSTEM_DEF(overlays) init_order = INIT_ORDER_OVERLAY runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_SETUP - stat_tag = "Ov" - currentrun = null + var/list/queue + var/list/stats var/list/overlay_icon_state_caches var/list/overlay_icon_cache var/initialized = FALSE -/datum/controller/subsystem/processing/overlays/PreInit() - LAZYINITLIST(overlay_icon_state_caches) - LAZYINITLIST(overlay_icon_cache) +/datum/controller/subsystem/overlays/PreInit() + overlay_icon_state_caches = list() + overlay_icon_cache = list() + queue = list() + stats = list() -/datum/controller/subsystem/processing/overlays/Initialize() +/datum/controller/subsystem/overlays/Initialize() initialized = TRUE - Flush() + fire(mc_check = FALSE) ..() -/datum/controller/subsystem/processing/overlays/Recover() + +/datum/controller/subsystem/overlays/stat_entry() + ..("Ov:[length(queue)]") + + +/datum/controller/subsystem/overlays/Shutdown() + text2file("[GLOB.log_directory]/overlay.log", render_stats(stats)) + + +/datum/controller/subsystem/overlays/Recover() overlay_icon_state_caches = SSoverlays.overlay_icon_state_caches overlay_icon_cache = SSoverlays.overlay_icon_cache - processing = SSoverlays.processing + queue = SSoverlays.queue -#define COMPILE_OVERLAYS(A)\ - var/list/oo = A.our_overlays;\ - var/list/po = A.priority_overlays;\ - if(LAZYLEN(po)){\ - if(LAZYLEN(oo)){\ - A.overlays = oo + po;\ - }\ - else{\ - A.overlays = po;\ - }\ - }\ - else if(LAZYLEN(oo)){\ - A.overlays = oo;\ - }\ - else{\ - A.overlays.Cut();\ - }\ - A.flags_1 &= ~OVERLAY_QUEUED_1 -/datum/controller/subsystem/processing/overlays/fire(resumed = FALSE, mc_check = TRUE) - var/list/processing = src.processing - while(processing.len) - var/atom/thing = processing[processing.len] - processing.len-- +/datum/controller/subsystem/overlays/fire(resumed = FALSE, mc_check = TRUE) + var/list/queue = src.queue + var/static/count = 0 + if (count) + var/c = count + count = 0 //so if we runtime on the Cut, we don't try again. + queue.Cut(1,c+1) + + for (var/thing in queue) + count++ if(thing) - COMPILE_OVERLAYS(thing) + STAT_START_STOPWATCH + var/atom/A = thing + COMPILE_OVERLAYS(A) + STAT_STOP_STOPWATCH + STAT_LOG_ENTRY(stats, A.type) if(mc_check) if(MC_TICK_CHECK) break else CHECK_TICK -/datum/controller/subsystem/processing/overlays/proc/Flush() - if(processing.len) - testing("Flushing [processing.len] overlays") - fire(mc_check = FALSE) //pair this thread up with the MC to get extra compile time + if (count) + queue.Cut(1,count+1) + count = 0 /proc/iconstate2appearance(icon, iconstate) var/static/image/stringbro = new() @@ -102,6 +103,10 @@ PROCESSING_SUBSYSTEM_DEF(overlays) else if(isicon(overlay)) new_overlays += icon2appearance(overlay) else + if(isloc(overlay)) + var/atom/A = overlay + if (A.flags_1 & OVERLAY_QUEUED_1) + COMPILE_OVERLAYS(A) appearance_bro.appearance = overlay //this works for images and atoms too! if(!ispath(overlay)) var/image/I = overlay @@ -110,7 +115,7 @@ PROCESSING_SUBSYSTEM_DEF(overlays) return new_overlays #define NOT_QUEUED_ALREADY (!(flags_1 & OVERLAY_QUEUED_1)) -#define QUEUE_FOR_COMPILE flags_1 |= OVERLAY_QUEUED_1; SSoverlays.processing += src; +#define QUEUE_FOR_COMPILE flags_1 |= OVERLAY_QUEUED_1; SSoverlays.queue += src; /atom/proc/cut_overlays(priority = FALSE) var/list/cached_overlays = our_overlays var/list/cached_priority = priority_overlays diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index 07797d0677..0eafc9f099 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -109,23 +109,23 @@ SUBSYSTEM_DEF(pai) dat += "
Please configure your pAI personality's options. Remember, what you enter here could determine whether or not the user requesting a personality chooses you!
" dat += "| Name: | [candidate.name] |
| \[Edit\] | What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI. |
| \[Edit\] | What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI. |
| Description: | [candidate.description] |
| \[Edit\] | What sort of pAI you typically play; your mannerisms, your quirks, etc. This can be as sparse or as detailed as you like. |
| \[Edit\] | What sort of pAI you typically play; your mannerisms, your quirks, etc. This can be as sparse or as detailed as you like. |
| Preferred Role: | [candidate.role] |
| \[Edit\] | Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here. |
| \[Edit\] | Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here. |
| OOC Comments: | [candidate.comments] |
| \[Edit\] | Anything you'd like to address specifically to the player reading this in an OOC manner. \"I prefer more serious RP.\", \"I'm still learning the interface!\", etc. Feel free to leave this blank if you want. |
| \[Edit\] | Anything you'd like to address specifically to the player reading this in an OOC manner. \"I prefer more serious RP.\", \"I'm still learning the interface!\", etc. Feel free to leave this blank if you want. |
" - dat += "
Submit Personality
" - dat += "Save Personality
" - dat += "Load Personality
" + dat += "
Submit Personality
" + dat += "Save Personality
" + dat += "Load Personality
" M << browse(dat, "window=paiRecruit") @@ -182,7 +182,7 @@ SUBSYSTEM_DEF(pai) dat += "
" if(admin) - . += "(Cancel Vote) " + . += "(Cancel Vote) " else . += "
Start a vote:
- " //restart var/avr = CONFIG_GET(flag/allow_vote_restart) if(trialmin || avr) - . += "Restart" + . += "Restart" else . += "Restart (Disallowed)" if(trialmin) - . += "\t([avr ? "Allowed" : "Disallowed"])" + . += "\t([avr ? "Allowed" : "Disallowed"])" . += "
- " //gamemode var/avm = CONFIG_GET(flag/allow_vote_mode) if(trialmin || avm) - . += "GameMode" + . += "GameMode" else . += "GameMode (Disallowed)" if(trialmin) - . += "\t([avm ? "Allowed" : "Disallowed"])" + . += "\t([avm ? "Allowed" : "Disallowed"])" . += " " //custom if(trialmin) - . += "
- Custom " + . += "
- Custom " . += "
" - . += "Close" + . += "Close" return . diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index e66fd4ffeb..2909d1c70a 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -13,7 +13,8 @@ SUBSYSTEM_DEF(weather) var/datum/weather/W = V if(W.aesthetic) continue - for(var/mob/living/L in GLOB.mob_list) + for(var/i in GLOB.mob_living_list) + var/mob/living/L = i if(W.can_weather_act(L)) W.weather_act(L) for(var/Z in eligible_zlevels) diff --git a/code/datums/EPv2.dm b/code/datums/EPv2.dm new file mode 100644 index 0000000000..85088ff903 --- /dev/null +++ b/code/datums/EPv2.dm @@ -0,0 +1,113 @@ +/* +Exonet Protocol Version 2 + +This is designed to be a fairly simple fake-networking system, allowing you to send and receive messages +between the exonet_protocol datums, and for atoms to react to those messages, based on the contents of the message. +Hopefully, this can evolve to be a more robust fake-networking system and allow for some devious network hacking in the future. + +Version 1 never existed. + +*Setting up* + +To set up the exonet link, define a variable on your desired atom it is like this; + var/datum/exonet_protocol/exonet = null +Afterwards, before you want to do networking, call exonet = New(src), then exonet.make_address(string), and give it a string to hash into the new IP. +The reason it needs a string is so you can have the addresses be persistant, assuming no-one already took it first. + +When you're no longer wanting to use the address and want to free it up, like when you want to Destroy() it, you need to call remove_address() +Destroy() also automatically calls remove_address(). + +*Sending messages* + +To send a message to another datum, you need to know it's EPv2 (fake IP) address. Once you know that, call send_message(), place your +intended address in the first argument, then the message in the second. For example, send_message(exonet.address, "ping") will make you +ping yourself. + +*Receiving messages* +You don't need to do anything special to receive the messages, other than give your target exonet datum an address as well. Once something hits +your datum with send_message(), receive_message() is called, and the default action is to call receive_exonet_message() on the datum's holder. +You'll want to override receive_exonet_message() on your atom, and define what will occur when the message is received. +The receiving atom will receive the origin atom (the atom that sent the message), the origin address, and finally the message itself. +It's suggested to start with an if or switch statement for the message, to determine what to do. +*/ + +/datum/exonet_protocol + var/address = "" //Resembles IPv6, but with only five 'groups', e.g. XXXX:XXXX:XXXX:XXXX:XXXX + var/atom/holder + +/datum/exonet_protocol/New(var/atom/H) + holder = H + +/datum/exonet_protocol/Destroy() + remove_address() + holder = null + return ..() + +// Proc: make_address() +// Parameters: 1 (string - used to make into a hash that will be part of the new address) +// Description: Allocates a new address based on the string supplied. It results in consistant addresses for each round assuming it is not already taken.. +/datum/exonet_protocol/proc/make_address(var/string) + if(!string) + return + var/hex = copytext(md5(string),1,25) + if(!hex) + return + var/addr_1 = copytext(hex,1,5) + var/addr_2 = copytext(hex,5,9) + var/addr_3 = copytext(hex,9,13) + var/addr_4 = copytext(hex,13,17) + address = "fc00:[addr_1]:[addr_2]:[addr_3]:[addr_4]" + if(SScircuit.all_exonet_connections[address]) + stack_trace("WARNING: Exonet address collision in make_address. Holder type if applicable is [holder? holder.type : "NO HOLDER"]!") + SScircuit.all_exonet_connections[address] = src + + +// Proc: make_arbitrary_address() +// Parameters: 1 (new_address - the desired address) +// Description: Allocates that specific address, if it is available. +/datum/exonet_protocol/proc/make_arbitrary_address(var/new_address) + if(new_address) + if(new_address == SScircuit.get_exonet_address(new_address) ) //Collision test. + return FALSE + address = new_address + SScircuit.all_exonet_connections[address] = src + return TRUE + + +// Proc: remove_address() +// Parameters: None +// Description: Deallocates the address, freeing it for use. +/datum/exonet_protocol/proc/remove_address() + SScircuit.all_exonet_connections -= address + address = "" + + + +// Proc: send_message() +// Parameters: 3 (target_address - the desired address to send the message to, data_type - text stating what the content is meant to be used for, +// content - the actual 'message' being sent to the address) +// Description: Sends the message to target_address, by calling receive_message() on the desired datum. Returns true if the message is recieved. +/datum/exonet_protocol/proc/send_message(var/target_address, var/data_type, var/content) + if(!address) + return FALSE + var/obj/machinery/exonet_node/node = SScircuit.get_exonet_node() + if(!node) // Telecomms went boom, ion storm, etc. + return FALSE + var/datum/exonet_protocol/exonet = SScircuit.get_exonet_address(target_address) + if(exonet) + node.write_log(address, target_address, data_type, content) + return exonet.receive_message(holder, address, data_type, content) + +// Proc: receive_message() +// Parameters: 4 (origin_atom - the origin datum's holder, origin_address - the address the message originated from, +// data_type - text stating what the content is meant to be used for, content - the actual 'message' being sent from origin_atom) +// Description: Called when send_message() successfully reaches the intended datum. By default, calls receive_exonet_message() on the holder atom. +/datum/exonet_protocol/proc/receive_message(var/atom/origin_atom, var/origin_address, var/data_type, var/content) + holder.receive_exonet_message(origin_atom, origin_address, data_type, content) + return TRUE // for send_message() + +// Proc: receive_exonet_message() +// Parameters: 3 (origin_atom - the origin datum's holder, origin_address - the address the message originated from, message - the message that was sent) +// Description: Override this to make your atom do something when a message is received. +/atom/proc/receive_exonet_message(var/atom/origin_atom, var/origin_address, var/message, var/text) + return diff --git a/code/datums/antagonists/changeling.dm b/code/datums/antagonists/changeling.dm new file mode 100644 index 0000000000..d72cb64b81 --- /dev/null +++ b/code/datums/antagonists/changeling.dm @@ -0,0 +1,483 @@ +#define LING_FAKEDEATH_TIME 400 //40 seconds +#define LING_DEAD_GENETICDAMAGE_HEAL_CAP 50 //The lowest value of geneticdamage handle_changeling() can take it to while dead. +#define LING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob + +/datum/antagonist/changeling + name = "Changeling" + job_rank = ROLE_CHANGELING + + var/you_are_greet = TRUE + var/give_objectives = TRUE + var/list/objectives = list() + var/team_mode = FALSE //Should assign team objectives ? + + //Changeling Stuff + + var/list/stored_profiles = list() //list of datum/changelingprofile + var/datum/changelingprofile/first_prof = null + //var/list/absorbed_dna = list() + //var/list/protected_dna = list() //dna that is not lost when capacity is otherwise full + var/dna_max = 6 //How many extra DNA strands the changeling can store for transformation. + var/absorbedcount = 0 + var/chem_charges = 20 + var/chem_storage = 75 + var/chem_recharge_rate = 1 + var/chem_recharge_slowdown = 0 + var/sting_range = 2 + var/changelingID = "Changeling" + var/geneticdamage = 0 + var/isabsorbing = 0 + var/islinking = 0 + var/geneticpoints = 10 + var/purchasedpowers = list() + var/mimicing = "" + var/canrespec = 0 + var/changeling_speak = 0 + var/datum/dna/chosen_dna + var/obj/effect/proc_holder/changeling/sting/chosen_sting + var/datum/cellular_emporium/cellular_emporium + var/datum/action/innate/cellular_emporium/emporium_action + + // wip stuff + var/static/list/all_powers = typecacheof(/obj/effect/proc_holder/changeling,TRUE) + + +/datum/antagonist/changeling/New() + . = ..() + generate_name() + create_actions() + +/datum/antagonist/changeling/Destroy() + QDEL_NULL(cellular_emporium) + QDEL_NULL(emporium_action) + . = ..() + +/datum/antagonist/changeling/proc/generate_name() + var/honorific + if(owner.current.gender == FEMALE) + honorific = "Ms." + else + honorific = "Mr." + if(GLOB.possible_changeling_IDs.len) + changelingID = pick(GLOB.possible_changeling_IDs) + GLOB.possible_changeling_IDs -= changelingID + changelingID = "[honorific] [changelingID]" + else + changelingID = "[honorific] [rand(1,999)]" + +/datum/antagonist/changeling/proc/create_actions() + cellular_emporium = new(src) + emporium_action = new(cellular_emporium) + +/datum/antagonist/changeling/on_gain() + reset_powers() + create_initial_profile() + if(give_objectives) + if(team_mode) + forge_team_objectives() + forge_objectives() + remove_clownmut() + . = ..() + +/datum/antagonist/changeling/on_removal() + remove_changeling_powers(FALSE) + owner.objectives -= objectives + . = ..() + +/datum/antagonist/changeling/proc/remove_clownmut() + if (owner) + var/mob/living/carbon/human/H = owner.current + if(istype(H) && owner.assigned_role == "Clown") + to_chat(H, "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself.") + H.dna.remove_mutation(CLOWNMUT) + +/datum/antagonist/changeling/proc/reset_properties() + changeling_speak = 0 + chosen_sting = null + geneticpoints = initial(geneticpoints) + sting_range = initial(sting_range) + chem_storage = initial(chem_storage) + chem_recharge_rate = initial(chem_recharge_rate) + chem_charges = min(chem_charges, chem_storage) + chem_recharge_slowdown = initial(chem_recharge_slowdown) + mimicing = "" + +/datum/antagonist/changeling/proc/remove_changeling_powers(keep_free_powers=0) + if(ishuman(owner.current) || ismonkey(owner.current)) + reset_properties() + for(var/obj/effect/proc_holder/changeling/p in purchasedpowers) + if((p.dna_cost == 0 && keep_free_powers) || p.always_keep) + continue + purchasedpowers -= p + p.on_refund(owner.current) + + //MOVE THIS + if(owner.current.hud_used) + owner.current.hud_used.lingstingdisplay.icon_state = null + owner.current.hud_used.lingstingdisplay.invisibility = INVISIBILITY_ABSTRACT + +/datum/antagonist/changeling/proc/reset_powers() + if(purchasedpowers) + remove_changeling_powers(TRUE) + //Purchase free powers. + for(var/path in all_powers) + var/obj/effect/proc_holder/changeling/S = new path() + if(!S.dna_cost) + if(!has_sting(S)) + purchasedpowers+=S + S.on_purchase(owner.current,TRUE) + +/datum/antagonist/changeling/proc/has_sting(obj/effect/proc_holder/changeling/power) + for(var/obj/effect/proc_holder/changeling/P in purchasedpowers) + if(initial(power.name) == P.name) + return TRUE + return FALSE + + +/datum/antagonist/changeling/proc/purchase_power(sting_name) + var/obj/effect/proc_holder/changeling/thepower = null + + for(var/path in all_powers) + var/obj/effect/proc_holder/changeling/S = path + if(initial(S.name) == sting_name) + thepower = new path() + break + + if(!thepower) + to_chat(owner.current, "This is awkward. Changeling power purchase failed, please report this bug to a coder!") + return + + if(absorbedcount < thepower.req_dna) + to_chat(owner.current, "We lack the energy to evolve this ability!") + return + + if(has_sting(thepower)) + to_chat(owner.current, "We have already evolved this ability!") + return + + if(thepower.dna_cost < 0) + to_chat(owner.current, "We cannot evolve this ability.") + return + + if(geneticpoints < thepower.dna_cost) + to_chat(owner.current, "We have reached our capacity for abilities.") + return + + if(owner.current.status_flags & FAKEDEATH)//To avoid potential exploits by buying new powers while in stasis, which clears your verblist. + to_chat(owner.current, "We lack the energy to evolve new abilities right now.") + return + + geneticpoints -= thepower.dna_cost + purchasedpowers += thepower + thepower.on_purchase(owner.current) + +/datum/antagonist/changeling/proc/readapt() + if(!ishuman(owner.current)) + to_chat(owner.current, "We can't remove our evolutions in this form!") + return + if(canrespec) + to_chat(owner.current, "We have removed our evolutions from this form, and are now ready to readapt.") + reset_powers() + canrespec = 0 + SSblackbox.add_details("changeling_power_purchase","Readapt") + return 1 + else + to_chat(owner.current, "You lack the power to readapt your evolutions!") + return 0 + +//Called in life() +/datum/antagonist/changeling/proc/regenerate() + var/mob/living/carbon/the_ling = owner.current + if(istype(the_ling)) + emporium_action.Grant(the_ling) + if(the_ling.stat == DEAD) + chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), (chem_storage*0.5)) + geneticdamage = max(LING_DEAD_GENETICDAMAGE_HEAL_CAP,geneticdamage-1) + else //not dead? no chem/geneticdamage caps. + chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), chem_storage) + geneticdamage = max(0, geneticdamage-1) + + +/datum/antagonist/changeling/proc/get_dna(dna_owner) + for(var/datum/changelingprofile/prof in stored_profiles) + if(dna_owner == prof.name) + return prof + +/datum/antagonist/changeling/proc/has_dna(datum/dna/tDNA) + for(var/datum/changelingprofile/prof in stored_profiles) + if(tDNA.is_same_as(prof.dna)) + return TRUE + return FALSE + +/datum/antagonist/changeling/proc/can_absorb_dna(mob/living/carbon/human/target, var/verbose=1) + var/mob/living/carbon/user = owner.current + if(!istype(user)) + return + if(stored_profiles.len) + var/datum/changelingprofile/prof = stored_profiles[1] + if(prof.dna == user.dna && stored_profiles.len >= dna_max)//If our current DNA is the stalest, we gotta ditch it. + if(verbose) + to_chat(user, "We have reached our capacity to store genetic information! We must transform before absorbing more.") + return + if(!target) + return + if(NO_DNA_COPY in target.dna.species.species_traits) + if(verbose) + to_chat(user, "[target] is not compatible with our biology.") + return + if((target.disabilities & NOCLONE) || (target.disabilities & HUSK)) + if(verbose) + to_chat(user, "DNA of [target] is ruined beyond usability!") + return + if(!ishuman(target))//Absorbing monkeys is entirely possible, but it can cause issues with transforming. That's what lesser form is for anyway! + if(verbose) + to_chat(user, "We could gain no benefit from absorbing a lesser creature.") + return + if(has_dna(target.dna)) + if(verbose) + to_chat(user, "We already have this DNA in storage!") + return + if(!target.has_dna()) + if(verbose) + to_chat(user, "[target] is not compatible with our biology.") + return + return 1 + + +/datum/antagonist/changeling/proc/create_profile(mob/living/carbon/human/H, protect = 0) + var/datum/changelingprofile/prof = new + + H.dna.real_name = H.real_name //Set this again, just to be sure that it's properly set. + var/datum/dna/new_dna = new H.dna.type + H.dna.copy_dna(new_dna) + prof.dna = new_dna + prof.name = H.real_name + prof.protected = protect + + prof.underwear = H.underwear + prof.undershirt = H.undershirt + prof.socks = H.socks + + var/list/slots = list("head", "wear_mask", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store") + for(var/slot in slots) + if(slot in H.vars) + var/obj/item/I = H.vars[slot] + if(!I) + continue + prof.name_list[slot] = I.name + prof.appearance_list[slot] = I.appearance + prof.flags_cover_list[slot] = I.flags_cover + prof.item_color_list[slot] = I.item_color + prof.item_state_list[slot] = I.item_state + prof.exists_list[slot] = 1 + else + continue + + return prof + +/datum/antagonist/changeling/proc/add_profile(datum/changelingprofile/prof) + if(stored_profiles.len > dna_max) + if(!push_out_profile()) + return + + if(!first_prof) + first_prof = prof + + stored_profiles += prof + absorbedcount++ + +/datum/antagonist/changeling/proc/add_new_profile(mob/living/carbon/human/H, protect = 0) + var/datum/changelingprofile/prof = create_profile(H, protect) + add_profile(prof) + return prof + +/datum/antagonist/changeling/proc/remove_profile(mob/living/carbon/human/H, force = 0) + for(var/datum/changelingprofile/prof in stored_profiles) + if(H.real_name == prof.name) + if(prof.protected && !force) + continue + stored_profiles -= prof + qdel(prof) + +/datum/antagonist/changeling/proc/get_profile_to_remove() + for(var/datum/changelingprofile/prof in stored_profiles) + if(!prof.protected) + return prof + +/datum/antagonist/changeling/proc/push_out_profile() + var/datum/changelingprofile/removeprofile = get_profile_to_remove() + if(removeprofile) + stored_profiles -= removeprofile + return 1 + return 0 + + +/datum/antagonist/changeling/proc/create_initial_profile() + var/mob/living/carbon/C = owner.current //only carbons have dna now, so we have to typecaste + if(ishuman(C)) + add_new_profile(C) + +/datum/antagonist/changeling/apply_innate_effects() + //Brains optional. + var/mob/living/carbon/C = owner.current + if(istype(C)) + var/obj/item/organ/brain/B = C.getorganslot(ORGAN_SLOT_BRAIN) + if(B) + B.vital = FALSE + B.decoy_override = TRUE + update_changeling_icons_added() + return + +/datum/antagonist/changeling/remove_innate_effects() + update_changeling_icons_removed() + return + + +/datum/antagonist/changeling/greet() + if (you_are_greet) + to_chat(owner.current, "You are [changelingID], a changeling! You have absorbed and taken the form of a human.") + to_chat(owner.current, "Use say \":g message\" to communicate with your fellow changelings.") + to_chat(owner.current, "You must complete the following tasks:") + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ling_aler.ogg', 100, FALSE, pressure_affected = FALSE) + + owner.announce_objectives() + +/datum/antagonist/changeling/proc/forge_team_objectives() + if(GLOB.changeling_team_objective_type) + var/datum/objective/changeling_team_objective/team_objective = new GLOB.changeling_team_objective_type + team_objective.owner = owner + objectives += team_objective + return + +/datum/antagonist/changeling/proc/forge_objectives() + //OBJECTIVES - random traitor objectives. Unique objectives "steal brain" and "identity theft". + //No escape alone because changelings aren't suited for it and it'd probably just lead to rampant robusting + //If it seems like they'd be able to do it in play, add a 10% chance to have to escape alone + + var/escape_objective_possible = TRUE + + //if there's a team objective, check if it's compatible with escape objectives + for(var/datum/objective/changeling_team_objective/CTO in objectives) + if(!CTO.escape_objective_compatible) + escape_objective_possible = FALSE + break + + var/datum/objective/absorb/absorb_objective = new + absorb_objective.owner = owner + absorb_objective.gen_amount_goal(6, 8) + objectives += absorb_objective + + if(prob(60)) + if(prob(85)) + var/datum/objective/steal/steal_objective = new + steal_objective.owner = owner + steal_objective.find_target() + objectives += steal_objective + else + var/datum/objective/download/download_objective = new + download_objective.owner = owner + download_objective.gen_amount_goal() + objectives += download_objective + + var/list/active_ais = active_ais() + if(active_ais.len && prob(100/GLOB.joined_player_list.len)) + var/datum/objective/destroy/destroy_objective = new + destroy_objective.owner = owner + destroy_objective.find_target() + objectives += destroy_objective + else + if(prob(70)) + var/datum/objective/assassinate/kill_objective = new + kill_objective.owner = owner + if(team_mode) //No backstabbing while in a team + kill_objective.find_target_by_role(role = "Changeling", role_type = 1, invert = 1) + else + kill_objective.find_target() + objectives += kill_objective + else + var/datum/objective/maroon/maroon_objective = new + maroon_objective.owner = owner + if(team_mode) + maroon_objective.find_target_by_role(role = "Changeling", role_type = 1, invert = 1) + else + maroon_objective.find_target() + objectives += maroon_objective + + if (!(locate(/datum/objective/escape) in objectives) && escape_objective_possible) + var/datum/objective/escape/escape_with_identity/identity_theft = new + identity_theft.owner = owner + identity_theft.target = maroon_objective.target + identity_theft.update_explanation_text() + objectives += identity_theft + escape_objective_possible = FALSE + + if (!(locate(/datum/objective/escape) in objectives) && escape_objective_possible) + if(prob(50)) + var/datum/objective/escape/escape_objective = new + escape_objective.owner = owner + objectives += escape_objective + else + var/datum/objective/escape/escape_with_identity/identity_theft = new + identity_theft.owner = owner + if(team_mode) + identity_theft.find_target_by_role(role = "Changeling", role_type = 1, invert = 1) + else + identity_theft.find_target() + objectives += identity_theft + escape_objective_possible = FALSE + + owner.objectives |= objectives + +/datum/antagonist/changeling/proc/update_changeling_icons_added() + var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING] + hud.join_hud(owner.current) + set_antag_hud(owner.current, "changling") + +/datum/antagonist/changeling/proc/update_changeling_icons_removed() + var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING] + hud.leave_hud(owner.current) + set_antag_hud(owner.current, null) + +// Profile + +/datum/changelingprofile + var/name = "a bug" + + var/protected = 0 + + var/datum/dna/dna = null + var/list/name_list = list() //associative list of slotname = itemname + var/list/appearance_list = list() + var/list/flags_cover_list = list() + var/list/exists_list = list() + var/list/item_color_list = list() + var/list/item_state_list = list() + + var/underwear + var/undershirt + var/socks + +/datum/changelingprofile/Destroy() + qdel(dna) + . = ..() + +/datum/changelingprofile/proc/copy_profile(datum/changelingprofile/newprofile) + newprofile.name = name + newprofile.protected = protected + newprofile.dna = new dna.type + dna.copy_dna(newprofile.dna) + newprofile.name_list = name_list.Copy() + newprofile.appearance_list = appearance_list.Copy() + newprofile.flags_cover_list = flags_cover_list.Copy() + newprofile.exists_list = exists_list.Copy() + newprofile.item_color_list = item_color_list.Copy() + newprofile.item_state_list = item_state_list.Copy() + newprofile.underwear = underwear + newprofile.undershirt = undershirt + newprofile.socks = socks + + +/datum/antagonist/changeling/xenobio + name = "Xenobio Changeling" + give_objectives = FALSE + you_are_greet = FALSE diff --git a/code/datums/antagonists/devil.dm b/code/datums/antagonists/devil.dm index 2392d456cf..416a8f3752 100644 --- a/code/datums/antagonists/devil.dm +++ b/code/datums/antagonists/devil.dm @@ -35,7 +35,7 @@ GLOBAL_LIST_INIT(lawlorify, list ( BAN_CHAPEL = "This devil avoids holy ground.", BAN_HURTPRIEST = "The annointed clergy appear to be immune to his powers.", BAN_AVOIDWATER = "The devil seems to have some sort of aversion to water, though it does not appear to harm him.", - BAN_STRIKEUNCONCIOUS = "This devil only shows interest in those who are awake.", + BAN_STRIKEUNCONSCIOUS = "This devil only shows interest in those who are awake.", BAN_HURTLIZARD = "This devil will not strike a lizardman first.", BAN_HURTANIMAL = "This devil avoids hurting animals.", BANISH_WATER = "To banish the devil, you must infuse its body with holy water.", @@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(lawlorify, list ( BAN_CHAPEL = "You must never attempt to enter the chapel.", BAN_HURTPRIEST = "You must never attack a priest.", BAN_AVOIDWATER = "You must never willingly touch a wet surface.", - BAN_STRIKEUNCONCIOUS = "You must never strike an unconscious person.", + BAN_STRIKEUNCONSCIOUS = "You must never strike an unconscious person.", BAN_HURTLIZARD = "You must never harm a lizardman outside of self defense.", BAN_HURTANIMAL = "You must never harm a non-sentient creature or robot outside of self defense.", BANE_SILVER = "Silver, in all of its forms shall be your downfall.", @@ -148,7 +148,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", return pick(OBLIGATION_FOOD, OBLIGATION_FIDDLE, OBLIGATION_DANCEOFF, OBLIGATION_GREET, OBLIGATION_PRESENCEKNOWN, OBLIGATION_SAYNAME, OBLIGATION_ANNOUNCEKILL, OBLIGATION_ANSWERTONAME) /proc/randomdevilban() - return pick(BAN_HURTWOMAN, BAN_CHAPEL, BAN_HURTPRIEST, BAN_AVOIDWATER, BAN_STRIKEUNCONCIOUS, BAN_HURTLIZARD, BAN_HURTANIMAL) + return pick(BAN_HURTWOMAN, BAN_CHAPEL, BAN_HURTPRIEST, BAN_AVOIDWATER, BAN_STRIKEUNCONSCIOUS, BAN_HURTLIZARD, BAN_HURTANIMAL) /proc/randomdevilbane() return pick(BANE_SALT, BANE_LIGHT, BANE_IRON, BANE_WHITECLOTHES, BANE_SILVER, BANE_HARVEST, BANE_TOOLBOX) diff --git a/code/datums/antagonists/pirate.dm b/code/datums/antagonists/pirate.dm new file mode 100644 index 0000000000..ad32e09151 --- /dev/null +++ b/code/datums/antagonists/pirate.dm @@ -0,0 +1,135 @@ +/datum/antagonist/pirate + name = "Space Pirate" + job_rank = ROLE_TRAITOR + var/datum/objective_team/pirate/crew + +/datum/antagonist/pirate/greet() + to_chat(owner, "You are a Space Pirate!") + to_chat(owner, "The station refused to pay for your protection, protect the ship, siphon the credits from the station and raid it for even more loot.") + owner.announce_objectives() + +/datum/antagonist/pirate/get_team() + return crew + +/datum/antagonist/pirate/create_team(datum/objective_team/pirate/new_team) + if(!new_team) + for(var/datum/antagonist/pirate/P in GLOB.antagonists) + if(P.crew) + new_team = P.crew + if(!new_team) + crew = new /datum/objective_team/pirate + crew.forge_objectives() + return + if(!istype(new_team)) + stack_trace("Wrong team type passed to [type] initialization.") + crew = new_team + +/datum/antagonist/pirate/on_gain() + if(crew) + owner.objectives |= crew.objectives + . = ..() + +/datum/antagonist/pirate/on_removal() + if(crew) + owner.objectives -= crew.objectives + . = ..() + +/datum/objective_team/pirate + name = "Pirate crew" + var/list/objectives = list() + +/datum/objective_team/pirate/proc/forge_objectives() + var/datum/objective/loot/getbooty = new() + getbooty.team = src + getbooty.storage_area = locate(/area/shuttle/pirate/vault) in GLOB.sortedAreas + getbooty.update_initial_value() + getbooty.update_explanation_text() + objectives += getbooty + for(var/datum/mind/M in members) + M.objectives |= objectives + + +GLOBAL_LIST_INIT(pirate_loot_cache, typecacheof(list( + /obj/structure/reagent_dispensers/beerkeg, + /mob/living/simple_animal/parrot, + /obj/item/stack/sheet/mineral/gold, + /obj/item/stack/sheet/mineral/diamond, + /obj/item/stack/spacecash, + /obj/item/melee/sabre,))) + +/datum/objective/loot + var/area/storage_area //Place where we we will look for the loot. + explanation_text = "Acquire valuable loot and store it in designated area." + var/target_value = 50000 + var/initial_value = 0 //Things in the vault at spawn time do not count + +/datum/objective/loot/update_explanation_text() + if(storage_area) + explanation_text = "Acquire loot and store [target_value] of credits worth in [storage_area.name]." + +/datum/objective/loot/proc/loot_listing() + //Lists notable loot. + if(!storage_area) + return "Nothing" + var/list/loot_table = list() + for(var/atom/movable/AM in storage_area.GetAllContents()) + if(is_type_in_typecache(AM,GLOB.pirate_loot_cache)) + var/lootname = AM.name + var/count = 1 + if(istype(AM,/obj/item/stack)) //Ugh. + var/obj/item/stack/S = AM + lootname = S.singular_name + count = S.amount + if(!loot_table[lootname]) + loot_table[lootname] = count + else + loot_table[lootname] += count + var/text = "" + for(var/key in loot_table) + var/amount = loot_table[key] + text += "[amount] [key][amount > 1 ? "s":""], " + return text + +/datum/objective/loot/proc/get_loot_value() + if(!storage_area) + return 0 + var/value = 0 + for(var/turf/T in storage_area.contents) + value += export_item_and_contents(T,TRUE, TRUE, dry_run = TRUE) + return value - initial_value + +/datum/objective/loot/proc/update_initial_value() + initial_value = get_loot_value() + +/datum/objective/loot/check_completion() + return ..() || get_loot_value() >= target_value + + +//These need removal ASAP as everything is converted to datum antags. +/datum/game_mode/proc/auto_declare_completion_pirates() + var/list/datum/mind/pirates = get_antagonists(/datum/antagonist/pirate) + var/datum/objective_team/pirate/crew + var/text = "" + if(pirates.len) + text += "
Space Pirates were:" + for(var/datum/mind/M in pirates) + text += printplayer(M) + if(!crew) + var/datum/antagonist/pirate/P = M.has_antag_datum(/datum/antagonist/pirate) + crew = P.crew + if(crew) + text += "
Loot stolen: " + var/datum/objective/loot/L = locate() in crew.objectives + text += L.loot_listing() + text += "
Total loot value : [L.get_loot_value()]/[L.target_value] credits" + + var/all_dead = TRUE + for(var/datum/mind/M in crew.members) + if(considered_alive(M)) + all_dead = FALSE + break + if(L.check_completion() && !all_dead) + text += "
The pirate crew was successful!" + else + text += "
The pirate crew has failed." + to_chat(world, text) \ No newline at end of file diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 31e8daadb2..e8a1a17fe2 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -132,13 +132,13 @@ var/output = {"
- [Button1]"}
+ [Button1]"}
if (Button2)
- output += {"[Button2]"}
+ output += {"[Button2]"}
if (Button3)
- output += {"[Button3]"}
+ output += {"[Button3]"}
output += {"
"}
@@ -253,7 +253,7 @@
return
var/param = "null"
if(ref)
- param = "\ref[ref]"
+ param = "[REF(ref)]"
winset(user, windowid, "on-close=\".windowclose [param]\"")
diff --git a/code/datums/components/README.md b/code/datums/components/README.md
index eeb6615a63..11cbf1858d 100644
--- a/code/datums/components/README.md
+++ b/code/datums/components/README.md
@@ -87,9 +87,11 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
* Signals will not be recieved while this function is running
* Component may be deleted after this function completes without being attached
* Do not call `qdel(src)` from this function
-1. `/datum/component/Destroy()` (virtual, no-sleep)
+1. `/datum/component/Destroy(force(bool), silent(bool))` (virtual, no-sleep)
* Sends the `COMSIG_COMPONENT_REMOVING` signal to the parent datum if the `parent` isn't being qdeleted
* Properly removes the component from `parent` and cleans up references
+ * Setting `force` makes it not check for and remove the component from the parent
+ * Setting `silent` deletes the component without sending a `COMSIG_COMPONENT_REMOVING` signal
1. `/datum/component/proc/InheritComponent(datum/component/C, i_am_original(boolean))` (abstract, no-sleep)
* Called on a component when a component of the same type was added to the same parent
* See `/datum/component/var/dupe_mode`
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index 4e187a6a08..0c85ddd871 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -6,12 +6,15 @@
var/datum/parent
/datum/component/New(datum/P, ...)
+ if(type == /datum/component)
+ qdel(src)
+ CRASH("[type] instantiated!")
+
parent = P
var/list/arguments = args.Copy()
arguments.Cut(1, 2)
if(Initialize(arglist(arguments)) == COMPONENT_INCOMPATIBLE)
- parent = null
- qdel(src)
+ qdel(src, TRUE, TRUE)
return
_CheckDupesAndJoinParent(P)
@@ -32,13 +35,11 @@
switch(dm)
if(COMPONENT_DUPE_UNIQUE)
old.InheritComponent(src, TRUE)
- parent = null //prevent COMPONENT_REMOVING signal, no _RemoveFromParent because we aren't in their list yet
- qdel(src)
+ qdel(src, TRUE, TRUE)
return
if(COMPONENT_DUPE_HIGHLANDER)
InheritComponent(old, FALSE)
- old._RemoveFromParent()
- qdel(old)
+ qdel(old, FALSE, TRUE)
//provided we didn't eat someone
if(!old)
@@ -56,7 +57,7 @@
var/test = dc[I]
if(test) //already another component of this type here
var/list/components_of_type
- if(!islist(test))
+ if(!length(test))
components_of_type = list(test)
dc[I] = components_of_type
else
@@ -79,22 +80,23 @@
/datum/component/proc/Initialize(...)
return
-/datum/component/Destroy()
+/datum/component/Destroy(force=FALSE, silent=FALSE)
enabled = FALSE
var/datum/P = parent
- if(P)
+ if(!force)
_RemoveFromParent()
+ if(!silent)
P.SendSignal(COMSIG_COMPONENT_REMOVING, src)
+ parent = null
LAZYCLEARLIST(signal_procs)
return ..()
/datum/component/proc/_RemoveFromParent()
var/datum/P = parent
var/list/dc = P.datum_components
- var/our_type = type
- for(var/I in _GetInverseTypeList(our_type))
+ for(var/I in _GetInverseTypeList())
var/list/components_of_type = dc[I]
- if(islist(components_of_type)) //
+ if(length(components_of_type)) //
var/list/subtracted = components_of_type - src
if(subtracted.len == 1) //only 1 guy left
dc[I] = subtracted[1] //make him special
@@ -104,9 +106,8 @@
dc -= I
if(!dc.len)
P.datum_components = null
- parent = null
-/datum/component/proc/RegisterSignal(sig_type_or_types, proc_on_self, override = FALSE)
+/datum/component/proc/RegisterSignal(sig_type_or_types, proc_or_callback, override = FALSE)
if(QDELETED(src))
return
var/list/procs = signal_procs
@@ -120,8 +121,10 @@
. = procs[sig_type]
if(.)
stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning")
-
- procs[sig_type] = CALLBACK(src, proc_on_self)
+
+ if(!istype(proc_or_callback, /datum/callback)) //if it wasnt a callback before, it is now
+ proc_or_callback = CALLBACK(src, proc_or_callback)
+ procs[sig_type] = proc_or_callback
/datum/component/proc/InheritComponent(datum/component/C, i_am_original)
return
@@ -133,8 +136,19 @@
set waitfor = FALSE
return
-/datum/component/proc/_GetInverseTypeList(current_type)
- . = list(current_type)
+/datum/component/proc/_GetInverseTypeList(our_type = type)
+ #if DM_VERSION >= 513
+ #warning 512 is definitely stable now, remove the old code
+ #endif
+
+ #if DM_VERSION < 512
+ //remove this when we use 512 full time
+ set invisibility = 101
+ #endif
+ //we can do this one simple trick
+ var/current_type = parent_type
+ . = list(our_type, current_type)
+ //and since most components are root level + 1, this won't even have to run
while (current_type != /datum/component)
current_type = type2parent(current_type)
. += current_type
@@ -146,7 +160,7 @@
var/list/arguments = args.Copy()
arguments.Cut(1, 2)
var/target = comps[/datum/component]
- if(!islist(target))
+ if(!length(target))
var/datum/component/C = target
if(!C.enabled)
return FALSE
@@ -182,7 +196,7 @@
if(!dc)
return null
. = dc[c_type]
- if(islist(.))
+ if(length(.))
return .[1]
/datum/proc/GetExactComponent(c_type)
@@ -191,7 +205,7 @@
return null
var/datum/component/C = dc[c_type]
if(C)
- if(islist(C))
+ if(length(C))
C = C[1]
if(C.type == c_type)
return C
@@ -202,7 +216,7 @@
if(!dc)
return null
. = dc[c_type]
- if(!islist(.))
+ if(!length(.))
return list(.)
/datum/proc/AddComponent(new_type, ...)
diff --git a/code/datums/components/decal.dm b/code/datums/components/decal.dm
new file mode 100644
index 0000000000..a28213b0b5
--- /dev/null
+++ b/code/datums/components/decal.dm
@@ -0,0 +1,60 @@
+/datum/component/decal
+ dupe_mode = COMPONENT_DUPE_ALLOWED
+
+ var/cleanable
+ var/description
+ var/mutable_appearance/pic
+
+/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER, _description)
+ if(!isatom(parent) || !_icon || !_icon_state)
+ . = COMPONENT_INCOMPATIBLE
+ CRASH("A turf decal was applied incorrectly to [parent.type]: icon:[_icon ? _icon : "none"] icon_state:[_icon_state ? _icon_state : "none"]")
+
+ // It has to be made from an image or dir breaks because of a byond bug
+ var/temp_image = image(_icon, null, _icon_state, _layer, _dir)
+ pic = new(temp_image)
+ pic.color = _color
+
+ cleanable = _cleanable
+ description = _description
+
+ apply()
+
+ if(_dir) // If no dir is assigned at start then it follows the atom's dir
+ RegisterSignal(COMSIG_ATOM_DIR_CHANGE, .proc/rotate_react)
+ if(_cleanable)
+ RegisterSignal(COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
+ if(_description)
+ RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/examine)
+
+/datum/component/decal/Destroy()
+ remove()
+ return ..()
+
+/datum/component/decal/OnTransfer(atom/thing)
+ remove()
+ remove(thing)
+ apply(thing)
+
+/datum/component/decal/proc/apply(atom/thing)
+ var/atom/master = thing || parent
+ master.add_overlay(pic, TRUE)
+
+/datum/component/decal/proc/remove(atom/thing)
+ var/atom/master = thing || parent
+ master.cut_overlay(pic, TRUE)
+
+/datum/component/decal/proc/rotate_react(old_dir, new_dir)
+ if(old_dir == new_dir)
+ return
+ remove()
+ var/rotation = SimplifyDegrees(dir2angle(new_dir)-dir2angle(old_dir))
+ pic.dir = turn(pic.dir, rotation)
+ apply()
+
+/datum/component/decal/proc/clean_react(strength)
+ if(strength >= cleanable)
+ qdel(src)
+
+/datum/component/decal/proc/examine(mob/user)
+ to_chat(user, description)
\ No newline at end of file
diff --git a/code/datums/components/radioactive.dm b/code/datums/components/radioactive.dm
index b0bf28f163..c149fd8492 100644
--- a/code/datums/components/radioactive.dm
+++ b/code/datums/components/radioactive.dm
@@ -37,11 +37,15 @@
return ..()
/datum/component/radioactive/process()
- if(hl3_release_date && prob(50))
- radiation_pulse(parent, strength, RAD_DISTANCE_COEFFICIENT*2, FALSE, can_contaminate)
- strength -= strength / hl3_release_date
- if(strength <= RAD_BACKGROUND_RADIATION)
- qdel(src)
+ if(!prob(50))
+ return
+ radiation_pulse(parent, strength, RAD_DISTANCE_COEFFICIENT*2, FALSE, can_contaminate)
+
+ if(!hl3_release_date)
+ return
+ strength -= strength / hl3_release_date
+ if(strength <= RAD_BACKGROUND_RADIATION)
+ return PROCESS_KILL
/datum/component/radioactive/InheritComponent(datum/component/C, i_am_original)
if(!i_am_original)
diff --git a/code/datums/components/signal_redirect.dm b/code/datums/components/signal_redirect.dm
new file mode 100644
index 0000000000..38372dd356
--- /dev/null
+++ b/code/datums/components/signal_redirect.dm
@@ -0,0 +1,9 @@
+/datum/component/redirect
+ dupe_mode = COMPONENT_DUPE_ALLOWED
+
+/datum/component/redirect/Initialize(list/signals, datum/callback/_callback)
+ //It's not our job to verify the right signals are registered here, just do it.
+ if(!LAZYLEN(signals) || !istype(_callback))
+ . = COMPONENT_INCOMPATIBLE
+ CRASH("A redirection component was initialized with incorrect args.")
+ RegisterSignal(signals, _callback)
diff --git a/code/datums/components/turf_decal.dm b/code/datums/components/turf_decal.dm
new file mode 100644
index 0000000000..0cd4cb969e
--- /dev/null
+++ b/code/datums/components/turf_decal.dm
@@ -0,0 +1,51 @@
+/datum/component/turf_decal
+ var/dir
+ var/icon
+ var/icon_state
+ var/layer
+ var/group
+
+/datum/component/turf_decal/Initialize(_dir, _icon, _icon_state, _layer=TURF_DECAL_LAYER, _group=TURF_DECAL_PAINT)
+ if(!isturf(parent) || !_icon || !_icon_state)
+ WARNING("A turf decal was applied incorrectly to [parent]: icon:[_icon ? _icon : "none"] icon_state:[_icon_state ? _icon_state : "none"]")
+ return COMPONENT_INCOMPATIBLE
+
+ dir = _dir
+ icon = _icon
+ icon_state = _icon_state
+ layer = _layer
+ group = _group
+ apply_decal()
+
+ RegisterSignal(COMSIG_ATOM_ROTATE, .proc/rotate_react)
+ RegisterSignal(COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
+
+/datum/component/turf_decal/Destroy()
+ remove_decal()
+ return ..()
+
+/datum/component/turf_decal/OnTransfer(turf/newT)
+ remove_decal()
+ remove_decal(newT)
+ apply_decal(newT)
+
+/datum/component/turf_decal/proc/get_decal()
+ return image(icon, null, icon_state, layer, dir)
+
+/datum/component/turf_decal/proc/apply_decal(turf/overT)
+ var/turf/master = overT || parent
+ master.add_decal(get_decal(), group)
+
+/datum/component/turf_decal/proc/remove_decal(turf/overT)
+ var/turf/master = overT || parent
+ master.remove_decal(group)
+
+/datum/component/turf_decal/proc/rotate_react(rotation, params)
+ if(params & ROTATE_DIR)
+ dir = angle2dir(rotation+dir2angle(dir))
+ remove_decal()
+ apply_decal()
+
+/datum/component/turf_decal/proc/clean_react(strength)
+ if(strength >= CLEAN_IMPRESSIVE)
+ qdel(src)
\ No newline at end of file
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
index f7b15035d1..4c08b1000d 100644
--- a/code/datums/datum.dm
+++ b/code/datums/datum.dm
@@ -3,6 +3,8 @@
var/list/active_timers //for SStimer
var/list/datum_components //for /datum/components
var/ui_screen = "home" //for tgui
+ var/use_tag = FALSE
+ var/datum/weakref/weak_reference
#ifdef TESTING
var/running_find_references
@@ -12,8 +14,9 @@
// Default implementation of clean-up code.
// This should be overridden to remove all references pointing to the object being destroyed.
// Return the appropriate QDEL_HINT; in most cases this is QDEL_HINT_QUEUE.
-/datum/proc/Destroy(force=FALSE)
+/datum/proc/Destroy(force=FALSE, ...)
tag = null
+ weak_reference = null //ensure prompt GCing of weakref.
var/list/timers = active_timers
active_timers = null
for(var/thing in timers)
@@ -24,14 +27,12 @@
var/list/dc = datum_components
if(dc)
var/all_components = dc[/datum/component]
- if(islist(all_components))
+ if(length(all_components))
for(var/I in all_components)
var/datum/component/C = I
- C._RemoveFromParent()
- qdel(C)
+ qdel(C, FALSE, TRUE)
else
var/datum/component/C = all_components
- C._RemoveFromParent()
- qdel(C)
+ qdel(C, FALSE, TRUE)
dc.Cut()
return QDEL_HINT_QUEUE
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index b653e5c6ae..e41666008c 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -25,10 +25,10 @@
/datum/proc/vv_get_dropdown()
. = list()
. += "---"
- .["Call Proc"] = "?_src_=vars;[HrefToken()];proc_call=\ref[src]"
- .["Mark Object"] = "?_src_=vars;[HrefToken()];mark_object=\ref[src]"
- .["Delete"] = "?_src_=vars;[HrefToken()];delete=\ref[src]"
- .["Show VV To Player"] = "?_src_=vars;[HrefToken(TRUE)];expose=\ref[src]"
+ .["Call Proc"] = "?_src_=vars;[HrefToken()];proc_call=[REF(src)]"
+ .["Mark Object"] = "?_src_=vars;[HrefToken()];mark_object=[REF(src)]"
+ .["Delete"] = "?_src_=vars;[HrefToken()];delete=[REF(src)]"
+ .["Show VV To Player"] = "?_src_=vars;[HrefToken(TRUE)];expose=[REF(src)]"
/datum/proc/on_reagent_change()
@@ -53,7 +53,7 @@
return
var/title = ""
- var/refid = "\ref[D]"
+ var/refid = REF(D)
var/icon/sprite
var/hash
@@ -71,7 +71,7 @@
hash = md5(hash + AT.icon_state)
src << browse_rsc(sprite, "vv[hash].png")
- title = "[D] (\ref[D]) = [type]"
+ title = "[D] ([REF(D)]) = [type]"
var/sprite_text
if(sprite)
@@ -394,9 +394,9 @@
name = DA[name] //name is really the index until this line
else
value = DA[name]
- header = "![](\"tmp\ref[value][rnd].png\")
"
+ src << browse_rsc(I.icon, "tmp[REF(value)][rnd].png")
+ html += "[name] = ![](\"tmp[REF(value)][rnd].png\")
"
#else
html += "[name] = /image ([value])"
#endif
@@ -434,14 +434,14 @@
//else if (istype(value, /client))
// var/client/C = value
- // item = "[VV_HTML_ENCODE(name)] \ref[value] = [C] [C.type]"
+ // item = "[VV_HTML_ENCODE(name)] [REF(value)] = [C] [C.type]"
else if (istype(value, /datum))
var/datum/D = value
if ("[D]" != "[D.type]") //if the thing as a name var, lets use it.
- item = "[VV_HTML_ENCODE(name)] \ref[value] = [D] [D.type]"
+ item = "[VV_HTML_ENCODE(name)] [REF(value)] = [D] [D.type]"
else
- item = "[VV_HTML_ENCODE(name)] \ref[value] = [D.type]"
+ item = "[VV_HTML_ENCODE(name)] [REF(value)] = [D.type]"
else if (islist(value))
var/list/L = value
@@ -453,15 +453,15 @@
var/val
if (IS_NORMAL_LIST(L) && !isnum(key))
val = L[key]
- if (!val)
+ if (isnull(val)) // we still want to display non-null false values, such as 0 or ""
val = key
key = i
items += debug_variable(key, val, level + 1, sanitize = sanitize)
- item = "[VV_HTML_ENCODE(name)] = /list ([L.len])- [items.Join()]
- [items.Join()]
" out += "Mind currently owned by key: [key] [active?"(synced)":"(not synced)"]
" - out += "Assigned role: [assigned_role]. Edit
" + out += "Assigned role: [assigned_role]. Edit
" out += "Faction and special role: [special_role]
" var/list/sections = list( @@ -412,11 +406,11 @@ text = uppertext(text) text = "[text]: " if (src in SSticker.mode.traitors) - text += "TRAITOR | loyal" + text += "TRAITOR | loyal" if (objectives.len==0) - text += "
Objectives are empty! Randomize!" + text += "
Objectives are empty! Randomize!" else - text += "traitor | LOYAL" + text += "traitor | LOYAL" if(current && current.client && (ROLE_TRAITOR in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -434,7 +428,7 @@ text = uppertext(text) text = "[text]: " if(src in SSticker.mode.brothers) - text += "Brother | no" + text += "Brother | no" if(current && current.client && (ROLE_BROTHER in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -448,20 +442,15 @@ if (SSticker.mode.config_tag=="changeling" || SSticker.mode.config_tag=="traitorchan") text = uppertext(text) text = "[text]: " - if ((src in SSticker.mode.changelings) && special_role) - text += "YES | no" + var/datum/antagonist/changeling/C = has_antag_datum(/datum/antagonist/changeling) + if(C) + text += "[C.name] | No" if (objectives.len==0) - text += "
Objectives are empty! Randomize!" - if(changeling && changeling.stored_profiles.len && (current.real_name != changeling.first_prof.name) ) - text += "
Transform to initial appearance." - else if(src in SSticker.mode.changelings) //Station Aligned Changeling - text += "YES (but not an antag) | no" - if (objectives.len==0) - text += "
Objectives are empty! Randomize!" - if(changeling && changeling.stored_profiles.len && (current.real_name != changeling.first_prof.name) ) - text += "
Transform to initial appearance." + text += "
Objectives are empty! Randomize!" + if(C.stored_profiles.len && (current.real_name != C.first_prof.name) ) + text += "
Transform to initial appearance." else - text += "yes | NO" + text += "yes | NO" if(current && current.client && (ROLE_CHANGELING in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -477,7 +466,7 @@ text = uppertext(text) text = "[text]: " if (ishuman(current)) - text += "healthy | infected | HUMAN | other" + text += "healthy | infected | HUMAN | other" else if(ismonkey(current)) var/found = FALSE for(var/datum/disease/transformation/jungle_fever/JF in current.viruses) @@ -485,9 +474,9 @@ break if(found) - text += "healthy | INFECTED | human | other" + text += "healthy | INFECTED | human | other" else - text += "HEALTHY | infected | human | other" + text += "HEALTHY | infected | human | other" else text += "healthy | infected | human | OTHER" @@ -507,17 +496,17 @@ text = uppertext(text) text = "[text]: " if (src in SSticker.mode.syndicates) - text += "OPERATIVE | nanotrasen" - text += "
To shuttle, undress, dress up." + text += "OPERATIVE | nanotrasen" + text += "
To shuttle, undress, dress up." var/code for (var/obj/machinery/nuclearbomb/bombue in GLOB.machines) if (length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN") code = bombue.r_code break if (code) - text += " Code is [code]. tell the code." + text += " Code is [code]. tell the code." else - text += "operative | NANOTRASEN" + text += "operative | NANOTRASEN" if(current && current.client && (ROLE_OPERATIVE in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -533,10 +522,10 @@ text = uppertext(text) text = "[text]: " if (has_antag_datum(/datum/antagonist/wizard)) - text += "YES | no" - text += "
To lair, undress" + text += "YES | no" + text += "
To lair, undress" else - text += "yes | NO" + text += "yes | NO" if(current && current.client && (ROLE_WIZARD in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -563,28 +552,28 @@ if(M && (M.z in GLOB.station_z_levels) && !M.stat) last_healthy_headrev = FALSE break - text += "head | not mindshielded | employee | [last_healthy_headrev ? "LAST " : ""]HEADREV | rev" - text += "
Flash: give" + text += "head | not mindshielded | employee | [last_healthy_headrev ? "LAST " : ""]HEADREV | rev" + text += "
Flash: give" var/list/L = current.get_contents() var/obj/item/device/assembly/flash/flash = locate() in L if (flash) if(!flash.crit_fail) - text += " | take." + text += " | take." else - text += " | take | repair." + text += " | take | repair." else text += "." - text += " Reequip (gives traitor uplink)." + text += " Reequip (gives traitor uplink)." if (objectives.len==0) - text += "
Objectives are empty! Set to kill all heads." + text += "
Objectives are empty! Set to kill all heads." else if(current.isloyal()) - text += "head | MINDSHIELDED | employee | headrev | rev" + text += "head | MINDSHIELDED | employee | headrev | rev" else if (has_antag_datum(/datum/antagonist/rev)) - text += "head | not mindshielded | employee | headrev | REV" + text += "head | not mindshielded | employee | headrev | REV" else - text += "head | not mindshielded | EMPLOYEE | headrev | rev" + text += "head | not mindshielded | EMPLOYEE | headrev | rev" if(current && current.client && (ROLE_REV in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -599,8 +588,8 @@ text = uppertext(text) text = "[text]: " if(src in SSticker.mode.abductors) - text += "Abductor | human" - text += " | undress | equip" + text += "Abductor | human" + text += " | undress | equip" if(current && current.client && (ROLE_ABDUCTOR in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -618,13 +607,13 @@ var/datum/antagonist/devil/devilinfo = has_antag_datum(ANTAG_DATUM_DEVIL) if(devilinfo) if(!devilinfo.ascendable) - text += "DEVIL | ascendable devil | sintouched | human" + text += "DEVIL | ascendable devil | sintouched | human" else - text += "DEVIL | ASCENDABLE DEVIL | sintouched | human" + text += "DEVIL | ASCENDABLE DEVIL | sintouched | human" else if(src in SSticker.mode.sintouched) - text += "devil | ascendable devil | SINTOUCHED | human" + text += "devil | ascendable devil | SINTOUCHED | human" else - text += "devil | ascendable devil | sintouched | HUMAN" + text += "devil | ascendable devil | sintouched | HUMAN" if(current && current.client && (ROLE_DEVIL in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -641,11 +630,11 @@ var/datum/antagonist/ninja/ninjainfo = has_antag_datum(ANTAG_DATUM_NINJA) if(ninjainfo) if(ninjainfo.helping_station) - text += "employee | syndicate | NANOTRASEN | EQUIP" + text += "employee | syndicate | NANOTRASEN | EQUIP" else - text += "employee | SYNDICATE | nanotrasen | EQUIP" + text += "employee | SYNDICATE | nanotrasen | EQUIP" else - text += "EMPLOYEE | syndicate | nanotrasen | random allegiance" + text += "EMPLOYEE | syndicate | nanotrasen | random allegiance" if(current && current.client && (ROLE_NINJA in current.client.prefs.be_special)) text += " | Enabled in Prefs" else @@ -660,10 +649,10 @@ text = uppertext(text) text = "[text]: " if(iscultist(current)) - text += "not mindshielded | employee | CULTIST" - text += "
Give tome | amulet." + text += "not mindshielded | employee | CULTIST" + text += "
Give tome | amulet." else if(is_convertable_to_cult(current)) - text += "not mindshielded | EMPLOYEE | cultist" + text += "not mindshielded | EMPLOYEE | cultist" else text += "[!current.isloyal() ? "not mindshielded" : "MINDSHIELDED"] | EMPLOYEE | cannot serve Nar-Sie" @@ -682,10 +671,10 @@ text = uppertext(text) text = "[text]: " if(is_servant_of_ratvar(current)) - text += "not mindshielded | employee | SERVANT" - text += "
Equip" + text += "not mindshielded | employee | SERVANT" + text += "
Equip" else if(is_eligible_servant(current)) - text += "not mindshielded | EMPLOYEE | servant" + text += "not mindshielded | EMPLOYEE | servant" else text += "[!current.isloyal() ? "not mindshielded" : "MINDSHIELDED"] | EMPLOYEE | cannot serve Ratvar" @@ -702,14 +691,14 @@ text = "silicon" var/mob/living/silicon/robot/robot = current if (istype(robot) && robot.emagged) - text += "
Cyborg: Is emagged! Unemag!
0th law: [robot.laws.zeroth]" + text += "
Cyborg: Is emagged! Unemag!
0th law: [robot.laws.zeroth]" var/mob/living/silicon/ai/ai = current if (istype(ai) && ai.connected_robots.len) var/n_e_robots = 0 for (var/mob/living/silicon/robot/R in ai.connected_robots) if (R.emagged) n_e_robots++ - text += "
[n_e_robots] of [ai.connected_robots.len] slaved cyborgs are emagged. Unemag" + text += "
[n_e_robots] of [ai.connected_robots.len] slaved cyborgs are emagged. Unemag" if (SSticker.mode.config_tag == "traitorchan") if (sections["traitor"]) out += sections["traitor"]+"
" @@ -727,12 +716,12 @@ if(((src in SSticker.mode.traitors) || (src in SSticker.mode.syndicates)) && ishuman(current)) - text = "Uplink: give" + text = "Uplink: give" var/obj/item/device/uplink/U = find_syndicate_uplink() if(U) - text += " | take" + text += " | take" if (check_rights(R_FUN, 0)) - text += ", [U.telecrystals] TC" + text += ", [U.telecrystals] TC" else text += ", [U.telecrystals] TC" text += "." //hiel grammar @@ -742,18 +731,18 @@ out += "Memory:
" out += memory - out += "
Edit memory
" + out += "
Edit memory
" out += "Objectives:
" if (objectives.len == 0) out += "EMPTY
" else var/obj_count = 1 for(var/datum/objective/objective in objectives) - out += "[obj_count]: [objective.explanation_text] Edit Delete Toggle Completion
" + out += "[obj_count]: [objective.explanation_text] Edit Delete Toggle Completion
" obj_count++ - out += "Add objective
" + out += "Add objective
" - out += "Announce objectives
" + out += "Announce objectives
" var/datum/browser/popup = new(usr, "edit_memory", "", 600, 600) popup.set_content(out) @@ -955,7 +944,7 @@ log_admin("[key_name(usr)] has rev'ed [current].") else return - + if("headrev") if(has_antag_datum(/datum/antagonist/rev)) var/datum/antagonist/rev/rev = has_antag_datum(/datum/antagonist/rev) @@ -1050,30 +1039,29 @@ else if (href_list["changeling"]) switch(href_list["changeling"]) if("clear") - remove_changeling() + remove_antag_datum(/datum/antagonist/changeling) + special_role = null to_chat(current, "You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!") message_admins("[key_name_admin(usr)] has de-changeling'ed [current].") log_admin("[key_name(usr)] has de-changeling'ed [current].") if("changeling") - if(!(src in SSticker.mode.changelings)) - SSticker.mode.changelings += src - current.make_changeling() - special_role = "Changeling" - to_chat(current, "Your powers are awoken. A flash of memory returns to us...we are [changeling.changelingID], a changeling!") - message_admins("[key_name_admin(usr)] has changeling'ed [current].") - log_admin("[key_name(usr)] has changeling'ed [current].") - SSticker.mode.update_changeling_icons_added(src) + var/datum/antagonist/changeling/C = make_Changling() + to_chat(current, "Our powers have awoken. A flash of memory returns to us...we are [C.changelingID], a changeling!") + message_admins("[key_name_admin(usr)] has changeling'ed [current].") + log_admin("[key_name(usr)] has changeling'ed [current].") if("autoobjectives") - SSticker.mode.forge_changeling_objectives(src) + var/datum/antagonist/changeling/C = has_antag_datum(/datum/antagonist/changeling) + if(C) + C.forge_objectives() to_chat(usr, "The objectives for changeling [key] have been generated. You can edit them and anounce manually.") - if("initialdna") - if( !changeling || !changeling.stored_profiles.len || !iscarbon(current)) + var/datum/antagonist/changeling/ling = has_antag_datum(/datum/antagonist/changeling) + if( !ling || !ling.stored_profiles.len || !iscarbon(current)) to_chat(usr, "Resetting DNA failed!") else var/mob/living/carbon/C = current - changeling.first_prof.dna.transfer_identity(C, transfer_SE=1) - C.real_name = changeling.first_prof.name + ling.first_prof.dna.transfer_identity(C, transfer_SE=1) + C.real_name = ling.first_prof.name C.updateappearance(mutcolor_update=1) C.domutcheck() @@ -1408,13 +1396,11 @@ current.real_name = "[syndicate_name()] Operative #[SSticker.mode.syndicates.len-1]" /datum/mind/proc/make_Changling() - if(!(src in SSticker.mode.changelings)) - SSticker.mode.changelings += src - current.make_changeling() + var/datum/antagonist/changeling/C = has_antag_datum(/datum/antagonist/changeling) + if(!C) + C = add_antag_datum(/datum/antagonist/changeling) special_role = "Changeling" - SSticker.mode.forge_changeling_objectives(src) - SSticker.mode.greet_changeling(src) - SSticker.mode.update_changeling_icons_added(src) + return C /datum/mind/proc/make_Wizard() if(!has_antag_datum(/datum/antagonist/wizard)) diff --git a/code/datums/radiation_wave.dm b/code/datums/radiation_wave.dm index ffc6b75fcb..f065ccfeab 100644 --- a/code/datums/radiation_wave.dm +++ b/code/datums/radiation_wave.dm @@ -98,7 +98,8 @@ /obj/structure/cable, /obj/machinery/atmospherics, /obj/item/ammo_casing, - /obj/item/implant + /obj/item/implant, + /obj/singularity )) if(!can_contaminate || blacklisted[thing.type]) continue diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 3526ee6f53..5c646491c8 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -142,7 +142,7 @@ /datum/map_template/ruin/lavaland/ufo_crash name = "UFO Crash" id = "ufo-crash" - description = "Turns out that keeping your abductees unconcious is really important. Who knew?" + description = "Turns out that keeping your abductees unconscious is really important. Who knew?" suffix = "lavaland_surface_ufo_crash.dmm" cost = 5 diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index ce38d0af3e..1ec392a5b2 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -149,7 +149,7 @@ suffix = "mini" name = "Ministation emergency shuttle" credit_cost = 1000 - description = "Despite it's namesake, this shuttle is actually only slightly smaller than standard, and still complete with a brig and medbay." + description = "Despite its namesake, this shuttle is actually only slightly smaller than standard, and still complete with a brig and medbay." /datum/map_template/shuttle/emergency/scrapheap suffix = "scrapheap" diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm index a9fd77d1e2..ebbe08c525 100644 --- a/code/datums/spawners_menu.dm +++ b/code/datums/spawners_menu.dm @@ -21,7 +21,7 @@ this["desc"] = "" this["refs"] = list() for(var/spawner_obj in GLOB.mob_spawners[spawner]) - this["refs"] += "\ref[spawner_obj]" + this["refs"] += "[REF(spawner_obj)]" if(!this["desc"]) if(istype(spawner_obj, /obj/effect/mob_spawn)) var/obj/effect/mob_spawn/MS = spawner_obj @@ -40,6 +40,8 @@ var/spawner_ref = pick(GLOB.mob_spawners[params["name"]]) var/obj/effect/mob_spawn/MS = locate(spawner_ref) in GLOB.poi_list + if(!MS) + return switch(action) if("jump") diff --git a/code/datums/weakrefs.dm b/code/datums/weakrefs.dm new file mode 100644 index 0000000000..2347d0f831 --- /dev/null +++ b/code/datums/weakrefs.dm @@ -0,0 +1,18 @@ +/proc/WEAKREF(datum/input) + if(istype(input) && !QDELETED(input)) + if(!input.weak_reference) + input.weak_reference = new /datum/weakref(input) + return input.weak_reference + +/datum/weakref + var/reference + +/datum/weakref/New(datum/thing) + reference = REF(thing) + +/datum/weakref/Destroy() + return QDEL_HINT_LETMELIVE //Let BYOND autoGC thiswhen nothing is using it anymore. + +/datum/weakref/proc/resolve() + var/datum/D = locate(reference) + return (!QDELETED(D) && D.weak_reference == src) ? D : null diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm index a1dc9ece69..14133c6a11 100644 --- a/code/datums/weather/weather_types/ash_storm.dm +++ b/code/datums/weather/weather_types/ash_storm.dm @@ -5,18 +5,15 @@ telegraph_message = "An eerie moan rises on the wind. Sheets of burning ash blacken the horizon. Seek shelter." telegraph_duration = 300 - telegraph_sound = 'sound/lavaland/ash_storm_windup.ogg' telegraph_overlay = "light_ash" weather_message = "Smoldering clouds of scorching ash billow down around you! Get inside!" weather_duration_lower = 600 weather_duration_upper = 1200 - weather_sound = 'sound/lavaland/ash_storm_start.ogg' weather_overlay = "ash_storm" end_message = "The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now." end_duration = 300 - end_sound = 'sound/lavaland/ash_storm_end.ogg' end_overlay = "light_ash" area_type = /area/lavaland/surface/outdoors @@ -26,6 +23,53 @@ probability = 90 + var/datum/looping_sound/active_outside_ashstorm/sound_ao = new(list(), FALSE, TRUE) + var/datum/looping_sound/active_inside_ashstorm/sound_ai = new(list(), FALSE, TRUE) + var/datum/looping_sound/weak_outside_ashstorm/sound_wo = new(list(), FALSE, TRUE) + var/datum/looping_sound/weak_inside_ashstorm/sound_wi = new(list(), FALSE, TRUE) + +/datum/weather/ash_storm/telegraph() + . = ..() + var/list/inside_areas = list() + var/list/outside_areas = list() + var/list/eligible_areas = SSmapping.areas_in_z["[target_z]"] + for(var/i in 1 to eligible_areas.len) + var/area/place = eligible_areas[i] + if(place.outdoors) + outside_areas += place + else + inside_areas += place + CHECK_TICK + + sound_ao.output_atoms = outside_areas + sound_ai.output_atoms = inside_areas + sound_wo.output_atoms = outside_areas + sound_wi.output_atoms = inside_areas + + sound_wo.start() + sound_wi.start() + +/datum/weather/ash_storm/start() + . = ..() + sound_wo.stop() + sound_wi.stop() + + sound_ao.start() + sound_ai.start() + +/datum/weather/ash_storm/wind_down() + . = ..() + sound_ao.stop() + sound_ai.stop() + + sound_wo.start() + sound_wi.start() + +/datum/weather/ash_storm/end() + . = ..() + sound_wo.stop() + sound_wi.stop() + /datum/weather/ash_storm/proc/is_ash_immune(mob/living/L) if(ismecha(L.loc)) //Mechs are immune return TRUE @@ -50,7 +94,6 @@ desc = "A passing ash storm blankets the area in harmless embers." weather_message = "Gentle embers waft down around you like grotesque snow. The storm seems to have passed you by..." - weather_sound = 'sound/lavaland/ash_storm_windup.ogg' weather_overlay = "light_ash" end_message = "The emberfall slows, stops. Another layer of hardened soot to the basalt beneath your feet." diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index c508907bf4..19f7157faa 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -74,7 +74,7 @@ "white", "yellow" ) - + var/list/my_possible_colors = possible_colors.Copy() for(var/wire in shuffle(wires)) @@ -163,9 +163,9 @@ for(var/wire in possible_wires) if(prob(33)) pulse(wire) - remaining_pulses-- - if(remaining_pulses >= 0) - break + remaining_pulses-- + if(!remaining_pulses) + break // Overridable Procs /datum/wires/proc/interactable(mob/user) diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 66dafe2e8f..cb5878208e 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -41,7 +41,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station power_environ = FALSE valid_territory = FALSE outdoors = TRUE - ambientsounds = list('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg') + ambientsounds = SPACE blob_allowed = FALSE //Eating up space doesn't count for victory as a blob. /area/space/nearstation @@ -65,6 +65,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station has_gravity = TRUE blob_allowed = FALSE //Nope, no winning on the asteroid as a blob. Gotta eat the station. valid_territory = FALSE + ambientsounds = MINING /area/asteroid/cave name = "Asteroid - Underground" @@ -75,6 +76,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/asteroid/artifactroom name = "Asteroid - Artifact" icon_state = "cave" + ambientsounds = RUINS /area/asteroid/artifactroom/Initialize() . = ..() @@ -96,14 +98,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //Maintenance /area/maintenance - ambientsounds = list('sound/ambience/ambimaint1.ogg', - 'sound/ambience/ambimaint2.ogg', - 'sound/ambience/ambimaint3.ogg', - 'sound/ambience/ambimaint4.ogg', - 'sound/ambience/ambimaint5.ogg', - 'sound/voice/lowHiss2.ogg', //Xeno Breathing Hisses, Hahahaha I'm not even sorry. - 'sound/voice/lowHiss3.ogg', - 'sound/voice/lowHiss4.ogg') + ambientsounds = MAINTENANCE valid_territory = FALSE @@ -111,43 +106,43 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/maintenance/department/chapel name = "Chapel Maintenance" - icon_state = "fpmaint" + icon_state = "maint_chapel" /area/maintenance/department/chapel/monastery name = "Monastery Maintenance" - icon_state = "fpmaint" + icon_state = "maint_monastery" /area/maintenance/department/crew_quarters/bar name = "Bar Maintenance" - icon_state = "fsmaint" + icon_state = "maint_bar" /area/maintenance/department/crew_quarters/dorms name = "Dormitory Maintenance" - icon_state = "fsmaint" + icon_state = "maint_dorms" /area/maintenance/department/crew_quarters/locker name = "Locker Room Maintenance" - icon_state = "pmaint" + icon_state = "maint_locker" /area/maintenance/department/eva name = "EVA Maintenance" - icon_state = "fpmaint" + icon_state = "maint_eva" /area/maintenance/department/electrical name = "Electrical Maintenance" - icon_state = "yellow" + icon_state = "maint_electrical" /area/maintenance/department/engine/atmos name = "Atmospherics Maintenance" - icon_state = "fpmaint" + icon_state = "maint_atmos" /area/maintenance/department/security name = "Security Maintenance" - icon_state = "fpmaint" + icon_state = "maint_sec" /area/maintenance/department/security/brig name = "Brig Maintenance" - icon_state = "fpmaint" + icon_state = "maint_brig" /area/maintenance/department/medical name = "Medbay Maintenance" @@ -159,19 +154,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/maintenance/department/science name = "Science Maintenance" - icon_state = "asmaint" + icon_state = "maint_sci" /area/maintenance/department/cargo name = "Cargo Maintenance" - icon_state = "apmaint" + icon_state = "maint_cargo" /area/maintenance/department/bridge name = "Bridge Maintenance" - icon_state = "maintcentral" + icon_state = "maint_bridge" /area/maintenance/department/engine name = "Engineering Maintenance" - icon_state = "amaint" + icon_state = "maint_engi" /area/maintenance/department/science/xenobiology name = "Xenobiology Maintenance" @@ -621,7 +616,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/abandoned_gambling_den name = "Abandoned Gambling Den" - icon_state = "bar" + icon_state = "abandoned_g_den" + +/area/crew_quarters/abandoned_gambling_den/secondary + icon_state = "abandoned_g_den_2" /area/crew_quarters/theatre name = "Theatre" @@ -647,7 +645,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/chapel icon_state = "chapel" - ambientsounds = list('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg') + ambientsounds = HOLY flags_1 = NONE clockwork_warp_allowed = FALSE clockwork_warp_fail = "The consecration here prevents you from warping in." @@ -678,7 +676,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //Engineering /area/engine - ambientsounds = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg') + ambientsounds = ENGINEERING /area/engine/engine_smes name = "Engineering SMES" @@ -732,6 +730,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station valid_territory = FALSE blob_allowed = FALSE flags_1 = NONE + ambientsounds = ENGINEERING /area/solar/asteroid/aft name = "Aft Asteroid Solar" @@ -858,37 +857,36 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Teleporter Room" icon_state = "teleporter" music = "signal" + ambientsounds = ENGINEERING /area/teleporter/quantum/cargo name = "Cargo Quantum Pad" icon_state = "teleporter" - music = "signal" /area/teleporter/quantum/docking name = "Docking Quantum Pad" icon_state = "teleporter" - music = "signal" /area/teleporter/quantum/research name = "Research Quantum Pad" icon_state = "teleporter" - music = "signal" /area/teleporter/quantum/security name = "Security Quantum Pad" icon_state = "teleporter" - music = "signal" /area/gateway name = "Gateway" - icon_state = "teleporter" + icon_state = "gateway" music = "signal" + ambientsounds = ENGINEERING //MedBay /area/medical name = "Medical" icon_state = "medbay3" + ambientsounds = MEDICAL /area/medical/abandoned name = "Abandoned Medbay" @@ -952,7 +950,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/morgue name = "Morgue" icon_state = "morgue" - ambientsounds = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg') + ambientsounds = SPOOKY /area/medical/chemistry name = "Chemistry" @@ -988,6 +986,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security name = "Security" icon_state = "security" + ambientsounds = HIGHSEC /area/security/main name = "Security Office" @@ -1029,7 +1028,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/detectives_office/private_investigators_office name = "Private Investigator's Office" icon_state = "detective" - ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg') /area/security/range name = "Firing Range" @@ -1056,33 +1054,41 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Security Checkpoint" icon_state = "checkpoint1" -/area/security/checkpoint/checkpoint2 - name = "Security Checkpoint" - icon_state = "security" +/area/security/checkpoint/auxiliary + icon_state = "checkpoint_aux" + +/area/security/checkpoint/tertiary + icon_state = "checkpoint_tert" + +/area/security/checkpoint/escape + icon_state = "checkpoint_esc" /area/security/checkpoint/supply name = "Security Post - Cargo Bay" - icon_state = "checkpoint1" + icon_state = "checkpoint_supp" /area/security/checkpoint/engineering name = "Security Post - Engineering" - icon_state = "checkpoint1" + icon_state = "checkpoint_engi" /area/security/checkpoint/medical name = "Security Post - Medbay" - icon_state = "checkpoint1" + icon_state = "checkpoint_med" /area/security/checkpoint/science name = "Security Post - Science" - icon_state = "checkpoint1" + icon_state = "checkpoint_sci" /area/security/checkpoint/science/research name = "Security Post - Research Division" - icon_state = "checkpoint1" + icon_state = "checkpoint_res" /area/security/checkpoint/customs name = "Customs" - icon_state = "bridge" + icon_state = "customs_point" + +/area/security/checkpoint/customs/auxiliary + icon_state = "customs_point_aux" /area/security/vacantoffice name = "Vacant Office" @@ -1310,6 +1316,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/construction name = "Construction Area" icon_state = "yellow" + ambientsounds = ENGINEERING /area/construction/minisat_exterior name = "Minisat Exterior" @@ -1361,27 +1368,32 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ai_monitored/security/armory name = "Armory" icon_state = "armory" + ambientsounds = HIGHSEC /area/ai_monitored/storage/eva name = "EVA Storage" icon_state = "eva" + ambientsounds = HIGHSEC /area/ai_monitored/storage/secure name = "AI Satellite Storage" icon_state = "storage" + ambientsounds = HIGHSEC /area/ai_monitored/storage/emergency name = "Emergency Storage" icon_state = "storage" + ambientsounds = HIGHSEC /area/ai_monitored/storage/satellite name = "AI Satellite Maint" icon_state = "storage" + ambientsounds = HIGHSEC //Turret_protected /area/ai_monitored/turret_protected - ambientsounds = list('sound/ambience/ambimalf.ogg') + ambientsounds = list('sound/ambience/ambimalf.ogg', 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg') /area/ai_monitored/turret_protected/ai_upload name = "AI Upload Chamber" @@ -1450,7 +1462,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/tcommsat clockwork_warp_allowed = FALSE clockwork_warp_fail = "For safety reasons, warping here is disallowed; the radio and bluespace noise could cause catastrophic results." - ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') + ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg', 'sound/ambience/ambitech.ogg',\ + 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg', 'sound/ambience/ambimystery.ogg') /area/tcommsat/entrance name = "Telecomms Teleporter" @@ -1463,22 +1476,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ai_monitored/turret_protected/tcomsat name = "Telecomms Satellite" icon_state = "tcomsatlob" - ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') /area/ai_monitored/turret_protected/tcomfoyer name = "Telecomms Foyer" icon_state = "tcomsatentrance" - ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') /area/ai_monitored/turret_protected/tcomwest name = "Telecommunications Satellite West Wing" icon_state = "tcomsatwest" - ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') /area/ai_monitored/turret_protected/tcomeast name = "Telecommunications Satellite East Wing" icon_state = "tcomsateast" - ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') /area/tcommsat/computer name = "Telecomms Control Room" @@ -1526,4 +1535,4 @@ GLOBAL_LIST_INIT(the_station_areas, list ( /area/ai_monitored/turret_protected/ai_upload, //do not try to simplify to "/area/ai_monitored/turret_protected" --rastaf0 /area/ai_monitored/turret_protected/ai_upload_foyer, /area/ai_monitored/turret_protected/ai, -)) +)) \ No newline at end of file diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm index e21d4e273b..a5216fb44c 100644 --- a/code/game/area/ai_monitored.dm +++ b/code/game/area/ai_monitored.dm @@ -2,7 +2,7 @@ name = "AI Monitored Area" clockwork_warp_allowed = FALSE var/list/obj/machinery/camera/motioncameras = list() - var/list/motionTargets = list() + var/list/datum/weakref/motionTargets = list() /area/ai_monitored/Initialize(mapload) . = ..() @@ -27,5 +27,5 @@ if (ismob(O) && motioncameras.len) for(var/X in motioncameras) var/obj/machinery/camera/cam = X - cam.lostTarget(O) + cam.lostTargetRef(WEAKREF(O)) return diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 2d372d4c33..17f75fc336 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -54,15 +54,12 @@ var/global/global_uid = 0 var/uid - var/list/ambientsounds = list('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg',\ - 'sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg',\ - 'sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg',\ - 'sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg',\ - 'sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg',\ - 'sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg') + var/list/ambientsounds = GENERIC flags_1 = CAN_BE_DIRTY_1 var/list/firedoors + var/list/cameras + var/list/firealarms var/firedoors_last_closed_on = 0 /*Adding a wizard area teleport list because motherfucking lag -- Urist*/ @@ -125,13 +122,32 @@ GLOBAL_LIST_EMPTY(teleportlocs) . = ..() - power_change() // all machines set to current power level, also updates icon - blend_mode = BLEND_MULTIPLY // Putting this in the constructor so that it stops the icons being screwed up in the map editor. if(!IS_DYNAMIC_LIGHTING(src)) add_overlay(/obj/effect/fullbright) + if(contents.len) + var/list/areas_in_z = SSmapping.areas_in_z + var/z + for(var/i in 1 to contents.len) + var/atom/thing = contents[i] + if(!thing) + continue + z = thing.z + break + if(!z) + WARNING("No z found for [src]") + return + if(!areas_in_z["[z]"]) + areas_in_z["[z]"] = list() + areas_in_z["[z]"] += src + + return INITIALIZE_HINT_LATELOAD + +/area/LateInitialize() + power_change() // all machines set to current power level, also updates icon + /area/Destroy() STOP_PROCESSING(SSobj, src) return ..() @@ -140,27 +156,28 @@ GLOBAL_LIST_EMPTY(teleportlocs) if (state != poweralm) poweralm = state if(istype(source)) //Only report power alarms on the z-level where the source is located. - var/list/cameras = list() - for (var/obj/machinery/camera/C in src) - cameras += C - for (var/mob/living/silicon/aiPlayer in GLOB.player_list) + for (var/item in GLOB.silicon_mobs) + var/mob/living/silicon/aiPlayer = item if (state == 1) aiPlayer.cancelAlarm("Power", src, source) else aiPlayer.triggerAlarm("Power", src, cameras, source) - for(var/obj/machinery/computer/station_alert/a in GLOB.machines) + for (var/item in GLOB.alert_consoles) + var/obj/machinery/computer/station_alert/a = item if(state == 1) a.cancelAlarm("Power", src, source) else a.triggerAlarm("Power", src, cameras, source) - for(var/mob/living/simple_animal/drone/D in GLOB.mob_list) + for (var/item in GLOB.drones_list) + var/mob/living/simple_animal/drone/D = item if(state == 1) D.cancelAlarm("Power", src, source) else D.triggerAlarm("Power", src, cameras, source) - for(var/datum/computer_file/program/alarm_monitor/p in GLOB.alarmdisplay) + for(var/item in GLOB.alarmdisplay) + var/datum/computer_file/program/alarm_monitor/p = item if(state == 1) p.cancelAlarm("Power", src, source) else @@ -171,26 +188,35 @@ GLOBAL_LIST_EMPTY(teleportlocs) if (danger_level==2) var/list/cameras = list() for(var/area/RA in related) - for(var/obj/machinery/camera/C in RA) + for (var/item in RA.cameras) + var/obj/machinery/camera/C = item cameras += C - for(var/mob/living/silicon/aiPlayer in GLOB.player_list) + for (var/item in GLOB.silicon_mobs) + var/mob/living/silicon/aiPlayer = item aiPlayer.triggerAlarm("Atmosphere", src, cameras, source) - for(var/obj/machinery/computer/station_alert/a in GLOB.machines) + for (var/item in GLOB.alert_consoles) + var/obj/machinery/computer/station_alert/a = item a.triggerAlarm("Atmosphere", src, cameras, source) - for(var/mob/living/simple_animal/drone/D in GLOB.mob_list) + for (var/item in GLOB.drones_list) + var/mob/living/simple_animal/drone/D = item D.triggerAlarm("Atmosphere", src, cameras, source) - for(var/datum/computer_file/program/alarm_monitor/p in GLOB.alarmdisplay) + for(var/item in GLOB.alarmdisplay) + var/datum/computer_file/program/alarm_monitor/p = item p.triggerAlarm("Atmosphere", src, cameras, source) else if (src.atmosalm == 2) - for(var/mob/living/silicon/aiPlayer in GLOB.player_list) + for (var/item in GLOB.silicon_mobs) + var/mob/living/silicon/aiPlayer = item aiPlayer.cancelAlarm("Atmosphere", src, source) - for(var/obj/machinery/computer/station_alert/a in GLOB.machines) + for (var/item in GLOB.alert_consoles) + var/obj/machinery/computer/station_alert/a = item a.cancelAlarm("Atmosphere", src, source) - for(var/mob/living/simple_animal/drone/D in GLOB.mob_list) + for (var/item in GLOB.drones_list) + var/mob/living/simple_animal/drone/D = item D.cancelAlarm("Atmosphere", src, source) - for(var/datum/computer_file/program/alarm_monitor/p in GLOB.alarmdisplay) + for(var/item in GLOB.alarmdisplay) + var/datum/computer_file/program/alarm_monitor/p = item p.cancelAlarm("Atmosphere", src, source) src.atmosalm = danger_level @@ -225,18 +251,24 @@ GLOBAL_LIST_EMPTY(teleportlocs) if (!( RA.fire )) RA.set_fire_alarm_effect() RA.ModifyFiredoors(FALSE) - for(var/obj/machinery/firealarm/F in RA) + for(var/item in RA.firealarms) + var/obj/machinery/firealarm/F = item F.update_icon() - for (var/obj/machinery/camera/C in RA) + for (var/item in RA.cameras) + var/obj/machinery/camera/C = item cameras += C - for (var/obj/machinery/computer/station_alert/a in GLOB.machines) + for (var/item in GLOB.alert_consoles) + var/obj/machinery/computer/station_alert/a = item a.triggerAlarm("Fire", src, cameras, source) - for (var/mob/living/silicon/aiPlayer in GLOB.player_list) + for (var/item in GLOB.silicon_mobs) + var/mob/living/silicon/aiPlayer = item aiPlayer.triggerAlarm("Fire", src, cameras, source) - for (var/mob/living/simple_animal/drone/D in GLOB.mob_list) + for (var/item in GLOB.drones_list) + var/mob/living/simple_animal/drone/D = item D.triggerAlarm("Fire", src, cameras, source) - for(var/datum/computer_file/program/alarm_monitor/p in GLOB.alarmdisplay) + for(var/item in GLOB.alarmdisplay) + var/datum/computer_file/program/alarm_monitor/p = item p.triggerAlarm("Fire", src, cameras, source) START_PROCESSING(SSobj, src) @@ -248,16 +280,21 @@ GLOBAL_LIST_EMPTY(teleportlocs) RA.mouse_opacity = MOUSE_OPACITY_TRANSPARENT RA.updateicon() RA.ModifyFiredoors(TRUE) - for(var/obj/machinery/firealarm/F in RA) + for(var/item in RA.firealarms) + var/obj/machinery/firealarm/F = item F.update_icon() - for (var/mob/living/silicon/aiPlayer in GLOB.player_list) + for (var/item in GLOB.silicon_mobs) + var/mob/living/silicon/aiPlayer = item aiPlayer.cancelAlarm("Fire", src, source) - for (var/obj/machinery/computer/station_alert/a in GLOB.machines) + for (var/item in GLOB.alert_consoles) + var/obj/machinery/computer/station_alert/a = item a.cancelAlarm("Fire", src, source) - for (var/mob/living/simple_animal/drone/D in GLOB.mob_list) + for (var/item in GLOB.drones_list) + var/mob/living/simple_animal/drone/D = item D.cancelAlarm("Fire", src, source) - for(var/datum/computer_file/program/alarm_monitor/p in GLOB.alarmdisplay) + for(var/item in GLOB.alarmdisplay) + var/datum/computer_file/program/alarm_monitor/p = item p.cancelAlarm("Fire", src, source) STOP_PROCESSING(SSobj, src) @@ -285,10 +322,12 @@ GLOBAL_LIST_EMPTY(teleportlocs) //Lockdown airlocks for(var/obj/machinery/door/DOOR in RA) close_and_lock_door(DOOR) - for (var/obj/machinery/camera/C in RA) + for (var/item in RA.cameras) + var/obj/machinery/camera/C = item cameras += C - for (var/mob/living/silicon/SILICON in GLOB.player_list) + for (var/i in GLOB.silicon_mobs) + var/mob/living/silicon/SILICON = i if(SILICON.triggerAlarm("Burglar", src, cameras, trigger)) //Cancel silicon alert after 1 minute addtimer(CALLBACK(SILICON, /mob/living/silicon.proc/cancelAlarm,"Burglar",src,trigger), 600) diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm index f98a085b13..93640bdde6 100644 --- a/code/game/area/areas/away_content.dm +++ b/code/game/area/areas/away_content.dm @@ -8,6 +8,7 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30" name = "Strange Location" icon_state = "away" has_gravity = TRUE + ambientsounds = AWAY_MISSION /area/awaymission/beach name = "Beach" @@ -15,7 +16,7 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30" dynamic_lighting = DYNAMIC_LIGHTING_DISABLED requires_power = FALSE has_gravity = TRUE - ambientsounds = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg') + ambientsounds = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambinice.ogg') /area/awaymission/errorroom name = "Super Secret Room" diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm index b2587e48c3..93e3da53b8 100644 --- a/code/game/area/areas/centcom.dm +++ b/code/game/area/areas/centcom.dm @@ -96,6 +96,7 @@ noteleport = TRUE blob_allowed = FALSE //Not... entirely sure this will ever come up... but if the bus makes blobs AND ops, it shouldn't aim for the ops to win. flags_1 = NONE + ambientsounds = HIGHSEC /area/syndicate_mothership/control name = "Syndicate Control Room" @@ -153,6 +154,7 @@ has_gravity = TRUE noteleport = TRUE hidden = TRUE + ambientsounds = REEBE /area/reebe/city_of_cogs name = "City of Cogs" diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm index 0c212acedf..bf5642b7af 100644 --- a/code/game/area/areas/mining.dm +++ b/code/game/area/areas/mining.dm @@ -15,8 +15,8 @@ power_equip = FALSE power_light = FALSE outdoors = TRUE - ambientsounds = list('sound/ambience/ambimine.ogg') flags_1 = NONE + ambientsounds = MINING /area/mine/unexplored name = "Mine" @@ -29,8 +29,8 @@ power_equip = FALSE power_light = FALSE outdoors = TRUE - ambientsounds = list('sound/ambience/ambimine.ogg') flags_1 = NONE + ambientsounds = MINING /area/mine/lobby name = "Mining Station" @@ -77,6 +77,7 @@ /area/mine/laborcamp/security name = "Labor Camp Security" icon_state = "security" + ambientsounds = HIGHSEC @@ -98,7 +99,7 @@ power_equip = FALSE power_light = FALSE requires_power = TRUE - ambientsounds = list('sound/ambience/ambilava.ogg') + ambientsounds = MINING /area/lavaland/underground name = "Lavaland Caves" @@ -110,7 +111,7 @@ power_environ = FALSE power_equip = FALSE power_light = FALSE - ambientsounds = list('sound/ambience/ambilava.ogg') + ambientsounds = MINING /area/lavaland/surface/outdoors diff --git a/code/game/area/areas/misc.dm b/code/game/area/areas/misc.dm index 01c45c2b59..7faeb6b51a 100644 --- a/code/game/area/areas/misc.dm +++ b/code/game/area/areas/misc.dm @@ -5,6 +5,7 @@ //icon = "ICON FILENAME" //icon_state = "NAME OF ICON" requires_power = FALSE + ambientsounds = SPOOKY /area/hell/trial1 name = "Hell Trial1" @@ -32,6 +33,7 @@ /area/prison name = "Prison Station" icon_state = "brig" + ambientsounds = HIGHSEC /area/prison/arrival_airlock name = "Prison Station Airlock" @@ -73,7 +75,7 @@ /area/prison/morgue name = "Prison Morgue" icon_state = "morgue" - ambientsounds = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg') + ambientsounds = SPOOKY /area/prison/medical_research name = "Prison Genetic Research" @@ -99,7 +101,7 @@ /area/prison/solitary name = "Solitary Confinement" icon_state = "brig" - + /area/prison/execution_room name = "Prisoner Education Chamber" icon_state = "execution_room" diff --git a/code/game/area/areas/ruins/_ruins.dm b/code/game/area/areas/ruins/_ruins.dm index da78351979..087842c5d1 100644 --- a/code/game/area/areas/ruins/_ruins.dm +++ b/code/game/area/areas/ruins/_ruins.dm @@ -6,6 +6,7 @@ has_gravity = TRUE hidden = TRUE dynamic_lighting = DYNAMIC_LIGHTING_FORCED + ambientsounds = RUINS /area/ruin/unpowered @@ -16,4 +17,3 @@ /area/ruin/powered requires_power = FALSE - diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 3abbf902b1..75c2e15793 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -22,7 +22,7 @@ power_environ = FALSE valid_territory = FALSE outdoors = TRUE - ambientsounds = list('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg') + ambientsounds = SPACE blob_allowed = FALSE ///////////// @@ -434,4 +434,4 @@ /area/ruin/space/has_grav/whiteship/box name = "Abandoned Ship" - icon_state = "red" \ No newline at end of file + icon_state = "red" diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index 21f74972c9..8a29d1b2ac 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -18,6 +18,7 @@ /area/shuttle/syndicate name = "Syndicate Infiltrator" blob_allowed = FALSE + ambientsounds = HIGHSEC /area/shuttle/syndicate/bridge name = "Syndicate Infiltrator Control" @@ -42,6 +43,9 @@ name = "Hyperspace" desc = "Weeeeee" +/area/shuttle/custom + name = "Custom player shuttle" + /area/shuttle/arrival name = "Arrival Shuttle" @@ -106,4 +110,13 @@ /area/shuttle/syndicate_scout name = "Syndicate Scout" - blob_allowed = FALSE \ No newline at end of file + blob_allowed = FALSE + +/area/shuttle/pirate + name = "Pirate Shuttle" + blob_allowed = FALSE + requires_power = TRUE + +/area/shuttle/pirate/vault + name = "Pirate Shuttle Vault" + requires_power = FALSE \ No newline at end of file diff --git a/code/game/area/areas/space_content.dm b/code/game/area/areas/space_content.dm index 605cbfa764..e605faa6e5 100644 --- a/code/game/area/areas/space_content.dm +++ b/code/game/area/areas/space_content.dm @@ -2,6 +2,7 @@ /area/spacecontent name = "space" + ambientsounds = AWAY_MISSION /area/spacecontent/a1 icon_state = "spacecontent1" diff --git a/code/game/atoms.dm b/code/game/atoms.dm index f20b13e1a3..e450c54c1b 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -99,7 +99,6 @@ LAZYCLEARLIST(overlays) LAZYCLEARLIST(priority_overlays) - //SSoverlays.processing -= src //we COULD do this, but it's better to just let it fall out of the processing queue QDEL_NULL(light) @@ -244,32 +243,6 @@ else if(src in container) return 1 -/* - * atom/proc/search_contents_for(path,list/filter_path=null) - * Recursevly searches all atom contens (including contents contents and so on). - * - * ARGS: path - search atom contents for atoms of this type - * list/filter_path - if set, contents of atoms not of types in this list are excluded from search. - * - * RETURNS: list of found atoms - */ - -/atom/proc/search_contents_for(path,list/filter_path=null) - var/list/found = list() - for(var/atom/A in src) - if(istype(A, path)) - found += A - if(filter_path) - var/pass = 0 - for(var/type in filter_path) - pass |= istype(A, type) - if(!pass) - continue - if(A.contents.len) - found += A.search_contents_for(path,filter_path) - return found - - /atom/proc/examine(mob/user) //This reformat names to get a/an properly working on item descriptions when they are bloody var/f_name = "\a [src]." @@ -335,7 +308,7 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) /atom/proc/blood_splatter_index() - return "\ref[initial(icon)]-[initial(icon_state)]" + return "[REF(initial(icon))]-[initial(icon_state)]" //returns the mob's dna info as a list, to be inserted in an object's blood_DNA list /mob/living/proc/get_blood_dna_list() @@ -631,9 +604,9 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) var/turf/curturf = get_turf(src) if (curturf) .["Jump to"] = "?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]" - .["Add reagent"] = "?_src_=vars;[HrefToken()];addreagent=\ref[src]" - .["Trigger EM pulse"] = "?_src_=vars;[HrefToken()];emp=\ref[src]" - .["Trigger explosion"] = "?_src_=vars;[HrefToken()];explode=\ref[src]" + .["Add reagent"] = "?_src_=vars;[HrefToken()];addreagent=[REF(src)]" + .["Trigger EM pulse"] = "?_src_=vars;[HrefToken()];emp=[REF(src)]" + .["Trigger explosion"] = "?_src_=vars;[HrefToken()];explode=[REF(src)]" /atom/proc/drop_location() var/atom/L = loc @@ -646,3 +619,20 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) /atom/proc/return_temperature() return + +// Default tool behaviors proc + +/atom/proc/crowbar_act(mob/user, obj/item/tool) + return + +/atom/proc/multitool_act(mob/user, obj/item/tool) + return + +/atom/proc/screwdriver_act(mob/user, obj/item/tool) + return + +/atom/proc/wrench_act(mob/user, obj/item/tool) + return + +/atom/proc/wirecutter_act(mob/user, obj/item/tool) + return \ No newline at end of file diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index b05a1d78f1..9d3b208acc 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -62,7 +62,7 @@ /atom/movable/Move(atom/newloc, direct = 0) if(!loc || !newloc) - return 0 + return FALSE var/atom/oldloc = loc if(loc != newloc) @@ -113,7 +113,7 @@ last_move = direct setDir(direct) if(. && has_buckled_mobs() && !handle_buckled_mob_movement(loc,direct)) //movement failed due to buckled mob(s) - . = 0 + return FALSE //Called after a successful Move(). By this point, we've already moved /atom/movable/proc/Moved(atom/OldLoc, Dir, Forced = FALSE) @@ -325,9 +325,6 @@ SSspacedrift.processing[src] = src return 1 -/atom/movable/proc/checkpass(passflag) - return pass_flags&passflag - /atom/movable/proc/throw_impact(atom/hit_atom, throwingdatum) set waitfor = 0 SendSignal(COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum) @@ -523,7 +520,7 @@ /atom/movable/vv_get_dropdown() . = ..() . -= "Jump to" - .["Follow"] = "?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[src]" + .["Follow"] = "?_src_=holder;[HrefToken()];adminplayerobservefollow=[REF(src)]" /atom/movable/proc/ex_check(ex_id) if(!ex_id) diff --git a/code/game/communications.dm b/code/game/communications.dm index 19c3f87460..d60a5d8301 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -1,309 +1,309 @@ -/* - HOW IT WORKS - - The SSradio is a global object maintaining all radio transmissions, think about it as about "ether". - Note that walkie-talkie, intercoms and headsets handle transmission using nonstandard way. - procs: - - add_object(obj/device as obj, var/new_frequency as num, var/filter as text|null = null) - Adds listening object. - parameters: - device - device receiving signals, must have proc receive_signal (see description below). - one device may listen several frequencies, but not same frequency twice. - new_frequency - see possibly frequencies below; - filter - thing for optimization. Optional, but recommended. - All filters should be consolidated in this file, see defines later. - Device without listening filter will receive all signals (on specified frequency). - Device with filter will receive any signals sent without filter. - Device with filter will not receive any signals sent with different filter. - returns: - Reference to frequency object. - - remove_object (obj/device, old_frequency) - Obliviously, after calling this proc, device will not receive any signals on old_frequency. - Other frequencies will left unaffected. - - return_frequency(var/frequency as num) - returns: - Reference to frequency object. Use it if you need to send and do not need to listen. - - radio_frequency is a global object maintaining list of devices that listening specific frequency. - procs: - - post_signal(obj/source as obj|null, datum/signal/signal, var/filter as text|null = null, var/range as num|null = null) - Sends signal to all devices that wants such signal. - parameters: - source - object, emitted signal. Usually, devices will not receive their own signals. - signal - see description below. - filter - described above. - range - radius of regular byond's square circle on that z-level. null means everywhere, on all z-levels. - - obj/proc/receive_signal(datum/signal/signal, var/receive_method as num, var/receive_param) - Handler from received signals. By default does nothing. Define your own for your object. - Avoid of sending signals directly from this proc, use spawn(0). Do not use sleep() here please. - parameters: - signal - see description below. Extract all needed data from the signal before doing sleep(), spawn() or return! - receive_method - may be TRANSMISSION_WIRE or TRANSMISSION_RADIO. - TRANSMISSION_WIRE is currently unused. - receive_param - for TRANSMISSION_RADIO here comes frequency. - - datum/signal - vars: - source - an object that emitted signal. Used for debug and bearing. - data - list with transmitting data. Usual use pattern: - data["msg"] = "hello world" - encryption - Some number symbolizing "encryption key". - Note that game actually do not use any cryptography here. - If receiving object don't know right key, it must ignore encrypted signal in its receive_signal. - -*/ -/* the radio controller is a confusing piece of shit and didnt work - so i made radios not use the radio controller. -*/ -GLOBAL_LIST_EMPTY(all_radios) -/proc/add_radio(obj/item/radio, freq) - if(!freq || !radio) - return - if(!GLOB.all_radios["[freq]"]) - GLOB.all_radios["[freq]"] = list(radio) - return freq - - GLOB.all_radios["[freq]"] |= radio - return freq - -/proc/remove_radio(obj/item/radio, freq) - if(!freq || !radio) - return - if(!GLOB.all_radios["[freq]"]) - return - - GLOB.all_radios["[freq]"] -= radio - -/proc/remove_radio_all(obj/item/radio) - for(var/freq in GLOB.all_radios) - GLOB.all_radios["[freq]"] -= radio - -/* -Frequency range: 1200 to 1600 -Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency, even during mapmaking) - -Radio: -1459 - standard radio chat -1351 - Science -1353 - Command -1355 - Medical -1357 - Engineering -1359 - Security -1337 - death squad -1443 - Confession Intercom -1349 - Miners -1347 - Cargo techs -1447 - AI Private - -Devices: -1451 - tracking implant -1457 - RSD default - -On the map: -1311 for prison shuttle console (in fact, it is not used) -1435 for status displays -1437 for atmospherics/fire alerts -1439 for engine components -1439 for air pumps, air scrubbers, atmo control -1441 for atmospherics - supply tanks -1443 for atmospherics - distribution loop/mixed air tank -1445 for bot nav beacons -1447 for mulebot, secbot and ed209 control -1449 for airlock controls, electropack, magnets -1451 for toxin lab access -1453 for engineering access -1455 for AI access -*/ - -GLOBAL_LIST_INIT(radiochannels, list( - "Common" = 1459, - "Science" = 1351, - "Command" = 1353, - "Medical" = 1355, - "Engineering" = 1357, - "Security" = 1359, +/* + HOW IT WORKS + + The SSradio is a global object maintaining all radio transmissions, think about it as about "ether". + Note that walkie-talkie, intercoms and headsets handle transmission using nonstandard way. + procs: + + add_object(obj/device as obj, var/new_frequency as num, var/filter as text|null = null) + Adds listening object. + parameters: + device - device receiving signals, must have proc receive_signal (see description below). + one device may listen several frequencies, but not same frequency twice. + new_frequency - see possibly frequencies below; + filter - thing for optimization. Optional, but recommended. + All filters should be consolidated in this file, see defines later. + Device without listening filter will receive all signals (on specified frequency). + Device with filter will receive any signals sent without filter. + Device with filter will not receive any signals sent with different filter. + returns: + Reference to frequency object. + + remove_object (obj/device, old_frequency) + Obliviously, after calling this proc, device will not receive any signals on old_frequency. + Other frequencies will left unaffected. + + return_frequency(var/frequency as num) + returns: + Reference to frequency object. Use it if you need to send and do not need to listen. + + radio_frequency is a global object maintaining list of devices that listening specific frequency. + procs: + + post_signal(obj/source as obj|null, datum/signal/signal, var/filter as text|null = null, var/range as num|null = null) + Sends signal to all devices that wants such signal. + parameters: + source - object, emitted signal. Usually, devices will not receive their own signals. + signal - see description below. + filter - described above. + range - radius of regular byond's square circle on that z-level. null means everywhere, on all z-levels. + + obj/proc/receive_signal(datum/signal/signal, var/receive_method as num, var/receive_param) + Handler from received signals. By default does nothing. Define your own for your object. + Avoid of sending signals directly from this proc, use spawn(0). Do not use sleep() here please. + parameters: + signal - see description below. Extract all needed data from the signal before doing sleep(), spawn() or return! + receive_method - may be TRANSMISSION_WIRE or TRANSMISSION_RADIO. + TRANSMISSION_WIRE is currently unused. + receive_param - for TRANSMISSION_RADIO here comes frequency. + + datum/signal + vars: + source + an object that emitted signal. Used for debug and bearing. + data + list with transmitting data. Usual use pattern: + data["msg"] = "hello world" + encryption + Some number symbolizing "encryption key". + Note that game actually do not use any cryptography here. + If receiving object don't know right key, it must ignore encrypted signal in its receive_signal. + +*/ +/* the radio controller is a confusing piece of shit and didnt work + so i made radios not use the radio controller. +*/ +GLOBAL_LIST_EMPTY(all_radios) +/proc/add_radio(obj/item/radio, freq) + if(!freq || !radio) + return + if(!GLOB.all_radios["[freq]"]) + GLOB.all_radios["[freq]"] = list(radio) + return freq + + GLOB.all_radios["[freq]"] |= radio + return freq + +/proc/remove_radio(obj/item/radio, freq) + if(!freq || !radio) + return + if(!GLOB.all_radios["[freq]"]) + return + + GLOB.all_radios["[freq]"] -= radio + +/proc/remove_radio_all(obj/item/radio) + for(var/freq in GLOB.all_radios) + GLOB.all_radios["[freq]"] -= radio + +/* +Frequency range: 1200 to 1600 +Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency, even during mapmaking) + +Radio: +1459 - standard radio chat +1351 - Science +1353 - Command +1355 - Medical +1357 - Engineering +1359 - Security +1337 - death squad +1443 - Confession Intercom +1349 - Miners +1347 - Cargo techs +1447 - AI Private + +Devices: +1451 - tracking implant +1457 - RSD default + +On the map: +1311 for prison shuttle console (in fact, it is not used) +1435 for status displays +1437 for atmospherics/fire alerts +1439 for engine components +1439 for air pumps, air scrubbers, atmo control +1441 for atmospherics - supply tanks +1443 for atmospherics - distribution loop/mixed air tank +1445 for bot nav beacons +1447 for mulebot, secbot and ed209 control +1449 for airlock controls, electropack, magnets +1451 for toxin lab access +1453 for engineering access +1455 for AI access +*/ + +GLOBAL_LIST_INIT(radiochannels, list( + "Common" = 1459, + "Science" = 1351, + "Command" = 1353, + "Medical" = 1355, + "Engineering" = 1357, + "Security" = 1359, "CentCom" = 1337, - "Syndicate" = 1213, - "Supply" = 1347, - "Service" = 1349, - "AI Private" = 1447, - "Red Team" = 1215, - "Blue Team" = 1217 -)) - -GLOBAL_LIST_INIT(reverseradiochannels, list( - "1459" = "Common", - "1351" = "Science", - "1353" = "Command", - "1355" = "Medical", - "1357" = "Engineering", - "1359" = "Security", + "Syndicate" = 1213, + "Supply" = 1347, + "Service" = 1349, + "AI Private" = 1447, + "Red Team" = 1215, + "Blue Team" = 1217 +)) + +GLOBAL_LIST_INIT(reverseradiochannels, list( + "1459" = "Common", + "1351" = "Science", + "1353" = "Command", + "1355" = "Medical", + "1357" = "Engineering", + "1359" = "Security", "1337" = "CentCom", - "1213" = "Syndicate", - "1347" = "Supply", - "1349" = "Service", - "1447" = "AI Private", - "1215" = "Red Team", - "1217" = "Blue Team" -)) - -//depenging helpers -GLOBAL_VAR_CONST(SYND_FREQ, 1213) //nuke op frequency, coloured dark brown in chat window -GLOBAL_VAR_CONST(SUPP_FREQ, 1347) //supply, coloured light brown in chat window -GLOBAL_VAR_CONST(SERV_FREQ, 1349) //service, coloured green in chat window -GLOBAL_VAR_CONST(SCI_FREQ, 1351) //science, coloured plum in chat window -GLOBAL_VAR_CONST(COMM_FREQ, 1353) //command, colored gold in chat window -GLOBAL_VAR_CONST(MED_FREQ, 1355) //medical, coloured blue in chat window -GLOBAL_VAR_CONST(ENG_FREQ, 1357) //engineering, coloured orange in chat window -GLOBAL_VAR_CONST(SEC_FREQ, 1359) //security, coloured red in chat window -GLOBAL_VAR_CONST(CENTCOM_FREQ, 1337) //centcom frequency, coloured grey in chat window -GLOBAL_VAR_CONST(AIPRIV_FREQ, 1447) //AI private, colored magenta in chat window -GLOBAL_VAR_CONST(REDTEAM_FREQ, 1215) // red team (CTF) frequency, coloured red -GLOBAL_VAR_CONST(BLUETEAM_FREQ, 1217) // blue team (CTF) frequency, coloured blue - -#define TRANSMISSION_WIRE 0 -#define TRANSMISSION_RADIO 1 - -/* filters */ -GLOBAL_VAR_INIT(RADIO_TO_AIRALARM, "1") -GLOBAL_VAR_INIT(RADIO_FROM_AIRALARM, "2") -GLOBAL_VAR_INIT(RADIO_CHAT, "3") //deprecated -GLOBAL_VAR_INIT(RADIO_ATMOSIA, "4") -GLOBAL_VAR_INIT(RADIO_NAVBEACONS, "5") -GLOBAL_VAR_INIT(RADIO_AIRLOCK, "6") -GLOBAL_VAR_INIT(RADIO_MAGNETS, "9") - -/datum/radio_frequency - - var/frequency as num - var/list/list/obj/devices = list() - -//If range > 0, only post to devices on the same z_level and within range -//Use range = -1, to restrain to the same z_level without limiting range -/datum/radio_frequency/proc/post_signal(obj/source as obj|null, datum/signal/signal, filter = null as text|null, range = null as num|null) - - //Apply filter to the signal. If none supply, broadcast to every devices - //_default channel is always checked - var/list/filter_list - - if(filter) - filter_list = list(filter,"_default") - else - filter_list = devices - - //If checking range, find the source turf - var/turf/start_point - if(range) - start_point = get_turf(source) - if(!start_point) - return 0 - - //Send the data - for(var/current_filter in filter_list) - for(var/obj/device in devices[current_filter]) - if(device == source) - continue - if(range) - var/turf/end_point = get_turf(device) - if(!end_point) - continue - if(start_point.z != end_point.z || (range > 0 && get_dist(start_point, end_point) > range)) - continue - device.receive_signal(signal, TRANSMISSION_RADIO, frequency) - -/datum/radio_frequency/proc/add_listener(obj/device, filter as text|null) - if (!filter) - filter = "_default" - - var/list/devices_line = devices[filter] - if(!devices_line) - devices_line = list() - devices[filter] = devices_line - devices_line += device - - -/datum/radio_frequency/proc/remove_listener(obj/device) - for(var/devices_filter in devices) - var/list/devices_line = devices[devices_filter] - if(!devices_line) - devices -= devices_filter - devices_line -= device - if(!devices_line.len) - devices -= devices_filter - - - - - -/client/proc/print_pointers() - set name = "Debug Signals" - set category = "Debug" - - if(!holder) - return - - var/datum/signal/S - to_chat(src, "There are [S.pointers.len] pointers:") - for(var/p in S.pointers) - to_chat(src, p) - S = locate(p) - if(istype(S)) - to_chat(src, S.debug_print()) - -/obj/proc/receive_signal(datum/signal/signal, receive_method, receive_param) - return - -/datum/signal - var/obj/source - - var/transmission_method = 0 - //0 = wire - //1 = radio transmission - //2 = subspace transmission - - var/data = list() - var/encryption - - var/frequency = 0 - var/static/list/pointers = list() - -/datum/signal/New() - ..() - pointers += "\ref[src]" - -/datum/signal/Destroy() - pointers -= "\ref[src]" - return ..() - -/datum/signal/proc/copy_from(datum/signal/model) - source = model.source - transmission_method = model.transmission_method - data = model.data - encryption = model.encryption - frequency = model.frequency - -/datum/signal/proc/debug_print() - if (source) + "1213" = "Syndicate", + "1347" = "Supply", + "1349" = "Service", + "1447" = "AI Private", + "1215" = "Red Team", + "1217" = "Blue Team" +)) + +//depenging helpers +GLOBAL_VAR_CONST(SYND_FREQ, 1213) //nuke op frequency, coloured dark brown in chat window +GLOBAL_VAR_CONST(SUPP_FREQ, 1347) //supply, coloured light brown in chat window +GLOBAL_VAR_CONST(SERV_FREQ, 1349) //service, coloured green in chat window +GLOBAL_VAR_CONST(SCI_FREQ, 1351) //science, coloured plum in chat window +GLOBAL_VAR_CONST(COMM_FREQ, 1353) //command, colored gold in chat window +GLOBAL_VAR_CONST(MED_FREQ, 1355) //medical, coloured blue in chat window +GLOBAL_VAR_CONST(ENG_FREQ, 1357) //engineering, coloured orange in chat window +GLOBAL_VAR_CONST(SEC_FREQ, 1359) //security, coloured red in chat window +GLOBAL_VAR_CONST(CENTCOM_FREQ, 1337) //centcom frequency, coloured grey in chat window +GLOBAL_VAR_CONST(AIPRIV_FREQ, 1447) //AI private, colored magenta in chat window +GLOBAL_VAR_CONST(REDTEAM_FREQ, 1215) // red team (CTF) frequency, coloured red +GLOBAL_VAR_CONST(BLUETEAM_FREQ, 1217) // blue team (CTF) frequency, coloured blue + +#define TRANSMISSION_WIRE 0 +#define TRANSMISSION_RADIO 1 + +/* filters */ +GLOBAL_VAR_INIT(RADIO_TO_AIRALARM, "1") +GLOBAL_VAR_INIT(RADIO_FROM_AIRALARM, "2") +GLOBAL_VAR_INIT(RADIO_CHAT, "3") //deprecated +GLOBAL_VAR_INIT(RADIO_ATMOSIA, "4") +GLOBAL_VAR_INIT(RADIO_NAVBEACONS, "5") +GLOBAL_VAR_INIT(RADIO_AIRLOCK, "6") +GLOBAL_VAR_INIT(RADIO_MAGNETS, "9") + +/datum/radio_frequency + + var/frequency as num + var/list/list/obj/devices = list() + +//If range > 0, only post to devices on the same z_level and within range +//Use range = -1, to restrain to the same z_level without limiting range +/datum/radio_frequency/proc/post_signal(obj/source as obj|null, datum/signal/signal, filter = null as text|null, range = null as num|null) + + //Apply filter to the signal. If none supply, broadcast to every devices + //_default channel is always checked + var/list/filter_list + + if(filter) + filter_list = list(filter,"_default") + else + filter_list = devices + + //If checking range, find the source turf + var/turf/start_point + if(range) + start_point = get_turf(source) + if(!start_point) + return 0 + + //Send the data + for(var/current_filter in filter_list) + for(var/obj/device in devices[current_filter]) + if(device == source) + continue + if(range) + var/turf/end_point = get_turf(device) + if(!end_point) + continue + if(start_point.z != end_point.z || (range > 0 && get_dist(start_point, end_point) > range)) + continue + device.receive_signal(signal, TRANSMISSION_RADIO, frequency) + +/datum/radio_frequency/proc/add_listener(obj/device, filter as text|null) + if (!filter) + filter = "_default" + + var/list/devices_line = devices[filter] + if(!devices_line) + devices_line = list() + devices[filter] = devices_line + devices_line += device + + +/datum/radio_frequency/proc/remove_listener(obj/device) + for(var/devices_filter in devices) + var/list/devices_line = devices[devices_filter] + if(!devices_line) + devices -= devices_filter + devices_line -= device + if(!devices_line.len) + devices -= devices_filter + + + + + +/client/proc/print_pointers() + set name = "Debug Signals" + set category = "Debug" + + if(!holder) + return + + var/datum/signal/S + to_chat(src, "There are [S.pointers.len] pointers:") + for(var/p in S.pointers) + to_chat(src, p) + S = locate(p) + if(istype(S)) + to_chat(src, S.debug_print()) + +/obj/proc/receive_signal(datum/signal/signal, receive_method, receive_param) + return + +/datum/signal + var/obj/source + + var/transmission_method = 0 + //0 = wire + //1 = radio transmission + //2 = subspace transmission + + var/data = list() + var/encryption + + var/frequency = 0 + var/static/list/pointers = list() + +/datum/signal/New() + ..() + pointers += "[REF(src)]" + +/datum/signal/Destroy() + pointers -= "[REF(src)]" + return ..() + +/datum/signal/proc/copy_from(datum/signal/model) + source = model.source + transmission_method = model.transmission_method + data = model.data + encryption = model.encryption + frequency = model.frequency + +/datum/signal/proc/debug_print() + if (source) . = "signal = {source = '[source]' [COORD(source)]\n" - else - . = "signal = {source = '[source]' ()\n" - for (var/i in data) - . += "data\[\"[i]\"\] = \"[data[i]]\"\n" - if(islist(data[i])) - var/list/L = data[i] - for(var/t in L) - . += "data\[\"[i]\"\] list has: [t]" - -/datum/signal/proc/sanitize_data() - for(var/d in data) - var/val = data[d] - if(istext(val)) - data[d] = html_encode(val) + else + . = "signal = {source = '[source]' ()\n" + for (var/i in data) + . += "data\[\"[i]\"\] = \"[data[i]]\"\n" + if(islist(data[i])) + var/list/L = data[i] + for(var/t in L) + . += "data\[\"[i]\"\] list has: [t]" + +/datum/signal/proc/sanitize_data() + for(var/d in data) + var/val = data[d] + if(istext(val)) + data[d] = html_encode(val) diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index 8a0a622a63..2a1a196b0e 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -29,13 +29,13 @@ dat += "Using this contract, you may summon an apprentice to aid you on your mission.
" dat += "If you are unable to establish contact with your apprentice, you can feed the contract back to the spellbook to refund your points.
" dat += "Which school of magic is your apprentice studying?:
" - dat += "Destruction
" + dat += "Destruction
" dat += "Your apprentice is skilled in offensive magic. They know Magic Missile and Fireball.
" - dat += "Bluespace Manipulation
" + dat += "Bluespace Manipulation
" dat += "Your apprentice is able to defy physics, melting through solid objects and travelling great distances in the blink of an eye. They know Teleport and Ethereal Jaunt.
" - dat += "Healing
" + dat += "Healing
" dat += "Your apprentice is training to cast spells that will aid your survival. They know Forcewall and Charge and come with a Staff of Healing.
" - dat += "Robeless
" + dat += "Robeless
" dat += "Your apprentice is training to cast spells without their robes. They know Knock and Mindswap.
" user << browse(dat, "window=radio") onclose(user, "radio") diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index 2a3c5e6faa..6585da0ba4 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -6,56 +6,47 @@ var/door = 0 var/grille = 0 var/mach = 0 - var/num_territories = 1//Number of total valid territories for gang mode + +/datum/station_state/proc/count() + for(var/Z in GLOB.station_z_levels) + for(var/turf/T in block(locate(1,1,Z), locate(world.maxx,world.maxy,Z))) + // don't count shuttles since they may have just left + if(istype(T.loc, /area/shuttle)) + continue + + if(isfloorturf(T)) + var/turf/open/floor/TF = T + if(!(TF.burnt)) + floor += 12 + else + floor += 1 + + if(iswallturf(T)) + var/turf/closed/wall/TW = T + if(TW.intact) + wall += 2 + else + wall += 1 + + if(istype(T, /turf/closed/wall/r_wall)) + var/turf/closed/wall/r_wall/TRW = T + if(TRW.intact) + r_wall += 2 + else + r_wall += 1 -/datum/station_state/proc/count(count_territories) - for(var/turf/T in block(locate(1,1,1), locate(world.maxx,world.maxy,1))) - - if(isfloorturf(T)) - var/turf/open/floor/TF = T - if(!(TF.burnt)) - src.floor += 12 - else - src.floor += 1 - - if(iswallturf(T)) - var/turf/closed/wall/TW = T - if(TW.intact) - src.wall += 2 - else - src.wall += 1 - - if(istype(T, /turf/closed/wall/r_wall)) - var/turf/closed/wall/r_wall/TRW = T - if(TRW.intact) - src.r_wall += 2 - else - src.r_wall += 1 - - - for(var/obj/O in T.contents) - if(istype(O, /obj/structure/window)) - src.window += 1 - else if(istype(O, /obj/structure/grille)) - var/obj/structure/grille/GR = O - if(!GR.broken) - src.grille += 1 - else if(istype(O, /obj/machinery/door)) - src.door += 1 - else if(ismachinery(O)) - src.mach += 1 - - if(count_territories) - var/list/valid_territories = list() - for(var/area/A in world) //First, collect all area types on the station zlevel - if(A.z in GLOB.station_z_levels) - if(!(A.type in valid_territories) && A.valid_territory) - valid_territories |= A.type - if(valid_territories.len) - num_territories = valid_territories.len //Add them all up to make the total number of area types - else - to_chat(world, "ERROR: NO VALID TERRITORIES") + for(var/obj/O in T.contents) + if(istype(O, /obj/structure/window)) + window += 1 + else if(istype(O, /obj/structure/grille)) + var/obj/structure/grille/GR = O + if(!GR.broken) + grille += 1 + else if(istype(O, /obj/machinery/door)) + door += 1 + else if(ismachinery(O)) + mach += 1 /datum/station_state/proc/score(datum/station_state/result) if(!result) diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index 61dee30c8e..d27c3aa820 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -226,6 +226,8 @@ . = ..() if(!independent) //no pulling people deep into the blob verbs -= /mob/living/verb/pulled + else + pass_flags &= ~PASSBLOB /mob/living/simple_animal/hostile/blob/blobbernaut/Life() if(..()) diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index e6cae65c03..4f26563da1 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -79,12 +79,13 @@ GLOBAL_LIST_EMPTY(blob_nodes) /mob/camera/blob/proc/victory() sound_to_playing_players('sound/machines/alarm.ogg') sleep(100) - for(var/mob/living/L in GLOB.mob_list) + for(var/i in GLOB.mob_living_list) + var/mob/living/L = i var/turf/T = get_turf(L) if(!T || !(T.z in GLOB.station_z_levels)) continue - if(L in GLOB.overminds || L.checkpass(PASSBLOB)) + if(L in GLOB.overminds || (L.pass_flags & PASSBLOB)) continue var/area/Ablob = get_area(T) @@ -92,9 +93,12 @@ GLOBAL_LIST_EMPTY(blob_nodes) if(!Ablob.blob_allowed) continue - playsound(L, 'sound/effects/splat.ogg', 50, 1) - L.death() - new/mob/living/simple_animal/hostile/blob/blobspore(T) + if(!("blob" in L.faction)) + playsound(L, 'sound/effects/splat.ogg', 50, 1) + L.death() + new/mob/living/simple_animal/hostile/blob/blobspore(T) + else + L.fully_heal() for(var/V in GLOB.sortedAreas) var/area/A = V diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 0dd592665f..e3a4f50082 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -154,33 +154,34 @@ return if(!can_buy(40)) return - B.max_integrity = initial(B.max_integrity) * 0.25 //factories that produced a blobbernaut have much lower health - B.obj_integrity = min(B.obj_integrity, B.max_integrity) - B.update_icon() - B.visible_message("The blobbernaut [pick("rips", "tears", "shreds")] its way out of the factory blob!") - playsound(B.loc, 'sound/effects/splat.ogg', 50, 1) - var/mob/living/simple_animal/hostile/blob/blobbernaut/blobber = new /mob/living/simple_animal/hostile/blob/blobbernaut(get_turf(B)) - flick("blobbernaut_produce", blobber) - B.naut = blobber - blobber.factory = B - blobber.overmind = src - blobber.update_icons() - blobber.notransform = 1 //stop the naut from moving around - blobber.adjustHealth(blobber.maxHealth * 0.5) - blob_mobs += blobber - var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [blob_reagent_datum.name] blobbernaut?", ROLE_BLOB, null, ROLE_BLOB, 50, blobber) //players must answer rapidly + + var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [blob_reagent_datum.name] blobbernaut?", ROLE_BLOB, null, ROLE_BLOB, 50) //players must answer rapidly if(candidates.len) //if we got at least one candidate, they're a blobbernaut now. + B.max_integrity = initial(B.max_integrity) * 0.25 //factories that produced a blobbernaut have much lower health + B.obj_integrity = min(B.obj_integrity, B.max_integrity) + B.update_icon() + B.visible_message("The blobbernaut [pick("rips", "tears", "shreds")] its way out of the factory blob!") + playsound(B.loc, 'sound/effects/splat.ogg', 50, 1) + var/mob/living/simple_animal/hostile/blob/blobbernaut/blobber = new /mob/living/simple_animal/hostile/blob/blobbernaut(get_turf(B)) + flick("blobbernaut_produce", blobber) + B.naut = blobber + blobber.factory = B + blobber.overmind = src + blobber.update_icons() + blobber.adjustHealth(blobber.maxHealth * 0.5) + blob_mobs += blobber var/client/C = pick(candidates) blobber.key = C.key SEND_SOUND(blobber, sound('sound/effects/blobattack.ogg')) SEND_SOUND(blobber, sound('sound/effects/attackblob.ogg')) to_chat(blobber, "You are a blobbernaut!") - to_chat(blobber, "You are powerful, hard to kill, and slowly regenerate near nodes and cores, but will slowly die if not near the blob or if the factory that made you is killed.") + to_chat(blobber, "You are powerful, hard to kill, and slowly regenerate near nodes and cores, but will slowly die if not near the blob or if the factory that made you is killed.") to_chat(blobber, "You can communicate with other blobbernauts and overminds via :b") to_chat(blobber, "Your overmind's blob reagent is: [blob_reagent_datum.name]!") to_chat(blobber, "The [blob_reagent_datum.name] reagent [blob_reagent_datum.shortdesc ? "[blob_reagent_datum.shortdesc]" : "[blob_reagent_datum.description]"]") - if(blobber) - blobber.notransform = 0 + else + to_chat(src, "You could not conjure a sentience for your blobbernaut. Your points have been refunded. Try again later.") + add_points(40) /mob/camera/blob/verb/relocate_core() set category = "Blob" diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 8570cf294c..0c642692f0 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -67,7 +67,7 @@ return atmosblock /obj/structure/blob/CanPass(atom/movable/mover, turf/target) - if(istype(mover) && mover.checkpass(PASSBLOB)) + if(istype(mover) && (mover.pass_flags & PASSBLOB)) return 1 return 0 @@ -78,7 +78,7 @@ . = 0 if(ismovableatom(caller)) var/atom/movable/mover = caller - . = . || mover.checkpass(PASSBLOB) + . = . || (mover.pass_flags & PASSBLOB) /obj/structure/blob/update_icon() //Updates color based on overmind color if we have an overmind. if(overmind) diff --git a/code/game/gamemodes/changeling/cellular_emporium.dm b/code/game/gamemodes/changeling/cellular_emporium.dm index aaba09c87c..df92212181 100644 --- a/code/game/gamemodes/changeling/cellular_emporium.dm +++ b/code/game/gamemodes/changeling/cellular_emporium.dm @@ -3,7 +3,7 @@ /datum/cellular_emporium var/name = "cellular emporium" - var/datum/changeling/changeling + var/datum/antagonist/changeling/changeling /datum/cellular_emporium/New(my_changeling) . = ..() @@ -32,7 +32,7 @@ var/list/abilities = list() - for(var/path in subtypesof(/obj/effect/proc_holder/changeling)) + for(var/path in changeling.all_powers) var/obj/effect/proc_holder/changeling/ability = path var/dna_cost = initial(ability.dna_cost) @@ -61,10 +61,10 @@ switch(action) if("readapt") if(changeling.canrespec) - changeling.lingRespec(usr) + changeling.readapt() if("evolve") var/sting_name = params["name"] - changeling.purchasePower(usr, sting_name) + changeling.purchase_power(sting_name) /datum/action/innate/cellular_emporium name = "Cellular Emporium" diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 06ccac915c..8389f04fd3 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -1,15 +1,8 @@ -#define LING_FAKEDEATH_TIME 400 //40 seconds -#define LING_DEAD_GENETICDAMAGE_HEAL_CAP 50 //The lowest value of geneticdamage handle_changeling() can take it to while dead. -#define LING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob - GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega")) GLOBAL_LIST_INIT(slots, list("head", "wear_mask", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store")) GLOBAL_LIST_INIT(slot2slot, list("head" = slot_head, "wear_mask" = slot_wear_mask, "neck" = slot_neck, "back" = slot_back, "wear_suit" = slot_wear_suit, "w_uniform" = slot_w_uniform, "shoes" = slot_shoes, "belt" = slot_belt, "gloves" = slot_gloves, "glasses" = slot_glasses, "ears" = slot_ears, "wear_id" = slot_wear_id, "s_store" = slot_s_store)) GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "wear_mask" = /obj/item/clothing/mask/changeling, "back" = /obj/item/changeling, "wear_suit" = /obj/item/clothing/suit/changeling, "w_uniform" = /obj/item/clothing/under/changeling, "shoes" = /obj/item/clothing/shoes/changeling, "belt" = /obj/item/changeling, "gloves" = /obj/item/clothing/gloves/changeling, "glasses" = /obj/item/clothing/glasses/changeling, "ears" = /obj/item/changeling, "wear_id" = /obj/item/changeling, "s_store" = /obj/item/changeling)) - - -/datum/game_mode - var/list/datum/mind/changelings = list() +GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our this objective to all lings /datum/game_mode/changeling @@ -29,26 +22,8 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w Changelings: Accomplish the objectives assigned to you.\n\ Crew: Root out and eliminate the changeling menace." - var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time - var/const/prob_right_murder_target_l = 25 // lower bound on probability of naming right assassination target - var/const/prob_right_murder_target_h = 50 // upper bound on probability of naimg the right assassination target - - var/const/prob_int_item = 50 // intercept names the theft target half the time - var/const/prob_right_item_l = 25 // lower bound on probability of naming right theft target - var/const/prob_right_item_h = 50 // upper bound on probability of naming the right theft target - - var/const/prob_int_sab_target = 50 // intercept names the sabotage target half the time - var/const/prob_right_sab_target_l = 25 // lower bound on probability of naming right sabotage target - var/const/prob_right_sab_target_h = 50 // upper bound on probability of naming right sabotage target - - var/const/prob_right_killer_l = 25 //lower bound on probability of naming the right operative - var/const/prob_right_killer_h = 50 //upper bound on probability of naming the right operative - var/const/prob_right_objective_l = 25 //lower bound on probability of determining the objective correctly - var/const/prob_right_objective_h = 50 //upper bound on probability of determining the objective correctly - var/const/changeling_amount = 4 //hard limit on changelings if scaling is turned off - - var/changeling_team_objective_type = null //If this is not null, we hand our this objective to all lings + var/list/changelings = list() /datum/game_mode/changeling/pre_setup() @@ -80,7 +55,6 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w return 0 /datum/game_mode/changeling/post_setup() - //Decide if it's ok for the lings to have a team objective //And then set it up to be handed out in forge_changeling_objectives var/list/team_objectives = subtypesof(/datum/objective/changeling_team_objective) @@ -92,116 +66,27 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w possible_team_objectives += T if(possible_team_objectives.len && prob(20*changelings.len)) - changeling_team_objective_type = pick(possible_team_objectives) + GLOB.changeling_team_objective_type = pick(possible_team_objectives) for(var/datum/mind/changeling in changelings) log_game("[changeling.key] (ckey) has been selected as a changeling") - changeling.current.make_changeling() - forge_changeling_objectives(changeling) - greet_changeling(changeling) - SSticker.mode.update_changeling_icons_added(changeling) + var/datum/antagonist/changeling/new_antag = new(changeling) + new_antag.team_mode = TRUE + changeling.add_antag_datum(new_antag) ..() /datum/game_mode/changeling/make_antag_chance(mob/living/carbon/human/character) //Assigns changeling to latejoiners var/csc = CONFIG_GET(number/changeling_scaling_coeff) var/changelingcap = min(round(GLOB.joined_player_list.len / (csc * 2)) + 2, round(GLOB.joined_player_list.len / csc)) - if(SSticker.mode.changelings.len >= changelingcap) //Caps number of latejoin antagonists + if(changelings.len >= changelingcap) //Caps number of latejoin antagonists return - if(SSticker.mode.changelings.len <= (changelingcap - 2) || prob(100 - (csc * 2))) + if(changelings.len <= (changelingcap - 2) || prob(100 - (csc * 2))) if(ROLE_CHANGELING in character.client.prefs.be_special) if(!jobban_isbanned(character, ROLE_CHANGELING) && !jobban_isbanned(character, "Syndicate")) if(age_check(character.client)) if(!(character.job in restricted_jobs)) character.mind.make_Changling() - -/datum/game_mode/proc/forge_changeling_objectives(datum/mind/changeling, var/team_mode = 0) - //OBJECTIVES - random traitor objectives. Unique objectives "steal brain" and "identity theft". - //No escape alone because changelings aren't suited for it and it'd probably just lead to rampant robusting - //If it seems like they'd be able to do it in play, add a 10% chance to have to escape alone - - var/escape_objective_possible = TRUE - - //if there's a team objective, check if it's compatible with escape objectives - for(var/datum/objective/changeling_team_objective/CTO in changeling.objectives) - if(!CTO.escape_objective_compatible) - escape_objective_possible = FALSE - break - - var/datum/objective/absorb/absorb_objective = new - absorb_objective.owner = changeling - absorb_objective.gen_amount_goal(6, 8) - changeling.objectives += absorb_objective - - if(prob(60)) - if(prob(85)) - var/datum/objective/steal/steal_objective = new - steal_objective.owner = changeling - steal_objective.find_target() - changeling.objectives += steal_objective - else - var/datum/objective/download/download_objective = new - download_objective.owner = changeling - download_objective.gen_amount_goal() - changeling.objectives += download_objective - - var/list/active_ais = active_ais() - if(active_ais.len && prob(100/GLOB.joined_player_list.len)) - var/datum/objective/destroy/destroy_objective = new - destroy_objective.owner = changeling - destroy_objective.find_target() - changeling.objectives += destroy_objective - else - if(prob(70)) - var/datum/objective/assassinate/kill_objective = new - kill_objective.owner = changeling - if(team_mode) //No backstabbing while in a team - kill_objective.find_target_by_role(role = "Changeling", role_type = 1, invert = 1) - else - kill_objective.find_target() - changeling.objectives += kill_objective - else - var/datum/objective/maroon/maroon_objective = new - maroon_objective.owner = changeling - if(team_mode) - maroon_objective.find_target_by_role(role = "Changeling", role_type = 1, invert = 1) - else - maroon_objective.find_target() - changeling.objectives += maroon_objective - - if (!(locate(/datum/objective/escape) in changeling.objectives) && escape_objective_possible) - var/datum/objective/escape/escape_with_identity/identity_theft = new - identity_theft.owner = changeling - identity_theft.target = maroon_objective.target - identity_theft.update_explanation_text() - changeling.objectives += identity_theft - escape_objective_possible = FALSE - - if (!(locate(/datum/objective/escape) in changeling.objectives) && escape_objective_possible) - if(prob(50)) - var/datum/objective/escape/escape_objective = new - escape_objective.owner = changeling - changeling.objectives += escape_objective - else - var/datum/objective/escape/escape_with_identity/identity_theft = new - identity_theft.owner = changeling - if(team_mode) - identity_theft.find_target_by_role(role = "Changeling", role_type = 1, invert = 1) - else - identity_theft.find_target() - changeling.objectives += identity_theft - escape_objective_possible = FALSE - - - -/datum/game_mode/changeling/forge_changeling_objectives(datum/mind/changeling) - if(changeling_team_objective_type) - var/datum/objective/changeling_team_objective/team_objective = new changeling_team_objective_type - team_objective.owner = changeling - changeling.objectives += team_objective - - ..(changeling,1) - else - ..(changeling,0) + changelings += character.mind /datum/game_mode/changeling/generate_report() return "The Gorlex Marauders have announced the successful raid and destruction of Central Command containment ship #S-[rand(1111, 9999)]. This ship housed only a single prisoner - \ @@ -209,29 +94,12 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w of the Thing being sent to a station in this sector is highly likely. It may be in the guise of any crew member. Trust nobody - suspect everybody. Do not announce this to the crew, \ as paranoia may spread and inhibit workplace efficiency." -/datum/game_mode/proc/greet_changeling(datum/mind/changeling, you_are=1) - if (you_are) - to_chat(changeling.current, "You are [changeling.changeling.changelingID], a changeling! You have absorbed and taken the form of a human.") - to_chat(changeling.current, "Use say \":g message\" to communicate with your fellow changelings.") - to_chat(changeling.current, "You must complete the following tasks:") - changeling.current.playsound_local(get_turf(changeling.current), 'sound/ambience/antag/ling_aler.ogg', 100, FALSE, pressure_affected = FALSE) - - if (changeling.current.mind) - var/mob/living/carbon/human/H = changeling.current - if(H.mind.assigned_role == "Clown") - to_chat(H, "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself.") - H.dna.remove_mutation(CLOWNMUT) - - var/obj_count = 1 - for(var/datum/objective/objective in changeling.objectives) - to_chat(changeling.current, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ - return - /datum/game_mode/proc/auto_declare_completion_changeling() + var/list/changelings = get_antagonists(/datum/antagonist/changeling,TRUE) //Only real lings get a mention if(changelings.len) var/text = "
The changelings were:" for(var/datum/mind/changeling in changelings) + var/datum/antagonist/changeling/ling = changeling.has_antag_datum(/datum/antagonist/changeling) var/changelingwin = 1 if(!changeling.current) changelingwin = 0 @@ -239,8 +107,8 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w text += printplayer(changeling) //Removed sanity if(changeling) because we -want- a runtime to inform us that the changelings list is incorrect and needs to be fixed. - text += "
Changeling ID: [changeling.changeling.changelingID]." - text += "
Genomes Extracted: [changeling.changeling.absorbedcount]" + text += "
Changeling ID: [ling.changelingID]." + text += "
Genomes Extracted: [ling.absorbedcount]" if(changeling.objectives.len) var/count = 1 @@ -265,176 +133,8 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w to_chat(world, text) - return 1 -/datum/changeling //stores changeling powers, changeling recharge thingie, changeling absorbed DNA and changeling ID (for changeling hivemind) - var/list/stored_profiles = list() //list of datum/changelingprofile - var/datum/changelingprofile/first_prof = null - //var/list/absorbed_dna = list() - //var/list/protected_dna = list() //dna that is not lost when capacity is otherwise full - var/dna_max = 6 //How many extra DNA strands the changeling can store for transformation. - var/absorbedcount = 0 - var/chem_charges = 20 - var/chem_storage = 75 - var/chem_recharge_rate = 1 - var/chem_recharge_slowdown = 0 - var/sting_range = 2 - var/changelingID = "Changeling" - var/geneticdamage = 0 - var/isabsorbing = 0 - var/islinking = 0 - var/geneticpoints = 10 - var/purchasedpowers = list() - var/mimicing = "" - var/canrespec = 0 - var/changeling_speak = 0 - var/datum/dna/chosen_dna - var/obj/effect/proc_holder/changeling/sting/chosen_sting - var/datum/cellular_emporium/cellular_emporium - var/datum/action/innate/cellular_emporium/emporium_action - -/datum/changeling/New(var/gender=FEMALE) - ..() - var/honorific - if(gender == FEMALE) - honorific = "Ms." - else - honorific = "Mr." - if(GLOB.possible_changeling_IDs.len) - changelingID = pick(GLOB.possible_changeling_IDs) - GLOB.possible_changeling_IDs -= changelingID - changelingID = "[honorific] [changelingID]" - else - changelingID = "[honorific] [rand(1,999)]" - - cellular_emporium = new(src) - emporium_action = new(cellular_emporium) - -/datum/changeling/Destroy() - qdel(cellular_emporium) - cellular_emporium = null - qdel(emporium_action) - emporium_action = null - . = ..() - -/datum/changeling/proc/regenerate(var/mob/living/carbon/the_ling) - if(istype(the_ling)) - emporium_action.Grant(the_ling) - if(the_ling.stat == DEAD) - chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), (chem_storage*0.5)) - geneticdamage = max(LING_DEAD_GENETICDAMAGE_HEAL_CAP,geneticdamage-1) - else //not dead? no chem/geneticdamage caps. - chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), chem_storage) - geneticdamage = max(0, geneticdamage-1) - - -/datum/changeling/proc/get_dna(dna_owner) - for(var/datum/changelingprofile/prof in stored_profiles) - if(dna_owner == prof.name) - return prof - -/datum/changeling/proc/has_dna(datum/dna/tDNA) - for(var/datum/changelingprofile/prof in stored_profiles) - if(tDNA.is_same_as(prof.dna)) - return 1 - return 0 - -/datum/changeling/proc/can_absorb_dna(mob/living/carbon/user, mob/living/carbon/human/target, var/verbose=1) - if(stored_profiles.len) - var/datum/changelingprofile/prof = stored_profiles[1] - if(prof.dna == user.dna && stored_profiles.len >= dna_max)//If our current DNA is the stalest, we gotta ditch it. - if(verbose) - to_chat(user, "We have reached our capacity to store genetic information! We must transform before absorbing more.") - return - if(!target) - return - if(NO_DNA_COPY in target.dna.species.species_traits) - if(verbose) - to_chat(user, "[target] is not compatible with our biology.") - return - if((target.disabilities & NOCLONE) || (target.disabilities & HUSK)) - if(verbose) - to_chat(user, "DNA of [target] is ruined beyond usability!") - return - if(!ishuman(target))//Absorbing monkeys is entirely possible, but it can cause issues with transforming. That's what lesser form is for anyway! - if(verbose) - to_chat(user, "We could gain no benefit from absorbing a lesser creature.") - return - if(has_dna(target.dna)) - if(verbose) - to_chat(user, "We already have this DNA in storage!") - return - if(!target.has_dna()) - if(verbose) - to_chat(user, "[target] is not compatible with our biology.") - return - return 1 - -/datum/changeling/proc/create_profile(mob/living/carbon/human/H, mob/living/carbon/human/user, protect = 0) - var/datum/changelingprofile/prof = new - - H.dna.real_name = H.real_name //Set this again, just to be sure that it's properly set. - var/datum/dna/new_dna = new H.dna.type - H.dna.copy_dna(new_dna) - prof.dna = new_dna - prof.name = H.real_name - prof.protected = protect - - prof.underwear = H.underwear - prof.undershirt = H.undershirt - prof.socks = H.socks - - var/list/slots = list("head", "wear_mask", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store") - for(var/slot in slots) - if(slot in H.vars) - var/obj/item/I = H.vars[slot] - if(!I) - continue - prof.name_list[slot] = I.name - prof.appearance_list[slot] = I.appearance - prof.flags_cover_list[slot] = I.flags_cover - prof.item_color_list[slot] = I.item_color - prof.item_state_list[slot] = I.item_state - prof.exists_list[slot] = 1 - else - continue - - return prof - -/datum/changeling/proc/add_profile(datum/changelingprofile/prof) - if(stored_profiles.len > dna_max) - if(!push_out_profile()) - return - - stored_profiles += prof - absorbedcount++ - -/datum/changeling/proc/add_new_profile(mob/living/carbon/human/H, mob/living/carbon/human/user, protect = 0) - var/datum/changelingprofile/prof = create_profile(H, protect) - add_profile(prof) - return prof - -/datum/changeling/proc/remove_profile(mob/living/carbon/human/H, force = 0) - for(var/datum/changelingprofile/prof in stored_profiles) - if(H.real_name == prof.name) - if(prof.protected && !force) - continue - stored_profiles -= prof - qdel(prof) - -/datum/changeling/proc/get_profile_to_remove() - for(var/datum/changelingprofile/prof in stored_profiles) - if(!prof.protected) - return prof - -/datum/changeling/proc/push_out_profile() - var/datum/changelingprofile/removeprofile = get_profile_to_remove() - if(removeprofile) - stored_profiles -= removeprofile - return 1 - return 0 - /proc/changeling_transform(mob/living/carbon/human/user, datum/changelingprofile/chosen_prof) var/datum/dna/chosen_dna = chosen_prof.dna user.real_name = chosen_prof.name @@ -474,50 +174,4 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w if(equip) user.equip_to_slot_or_del(C, GLOB.slot2slot[slot]) - user.regenerate_icons() - -/datum/changelingprofile - var/name = "a bug" - - var/protected = 0 - - var/datum/dna/dna = null - var/list/name_list = list() //associative list of slotname = itemname - var/list/appearance_list = list() - var/list/flags_cover_list = list() - var/list/exists_list = list() - var/list/item_color_list = list() - var/list/item_state_list = list() - - var/underwear - var/undershirt - var/socks - -/datum/changelingprofile/Destroy() - qdel(dna) - . = ..() - -/datum/changelingprofile/proc/copy_profile(datum/changelingprofile/newprofile) - newprofile.name = name - newprofile.protected = protected - newprofile.dna = new dna.type - dna.copy_dna(newprofile.dna) - newprofile.name_list = name_list.Copy() - newprofile.appearance_list = appearance_list.Copy() - newprofile.flags_cover_list = flags_cover_list.Copy() - newprofile.exists_list = exists_list.Copy() - newprofile.item_color_list = item_color_list.Copy() - newprofile.item_state_list = item_state_list.Copy() - newprofile.underwear = underwear - newprofile.undershirt = undershirt - newprofile.socks = socks - -/datum/game_mode/proc/update_changeling_icons_added(datum/mind/changling_mind) - var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING] - hud.join_hud(changling_mind.current) - set_antag_hud(changling_mind.current, "changling") - -/datum/game_mode/proc/update_changeling_icons_removed(datum/mind/changling_mind) - var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING] - hud.leave_hud(changling_mind.current) - set_antag_hud(changling_mind.current, null) + user.regenerate_icons() \ No newline at end of file diff --git a/code/game/gamemodes/changeling/changeling_power.dm b/code/game/gamemodes/changeling/changeling_power.dm index 1abd58854b..ee6a0bee8c 100644 --- a/code/game/gamemodes/changeling/changeling_power.dm +++ b/code/game/gamemodes/changeling/changeling_power.dm @@ -26,14 +26,14 @@ /obj/effect/proc_holder/changeling/Click() var/mob/user = usr - if(!user || !user.mind || !user.mind.changeling) + if(!user || !user.mind || !user.mind.has_antag_datum(/datum/antagonist/changeling)) return try_to_sting(user) /obj/effect/proc_holder/changeling/proc/try_to_sting(mob/user, mob/target) if(!can_sting(user, target)) return - var/datum/changeling/c = user.mind.changeling + var/datum/antagonist/changeling/c = user.mind.has_antag_datum(/datum/antagonist/changeling) if(sting_action(user, target)) SSblackbox.add_details("changeling_powers",name) sting_feedback(user, target) @@ -52,7 +52,7 @@ if(req_human && !ishuman(user)) to_chat(user, "We cannot do that in this form!") return 0 - var/datum/changeling/c = user.mind.changeling + var/datum/antagonist/changeling/c = user.mind.has_antag_datum(/datum/antagonist/changeling) if(c.chem_charges < chemical_cost) to_chat(user, "We require at least [chemical_cost] unit\s of chemicals to do that!") return 0 diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm deleted file mode 100644 index 76a37f9bb1..0000000000 --- a/code/game/gamemodes/changeling/evolution_menu.dm +++ /dev/null @@ -1,112 +0,0 @@ -/datum/changeling/proc/purchasePower(mob/living/carbon/user, sting_name) - - var/obj/effect/proc_holder/changeling/thepower = null - - for(var/path in subtypesof(/obj/effect/proc_holder/changeling)) - var/obj/effect/proc_holder/changeling/S = path - if(initial(S.name) == sting_name) - thepower = new path() - break - - if(!thepower) - to_chat(user, "This is awkward. Changeling power purchase failed, please report this bug to a coder!") - return - - if(absorbedcount < thepower.req_dna) - to_chat(user, "We lack the energy to evolve this ability!") - return - - if(has_sting(thepower)) - to_chat(user, "We have already evolved this ability!") - return - - if(thepower.dna_cost < 0) - to_chat(user, "We cannot evolve this ability.") - return - - if(geneticpoints < thepower.dna_cost) - to_chat(user, "We have reached our capacity for abilities.") - return - - if(user.status_flags & FAKEDEATH)//To avoid potential exploits by buying new powers while in stasis, which clears your verblist. - to_chat(user, "We lack the energy to evolve new abilities right now.") - return - - geneticpoints -= thepower.dna_cost - purchasedpowers += thepower - thepower.on_purchase(user) - -//Reselect powers -/datum/changeling/proc/lingRespec(mob/user) - if(!ishuman(user)) - to_chat(user, "We can't remove our evolutions in this form!") - return - if(canrespec) - to_chat(user, "We have removed our evolutions from this form, and are now ready to readapt.") - user.remove_changeling_powers(1) - canrespec = 0 - user.make_changeling(TRUE) - return 1 - else - to_chat(user, "You lack the power to readapt your evolutions!") - return 0 - -/mob/proc/make_changeling(is_respec) - if(!mind) - return - if(!ishuman(src) && !ismonkey(src)) - return - if(!mind.changeling) - mind.changeling = new /datum/changeling(gender) - if(mind.changeling.purchasedpowers) - remove_changeling_powers(1) - // purchase free powers. - for(var/path in subtypesof(/obj/effect/proc_holder/changeling)) - var/obj/effect/proc_holder/changeling/S = new path() - if(!S.dna_cost) - if(!mind.changeling.has_sting(S)) - mind.changeling.purchasedpowers+=S - S.on_purchase(src, is_respec) - if(is_respec) - SSblackbox.add_details("changeling_power_purchase","Readapt") - - var/mob/living/carbon/C = src //only carbons have dna now, so we have to typecaste - if(ishuman(C)) - var/datum/changelingprofile/prof = mind.changeling.add_new_profile(C, src) - mind.changeling.first_prof = prof - - var/obj/item/organ/brain/B = C.getorganslot(ORGAN_SLOT_BRAIN) - if(B) - B.vital = FALSE - B.decoy_override = TRUE - return 1 - -/datum/changeling/proc/reset() - chosen_sting = null - geneticpoints = initial(geneticpoints) - sting_range = initial(sting_range) - chem_storage = initial(chem_storage) - chem_recharge_rate = initial(chem_recharge_rate) - chem_charges = min(chem_charges, chem_storage) - chem_recharge_slowdown = initial(chem_recharge_slowdown) - mimicing = "" - -/mob/proc/remove_changeling_powers(keep_free_powers=0) - if(ishuman(src) || ismonkey(src)) - if(mind && mind.changeling) - mind.changeling.changeling_speak = 0 - mind.changeling.reset() - for(var/obj/effect/proc_holder/changeling/p in mind.changeling.purchasedpowers) - if((p.dna_cost == 0 && keep_free_powers) || p.always_keep) - continue - mind.changeling.purchasedpowers -= p - p.on_refund(src) - if(hud_used) - hud_used.lingstingdisplay.icon_state = null - hud_used.lingstingdisplay.invisibility = INVISIBILITY_ABSTRACT - -/datum/changeling/proc/has_sting(obj/effect/proc_holder/changeling/power) - for(var/obj/effect/proc_holder/changeling/P in purchasedpowers) - if(initial(power.name) == P.name) - return 1 - return 0 diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index c7b02a3224..d7ef971406 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -9,7 +9,7 @@ if(!..()) return - var/datum/changeling/changeling = user.mind.changeling + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) if(changeling.isabsorbing) to_chat(user, "We are already absorbing!") return @@ -22,12 +22,12 @@ return var/mob/living/carbon/target = user.pulling - return changeling.can_absorb_dna(user,target) + return changeling.can_absorb_dna(target) /obj/effect/proc_holder/changeling/absorbDNA/sting_action(mob/user) - var/datum/changeling/changeling = user.mind.changeling + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) var/mob/living/carbon/human/target = user.pulling changeling.isabsorbing = 1 for(var/i in 1 to 3) @@ -52,7 +52,7 @@ to_chat(target, "You are absorbed by the changeling!") if(!changeling.has_dna(target.dna)) - changeling.add_new_profile(target, user) + changeling.add_new_profile(target) if(user.nutrition < NUTRITION_LEVEL_WELL_FED) user.nutrition = min((user.nutrition + target.nutrition), NUTRITION_LEVEL_WELL_FED) @@ -84,12 +84,14 @@ user.mind.store_memory("We have no more knowledge of [target]'s speech patterns.") to_chat(user, "We have no more knowledge of [target]'s speech patterns.") - if(target.mind.changeling)//If the target was a changeling, suck out their extra juice and objective points! - changeling.chem_charges += min(target.mind.changeling.chem_charges, changeling.chem_storage) - changeling.absorbedcount += (target.mind.changeling.absorbedcount) - target.mind.changeling.stored_profiles.len = 1 - target.mind.changeling.absorbedcount = 0 + var/datum/antagonist/changeling/target_ling = target.mind.has_antag_datum(/datum/antagonist/changeling) + if(target_ling)//If the target was a changeling, suck out their extra juice and objective points! + changeling.chem_charges += min(target_ling.chem_charges, changeling.chem_storage) + changeling.absorbedcount += (target_ling.absorbedcount) + + target_ling.stored_profiles.len = 1 + target_ling.absorbedcount = 0 changeling.chem_charges=min(changeling.chem_charges+10, changeling.chem_storage) diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm index e35f04d9e7..330488f6da 100644 --- a/code/game/gamemodes/changeling/powers/fakedeath.dm +++ b/code/game/gamemodes/changeling/powers/fakedeath.dm @@ -1,35 +1,37 @@ -/obj/effect/proc_holder/changeling/fakedeath - name = "Reviving Stasis" - desc = "We fall into a stasis, allowing us to regenerate and trick our enemies." - chemical_cost = 15 - dna_cost = 0 - req_dna = 1 - req_stat = DEAD - -//Fake our own death and fully heal. You will appear to be dead but regenerate fully after a short delay. -/obj/effect/proc_holder/changeling/fakedeath/sting_action(mob/living/user) - to_chat(user, "We begin our stasis, preparing energy to arise once more.") - if(user.stat != DEAD) - user.emote("deathgasp") - user.tod = worldtime2text() - user.status_flags |= FAKEDEATH //play dead - user.update_stat() - user.update_canmove() - - addtimer(CALLBACK(src, .proc/ready_to_regenerate, user), LING_FAKEDEATH_TIME, TIMER_UNIQUE) - return TRUE - -/obj/effect/proc_holder/changeling/fakedeath/proc/ready_to_regenerate(mob/user) - if(user && user.mind && user.mind.changeling && user.mind.changeling.purchasedpowers) - to_chat(user, "We are ready to revive.") - user.mind.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/revive(null) - -/obj/effect/proc_holder/changeling/fakedeath/can_sting(mob/user) - if(user.status_flags & FAKEDEATH) - to_chat(user, "We are already reviving.") - return - if(!user.stat) //Confirmation for living changelings if they want to fake their death - switch(alert("Are we sure we wish to fake our own death?",,"Yes", "No")) - if("No") - return - return ..() +/obj/effect/proc_holder/changeling/fakedeath + name = "Reviving Stasis" + desc = "We fall into a stasis, allowing us to regenerate and trick our enemies." + chemical_cost = 15 + dna_cost = 0 + req_dna = 1 + req_stat = DEAD + +//Fake our own death and fully heal. You will appear to be dead but regenerate fully after a short delay. +/obj/effect/proc_holder/changeling/fakedeath/sting_action(mob/living/user) + to_chat(user, "We begin our stasis, preparing energy to arise once more.") + if(user.stat != DEAD) + user.emote("deathgasp") + user.tod = worldtime2text() + user.status_flags |= FAKEDEATH //play dead + user.update_stat() + user.update_canmove() + + addtimer(CALLBACK(src, .proc/ready_to_regenerate, user), LING_FAKEDEATH_TIME, TIMER_UNIQUE) + return TRUE + +/obj/effect/proc_holder/changeling/fakedeath/proc/ready_to_regenerate(mob/user) + if(user && user.mind) + var/datum/antagonist/changeling/C = user.mind.has_antag_datum(/datum/antagonist/changeling) + if(C && C.purchasedpowers) + to_chat(user, "We are ready to revive.") + C.purchasedpowers += new /obj/effect/proc_holder/changeling/revive(null) + +/obj/effect/proc_holder/changeling/fakedeath/can_sting(mob/user) + if(user.status_flags & FAKEDEATH) + to_chat(user, "We are already reviving.") + return + if(!user.stat) //Confirmation for living changelings if they want to fake their death + switch(alert("Are we sure we wish to fake our own death?",,"Yes", "No")) + if("No") + return + return ..() diff --git a/code/game/gamemodes/changeling/powers/hivemind.dm b/code/game/gamemodes/changeling/powers/hivemind.dm index 0a78adaf33..5d79a757ec 100644 --- a/code/game/gamemodes/changeling/powers/hivemind.dm +++ b/code/game/gamemodes/changeling/powers/hivemind.dm @@ -1,93 +1,93 @@ -//HIVEMIND COMMUNICATION (:g) -/obj/effect/proc_holder/changeling/hivemind_comms - name = "Hivemind Communication" - desc = "We tune our senses to the airwaves to allow us to discreetly communicate and exchange DNA with other changelings." - helptext = "We will be able to talk with other changelings with :g. Exchanged DNA do not count towards absorb objectives." - dna_cost = 0 - chemical_cost = -1 - -/obj/effect/proc_holder/changeling/hivemind_comms/on_purchase(mob/user, is_respec) - ..() - var/datum/changeling/changeling=user.mind.changeling - changeling.changeling_speak = 1 - to_chat(user, "Use say \":g message\" to communicate with the other changelings.") - var/obj/effect/proc_holder/changeling/hivemind_upload/S1 = new - if(!changeling.has_sting(S1)) - changeling.purchasedpowers+=S1 - var/obj/effect/proc_holder/changeling/hivemind_download/S2 = new - if(!changeling.has_sting(S2)) - changeling.purchasedpowers+=S2 - -// HIVE MIND UPLOAD/DOWNLOAD DNA -GLOBAL_LIST_EMPTY(hivemind_bank) - -/obj/effect/proc_holder/changeling/hivemind_upload - name = "Hive Channel DNA" - desc = "Allows us to channel DNA in the airwaves to allow other changelings to absorb it." - chemical_cost = 10 - dna_cost = -1 - -/obj/effect/proc_holder/changeling/hivemind_upload/sting_action(var/mob/user) - var/datum/changeling/changeling = user.mind.changeling - var/list/names = list() - for(var/datum/changelingprofile/prof in changeling.stored_profiles) - if(!(prof in GLOB.hivemind_bank)) - names += prof.name - - if(names.len <= 0) - to_chat(user, "The airwaves already have all of our DNA.") - return - - var/chosen_name = input("Select a DNA to channel: ", "Channel DNA", null) as null|anything in names - if(!chosen_name) - return - - var/datum/changelingprofile/chosen_dna = changeling.get_dna(chosen_name) - if(!chosen_dna) - return - - var/datum/changelingprofile/uploaded_dna = new chosen_dna.type - chosen_dna.copy_profile(uploaded_dna) - GLOB.hivemind_bank += uploaded_dna - to_chat(user, "We channel the DNA of [chosen_name] to the air.") - return TRUE - -/obj/effect/proc_holder/changeling/hivemind_download - name = "Hive Absorb DNA" - desc = "Allows us to absorb DNA that has been channeled to the airwaves. Does not count towards absorb objectives." - chemical_cost = 10 - dna_cost = -1 - -/obj/effect/proc_holder/changeling/hivemind_download/can_sting(mob/living/carbon/user) - if(!..()) - return - var/datum/changeling/changeling = user.mind.changeling - var/datum/changelingprofile/first_prof = changeling.stored_profiles[1] - if(first_prof.name == user.real_name)//If our current DNA is the stalest, we gotta ditch it. - to_chat(user, "We have reached our capacity to store genetic information! We must transform before absorbing more.") - return - return 1 - -/obj/effect/proc_holder/changeling/hivemind_download/sting_action(mob/user) - var/datum/changeling/changeling = user.mind.changeling - var/list/names = list() - for(var/datum/changelingprofile/prof in GLOB.hivemind_bank) - if(!(prof in changeling.stored_profiles)) - names[prof.name] = prof - - if(names.len <= 0) - to_chat(user, "There's no new DNA to absorb from the air.") - return - - var/S = input("Select a DNA absorb from the air: ", "Absorb DNA", null) as null|anything in names - if(!S) - return - var/datum/changelingprofile/chosen_prof = names[S] - if(!chosen_prof) - return - - var/datum/changelingprofile/downloaded_prof = new chosen_prof.type - chosen_prof.copy_profile(downloaded_prof) - changeling.add_profile(downloaded_prof) - to_chat(user, "We absorb the DNA of [S] from the air.") - return TRUE +//HIVEMIND COMMUNICATION (:g) +/obj/effect/proc_holder/changeling/hivemind_comms + name = "Hivemind Communication" + desc = "We tune our senses to the airwaves to allow us to discreetly communicate and exchange DNA with other changelings." + helptext = "We will be able to talk with other changelings with :g. Exchanged DNA do not count towards absorb objectives." + dna_cost = 0 + chemical_cost = -1 + +/obj/effect/proc_holder/changeling/hivemind_comms/on_purchase(mob/user, is_respec) + ..() + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + changeling.changeling_speak = 1 + to_chat(user, "Use say \":g message\" to communicate with the other changelings.") + var/obj/effect/proc_holder/changeling/hivemind_upload/S1 = new + if(!changeling.has_sting(S1)) + changeling.purchasedpowers+=S1 + var/obj/effect/proc_holder/changeling/hivemind_download/S2 = new + if(!changeling.has_sting(S2)) + changeling.purchasedpowers+=S2 + +// HIVE MIND UPLOAD/DOWNLOAD DNA +GLOBAL_LIST_EMPTY(hivemind_bank) + +/obj/effect/proc_holder/changeling/hivemind_upload + name = "Hive Channel DNA" + desc = "Allows us to channel DNA in the airwaves to allow other changelings to absorb it." + chemical_cost = 10 + dna_cost = -1 + +/obj/effect/proc_holder/changeling/hivemind_upload/sting_action(var/mob/user) + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + var/list/names = list() + for(var/datum/changelingprofile/prof in changeling.stored_profiles) + if(!(prof in GLOB.hivemind_bank)) + names += prof.name + + if(names.len <= 0) + to_chat(user, "The airwaves already have all of our DNA.") + return + + var/chosen_name = input("Select a DNA to channel: ", "Channel DNA", null) as null|anything in names + if(!chosen_name) + return + + var/datum/changelingprofile/chosen_dna = changeling.get_dna(chosen_name) + if(!chosen_dna) + return + + var/datum/changelingprofile/uploaded_dna = new chosen_dna.type + chosen_dna.copy_profile(uploaded_dna) + GLOB.hivemind_bank += uploaded_dna + to_chat(user, "We channel the DNA of [chosen_name] to the air.") + return TRUE + +/obj/effect/proc_holder/changeling/hivemind_download + name = "Hive Absorb DNA" + desc = "Allows us to absorb DNA that has been channeled to the airwaves. Does not count towards absorb objectives." + chemical_cost = 10 + dna_cost = -1 + +/obj/effect/proc_holder/changeling/hivemind_download/can_sting(mob/living/carbon/user) + if(!..()) + return + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + var/datum/changelingprofile/first_prof = changeling.stored_profiles[1] + if(first_prof.name == user.real_name)//If our current DNA is the stalest, we gotta ditch it. + to_chat(user, "We have reached our capacity to store genetic information! We must transform before absorbing more.") + return + return 1 + +/obj/effect/proc_holder/changeling/hivemind_download/sting_action(mob/user) + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + var/list/names = list() + for(var/datum/changelingprofile/prof in GLOB.hivemind_bank) + if(!(prof in changeling.stored_profiles)) + names[prof.name] = prof + + if(names.len <= 0) + to_chat(user, "There's no new DNA to absorb from the air.") + return + + var/S = input("Select a DNA absorb from the air: ", "Absorb DNA", null) as null|anything in names + if(!S) + return + var/datum/changelingprofile/chosen_prof = names[S] + if(!chosen_prof) + return + + var/datum/changelingprofile/downloaded_prof = new chosen_prof.type + chosen_prof.copy_profile(downloaded_prof) + changeling.add_profile(downloaded_prof) + to_chat(user, "We absorb the DNA of [S] from the air.") + return TRUE diff --git a/code/game/gamemodes/changeling/powers/humanform.dm b/code/game/gamemodes/changeling/powers/humanform.dm index d92e622c2d..90ddfb0115 100644 --- a/code/game/gamemodes/changeling/powers/humanform.dm +++ b/code/game/gamemodes/changeling/powers/humanform.dm @@ -1,30 +1,30 @@ -/obj/effect/proc_holder/changeling/humanform - name = "Human Form" - desc = "We change into a human." - chemical_cost = 5 - req_dna = 1 - -//Transform into a human. -/obj/effect/proc_holder/changeling/humanform/sting_action(mob/living/carbon/user) - var/datum/changeling/changeling = user.mind.changeling - var/list/names = list() - for(var/datum/changelingprofile/prof in changeling.stored_profiles) - names += "[prof.name]" - - var/chosen_name = input("Select the target DNA: ", "Target DNA", null) as null|anything in names - if(!chosen_name) - return - - var/datum/changelingprofile/chosen_prof = changeling.get_dna(chosen_name) - if(!chosen_prof) - return - if(!user || user.notransform) - return 0 - to_chat(user, "We transform our appearance.") - - changeling.purchasedpowers -= src - - var/newmob = user.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS) - - changeling_transform(newmob, chosen_prof) - return TRUE +/obj/effect/proc_holder/changeling/humanform + name = "Human Form" + desc = "We change into a human." + chemical_cost = 5 + req_dna = 1 + +//Transform into a human. +/obj/effect/proc_holder/changeling/humanform/sting_action(mob/living/carbon/user) + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + var/list/names = list() + for(var/datum/changelingprofile/prof in changeling.stored_profiles) + names += "[prof.name]" + + var/chosen_name = input("Select the target DNA: ", "Target DNA", null) as null|anything in names + if(!chosen_name) + return + + var/datum/changelingprofile/chosen_prof = changeling.get_dna(chosen_name) + if(!chosen_prof) + return + if(!user || user.notransform) + return 0 + to_chat(user, "We transform our appearance.") + + changeling.purchasedpowers -= src + + var/newmob = user.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS) + + changeling_transform(newmob, chosen_prof) + return TRUE diff --git a/code/game/gamemodes/changeling/powers/linglink.dm b/code/game/gamemodes/changeling/powers/linglink.dm index e3b9e6c02c..c129f035a2 100644 --- a/code/game/gamemodes/changeling/powers/linglink.dm +++ b/code/game/gamemodes/changeling/powers/linglink.dm @@ -8,7 +8,7 @@ /obj/effect/proc_holder/changeling/linglink/can_sting(mob/living/carbon/user) if(!..()) return - var/datum/changeling/changeling = user.mind.changeling + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) if(changeling.islinking) to_chat(user, "We have already formed a link with the victim!") return @@ -19,22 +19,23 @@ to_chat(user, "We cannot link with this creature!") return var/mob/living/carbon/target = user.pulling + if(!target.mind) to_chat(user, "The victim has no mind to link to!") return if(target.stat == DEAD) to_chat(user, "The victim is dead, you cannot link to a dead mind!") return - if(target.mind.changeling) + if(target.mind.has_antag_datum(/datum/antagonist/changeling)) to_chat(user, "The victim is already a part of the hivemind!") return if(user.grab_state <= GRAB_AGGRESSIVE) to_chat(user, "We must have a tighter grip to link with this creature!") return - return changeling.can_absorb_dna(user,target) + return changeling.can_absorb_dna(target) /obj/effect/proc_holder/changeling/linglink/sting_action(mob/user) - var/datum/changeling/changeling = user.mind.changeling + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) var/mob/living/carbon/human/target = user.pulling changeling.islinking = 1 for(var/i in 1 to 3) @@ -47,7 +48,8 @@ if(3) to_chat(user, "We mold the [target]'s mind like clay, granting [target.p_them()] the ability to speak in the hivemind!") to_chat(target, "A migraine throbs behind your eyes, you hear yourself screaming - but your mouth has not opened!") - for(var/mob/M in GLOB.mob_list) + for(var/mi in GLOB.mob_list) + var/mob/M = mi if(M.lingcheck() == 2) to_chat(M, "We can sense a foreign presence in the hivemind...") target.mind.linglink = 1 diff --git a/code/game/gamemodes/changeling/powers/mimic_voice.dm b/code/game/gamemodes/changeling/powers/mimic_voice.dm index f422be20a9..9c0d79e233 100644 --- a/code/game/gamemodes/changeling/powers/mimic_voice.dm +++ b/code/game/gamemodes/changeling/powers/mimic_voice.dm @@ -1,27 +1,27 @@ -/obj/effect/proc_holder/changeling/mimicvoice - name = "Mimic Voice" - desc = "We shape our vocal glands to sound like a desired voice." - helptext = "Will turn your voice into the name that you enter. We must constantly expend chemicals to maintain our form like this." - chemical_cost = 0 //constant chemical drain hardcoded - dna_cost = 1 - req_human = 1 - - -// Fake Voice -/obj/effect/proc_holder/changeling/mimicvoice/sting_action(mob/user) - var/datum/changeling/changeling=user.mind.changeling - if(changeling.mimicing) - changeling.mimicing = "" - changeling.chem_recharge_slowdown -= 0.5 - to_chat(user, "We return our vocal glands to their original position.") - return - - var/mimic_voice = stripped_input(user, "Enter a name to mimic.", "Mimic Voice", null, MAX_NAME_LEN) - if(!mimic_voice) - return - - changeling.mimicing = mimic_voice - changeling.chem_recharge_slowdown += 0.5 - to_chat(user, "We shape our glands to take the voice of [mimic_voice], this will slow down regenerating chemicals while active.") - to_chat(user, "Use this power again to return to our original voice and return chemical production to normal levels.") - return TRUE +/obj/effect/proc_holder/changeling/mimicvoice + name = "Mimic Voice" + desc = "We shape our vocal glands to sound like a desired voice." + helptext = "Will turn your voice into the name that you enter. We must constantly expend chemicals to maintain our form like this." + chemical_cost = 0 //constant chemical drain hardcoded + dna_cost = 1 + req_human = 1 + + +// Fake Voice +/obj/effect/proc_holder/changeling/mimicvoice/sting_action(mob/user) + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + if(changeling.mimicing) + changeling.mimicing = "" + changeling.chem_recharge_slowdown -= 0.5 + to_chat(user, "We return our vocal glands to their original position.") + return + + var/mimic_voice = stripped_input(user, "Enter a name to mimic.", "Mimic Voice", null, MAX_NAME_LEN) + if(!mimic_voice) + return + + changeling.mimicing = mimic_voice + changeling.chem_recharge_slowdown += 0.5 + to_chat(user, "We shape our glands to take the voice of [mimic_voice], this will slow down regenerating chemicals while active.") + to_chat(user, "Use this power again to return to our original voice and return chemical production to normal levels.") + return TRUE diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index f8b25afa5e..ec0f4ea025 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -83,7 +83,7 @@ //checks if we already have an organic suit and casts it off. /obj/effect/proc_holder/changeling/suit/proc/check_suit(mob/user) - var/datum/changeling/changeling = user.mind.changeling + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) if(!ishuman(user) || !changeling) return 1 var/mob/living/carbon/human/H = user @@ -122,7 +122,7 @@ user.equip_to_slot_if_possible(new suit_type(user), slot_wear_suit, 1, 1, 1) user.equip_to_slot_if_possible(new helmet_type(user), slot_head, 1, 1, 1) - var/datum/changeling/changeling = user.mind.changeling + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) changeling.chem_recharge_slowdown += recharge_slowdown return TRUE @@ -385,7 +385,7 @@ weapon_name_simple = "shield" /obj/effect/proc_holder/changeling/weapon/shield/sting_action(mob/user) - var/datum/changeling/changeling = user.mind.changeling //So we can read the absorbedcount. + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) //So we can read the absorbedcount. if(!changeling) return diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index 71c052c39f..716b41a837 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -1,35 +1,37 @@ -/obj/effect/proc_holder/changeling/revive - name = "Revive" - desc = "We regenerate, healing all damage from our form." - helptext = "Does not regrow lost organs or a missing head." - req_stat = DEAD - always_keep = TRUE - ignores_fakedeath = TRUE - -//Revive from revival stasis -/obj/effect/proc_holder/changeling/revive/sting_action(mob/living/carbon/user) - user.status_flags &= ~(FAKEDEATH) - user.tod = null - user.revive(full_heal = 1) - var/list/missing = user.get_missing_limbs() - missing -= "head" // headless changelings are funny - if(missing.len) - playsound(user, 'sound/magic/demon_consume.ogg', 50, 1) - user.visible_message("[user]'s missing limbs \ - reform, making a loud, grotesque sound!", - "Your limbs regrow, making a \ - loud, crunchy sound and giving you great pain!", - "You hear organic matter ripping \ - and tearing!") - user.emote("scream") - user.regenerate_limbs(0, list("head")) +/obj/effect/proc_holder/changeling/revive + name = "Revive" + desc = "We regenerate, healing all damage from our form." + helptext = "Does not regrow lost organs or a missing head." + req_stat = DEAD + always_keep = TRUE + ignores_fakedeath = TRUE + +//Revive from revival stasis +/obj/effect/proc_holder/changeling/revive/sting_action(mob/living/carbon/user) + user.status_flags &= ~(FAKEDEATH) + user.tod = null + user.revive(full_heal = 1) + var/list/missing = user.get_missing_limbs() + missing -= "head" // headless changelings are funny + if(missing.len) + playsound(user, 'sound/magic/demon_consume.ogg', 50, 1) + user.visible_message("[user]'s missing limbs \ + reform, making a loud, grotesque sound!", + "Your limbs regrow, making a \ + loud, crunchy sound and giving you great pain!", + "You hear organic matter ripping \ + and tearing!") + user.emote("scream") + user.regenerate_limbs(0, list("head")) user.regenerate_organs() - to_chat(user, "We have revived ourselves.") - user.mind.changeling.purchasedpowers -= src - return TRUE - -/obj/effect/proc_holder/changeling/revive/can_be_used_by(mob/user) - if((user.stat != DEAD) && !(user.status_flags & FAKEDEATH)) - user.mind.changeling.purchasedpowers -= src - return 0 - . = ..() + to_chat(user, "We have revived ourselves.") + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + changeling.purchasedpowers -= src + return TRUE + +/obj/effect/proc_holder/changeling/revive/can_be_used_by(mob/user) + if((user.stat != DEAD) && !(user.status_flags & FAKEDEATH)) + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + changeling.purchasedpowers -= src + return 0 + . = ..() diff --git a/code/game/gamemodes/changeling/powers/shriek.dm b/code/game/gamemodes/changeling/powers/shriek.dm index dd066bf71b..667dc06daf 100644 --- a/code/game/gamemodes/changeling/powers/shriek.dm +++ b/code/game/gamemodes/changeling/powers/shriek.dm @@ -11,7 +11,7 @@ for(var/mob/living/M in get_hearers_in_view(4, user)) if(iscarbon(M)) var/mob/living/carbon/C = M - if(!C.mind || !C.mind.changeling) + if(!C.mind || !C.mind.has_antag_datum(/datum/antagonist/changeling)) C.adjustEarDamage(0, 30) C.confused += 25 C.Jitter(50) diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index c23074c506..4fdd84040e 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -5,9 +5,12 @@ /obj/effect/proc_holder/changeling/sting/Click() var/mob/user = usr - if(!user || !user.mind || !user.mind.changeling) + if(!user || !user.mind) return - if(!(user.mind.changeling.chosen_sting)) + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + if(!changeling) + return + if(!changeling.chosen_sting) set_sting(user) else unset_sting(user) @@ -15,41 +18,48 @@ /obj/effect/proc_holder/changeling/sting/proc/set_sting(mob/user) to_chat(user, "We prepare our sting, use alt+click or middle mouse button on target to sting them.") - user.mind.changeling.chosen_sting = src + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + changeling.chosen_sting = src + user.hud_used.lingstingdisplay.icon_state = sting_icon user.hud_used.lingstingdisplay.invisibility = 0 /obj/effect/proc_holder/changeling/sting/proc/unset_sting(mob/user) to_chat(user, "We retract our sting, we can't sting anyone for now.") - user.mind.changeling.chosen_sting = null + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + changeling.chosen_sting = null + user.hud_used.lingstingdisplay.icon_state = null user.hud_used.lingstingdisplay.invisibility = INVISIBILITY_ABSTRACT /mob/living/carbon/proc/unset_sting() - if(mind && mind.changeling && mind.changeling.chosen_sting) - src.mind.changeling.chosen_sting.unset_sting(src) + if(mind) + var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling) + if(changeling && changeling.chosen_sting) + changeling.chosen_sting.unset_sting(src) /obj/effect/proc_holder/changeling/sting/can_sting(mob/user, mob/target) if(!..()) return - if(!user.mind.changeling.chosen_sting) + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + if(!changeling.chosen_sting) to_chat(user, "We haven't prepared our sting yet!") if(!iscarbon(target)) return if(!isturf(user.loc)) return - if(!AStar(user, target.loc, /turf/proc/Distance, user.mind.changeling.sting_range, simulated_only = 0)) + if(!AStar(user, target.loc, /turf/proc/Distance, changeling.sting_range, simulated_only = 0)) return - if(target.mind && target.mind.changeling) + if(target.mind && target.mind.has_antag_datum(/datum/antagonist/changeling)) sting_feedback(user, target) - user.mind.changeling.chem_charges -= chemical_cost + changeling.chem_charges -= chemical_cost //?? return 1 /obj/effect/proc_holder/changeling/sting/sting_feedback(mob/user, mob/target) if(!target) return to_chat(user, "We stealthily sting [target.name].") - if(target.mind && target.mind.changeling) + if(target.mind && target.mind.has_antag_datum(/datum/antagonist/changeling)) to_chat(target, "You feel a tiny prick.") return 1 @@ -65,7 +75,7 @@ /obj/effect/proc_holder/changeling/sting/transformation/Click() var/mob/user = usr - var/datum/changeling/changeling = user.mind.changeling + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) if(changeling.chosen_sting) unset_sting(user) return @@ -163,12 +173,14 @@ /obj/effect/proc_holder/changeling/sting/extract_dna/can_sting(mob/user, mob/target) if(..()) - return user.mind.changeling.can_absorb_dna(user, target) + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + return changeling.can_absorb_dna(target) /obj/effect/proc_holder/changeling/sting/extract_dna/sting_action(mob/user, mob/living/carbon/human/target) add_logs(user, target, "stung", "extraction sting") - if(!(user.mind.changeling.has_dna(target.dna))) - user.mind.changeling.add_new_profile(target, user) + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + if(!(changeling.has_dna(target.dna))) + changeling.add_new_profile(target) return TRUE /obj/effect/proc_holder/changeling/sting/mute diff --git a/code/game/gamemodes/changeling/powers/transform.dm b/code/game/gamemodes/changeling/powers/transform.dm index 6b627870a4..a977bab3e0 100644 --- a/code/game/gamemodes/changeling/powers/transform.dm +++ b/code/game/gamemodes/changeling/powers/transform.dm @@ -1,126 +1,129 @@ -/obj/effect/proc_holder/changeling/transform - name = "Transform" - desc = "We take on the appearance and voice of one we have absorbed." - chemical_cost = 5 - dna_cost = 0 - req_dna = 1 - req_human = 1 - -/obj/item/clothing/glasses/changeling - name = "flesh" +/obj/effect/proc_holder/changeling/transform + name = "Transform" + desc = "We take on the appearance and voice of one we have absorbed." + chemical_cost = 5 + dna_cost = 0 + req_dna = 1 + req_human = 1 + +/obj/item/clothing/glasses/changeling + name = "flesh" flags_1 = NODROP_1 - -/obj/item/clothing/glasses/changeling/attack_hand(mob/user) - if(loc == user && user.mind && user.mind.changeling) - to_chat(user, "You reabsorb [src] into your body.") - qdel(src) - return - ..() - -/obj/item/clothing/under/changeling - name = "flesh" + +/obj/item/clothing/glasses/changeling/attack_hand(mob/user) + if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) + to_chat(user, "You reabsorb [src] into your body.") + qdel(src) + return + ..() + +/obj/item/clothing/under/changeling + name = "flesh" flags_1 = NODROP_1 - -/obj/item/clothing/under/changeling/attack_hand(mob/user) - if(loc == user && user.mind && user.mind.changeling) - to_chat(user, "You reabsorb [src] into your body.") - qdel(src) - return - ..() - -/obj/item/clothing/suit/changeling - name = "flesh" + +/obj/item/clothing/under/changeling/attack_hand(mob/user) + if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) + to_chat(user, "You reabsorb [src] into your body.") + qdel(src) + return + ..() + +/obj/item/clothing/suit/changeling + name = "flesh" flags_1 = NODROP_1 - allowed = list(/obj/item/changeling) - -/obj/item/clothing/suit/changeling/attack_hand(mob/user) - if(loc == user && user.mind && user.mind.changeling) - to_chat(user, "You reabsorb [src] into your body.") - qdel(src) - return - ..() - -/obj/item/clothing/head/changeling - name = "flesh" + allowed = list(/obj/item/changeling) + +/obj/item/clothing/suit/changeling/attack_hand(mob/user) + if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) + to_chat(user, "You reabsorb [src] into your body.") + qdel(src) + return + ..() + +/obj/item/clothing/head/changeling + name = "flesh" flags_1 = NODROP_1 - -/obj/item/clothing/head/changeling/attack_hand(mob/user) - if(loc == user && user.mind && user.mind.changeling) - to_chat(user, "You reabsorb [src] into your body.") - qdel(src) - return - ..() - -/obj/item/clothing/shoes/changeling - name = "flesh" + +/obj/item/clothing/head/changeling/attack_hand(mob/user) + if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) + to_chat(user, "You reabsorb [src] into your body.") + qdel(src) + return + ..() + +/obj/item/clothing/shoes/changeling + name = "flesh" flags_1 = NODROP_1 - -/obj/item/clothing/shoes/changeling/attack_hand(mob/user) - if(loc == user && user.mind && user.mind.changeling) - to_chat(user, "You reabsorb [src] into your body.") - qdel(src) - return - ..() - -/obj/item/clothing/gloves/changeling - name = "flesh" + +/obj/item/clothing/shoes/changeling/attack_hand(mob/user) + if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) + to_chat(user, "You reabsorb [src] into your body.") + qdel(src) + return + ..() + +/obj/item/clothing/gloves/changeling + name = "flesh" flags_1 = NODROP_1 - -/obj/item/clothing/gloves/changeling/attack_hand(mob/user) - if(loc == user && user.mind && user.mind.changeling) - to_chat(user, "You reabsorb [src] into your body.") - qdel(src) - return - ..() - -/obj/item/clothing/mask/changeling - name = "flesh" + +/obj/item/clothing/gloves/changeling/attack_hand(mob/user) + if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) + to_chat(user, "You reabsorb [src] into your body.") + qdel(src) + return + ..() + +/obj/item/clothing/mask/changeling + name = "flesh" flags_1 = NODROP_1 - -/obj/item/clothing/mask/changeling/attack_hand(mob/user) - if(loc == user && user.mind && user.mind.changeling) - to_chat(user, "You reabsorb [src] into your body.") - qdel(src) - return - ..() - -/obj/item/changeling - name = "flesh" + +/obj/item/clothing/mask/changeling/attack_hand(mob/user) + if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) + to_chat(user, "You reabsorb [src] into your body.") + qdel(src) + return + ..() + +/obj/item/changeling + name = "flesh" flags_1 = NODROP_1 - slot_flags = ALL - allowed = list(/obj/item/changeling) - -/obj/item/changeling/attack_hand(mob/user) - if(loc == user && user.mind && user.mind.changeling) - to_chat(user, "You reabsorb [src] into your body.") - qdel(src) - return - ..() - -//Change our DNA to that of somebody we've absorbed. -/obj/effect/proc_holder/changeling/transform/sting_action(mob/living/carbon/human/user) - var/datum/changeling/changeling = user.mind.changeling - var/datum/changelingprofile/chosen_prof = changeling.select_dna("Select the target DNA: ", "Target DNA", user) - - if(!chosen_prof) - return - - changeling_transform(user, chosen_prof) - return TRUE - -/datum/changeling/proc/select_dna(var/prompt, var/title, var/mob/living/carbon/user) - var/list/names = list("Drop Flesh Disguise") - for(var/datum/changelingprofile/prof in stored_profiles) - names += "[prof.name]" - - var/chosen_name = input(prompt, title, null) as null|anything in names - if(!chosen_name) - return - - if(chosen_name == "Drop Flesh Disguise") - for(var/slot in GLOB.slots) - if(istype(user.vars[slot], GLOB.slot2type[slot])) - qdel(user.vars[slot]) - - var/datum/changelingprofile/prof = get_dna(chosen_name) - return prof + slot_flags = ALL + allowed = list(/obj/item/changeling) + +/obj/item/changeling/attack_hand(mob/user) + if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) + to_chat(user, "You reabsorb [src] into your body.") + qdel(src) + return + ..() + +//Change our DNA to that of somebody we've absorbed. +/obj/effect/proc_holder/changeling/transform/sting_action(mob/living/carbon/human/user) + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + var/datum/changelingprofile/chosen_prof = changeling.select_dna("Select the target DNA: ", "Target DNA") + + if(!chosen_prof) + return + + changeling_transform(user, chosen_prof) + return TRUE + +/datum/antagonist/changeling/proc/select_dna(var/prompt, var/title) + var/mob/living/carbon/user = owner.current + if(!istype(user)) + return + var/list/names = list("Drop Flesh Disguise") + for(var/datum/changelingprofile/prof in stored_profiles) + names += "[prof.name]" + + var/chosen_name = input(prompt, title, null) as null|anything in names + if(!chosen_name) + return + + if(chosen_name == "Drop Flesh Disguise") + for(var/slot in GLOB.slots) + if(istype(user.vars[slot], GLOB.slot2type[slot])) + qdel(user.vars[slot]) + + var/datum/changelingprofile/prof = get_dna(chosen_name) + return prof diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index 8da88e18d7..6287e707f2 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -10,6 +10,7 @@ reroll_friendly = 1 var/list/possible_changelings = list() + var/list/changelings = list() var/const/changeling_amount = 1 //hard limit on changelings if scaling is turned off /datum/game_mode/traitor/changeling/announce() @@ -57,25 +58,22 @@ /datum/game_mode/traitor/changeling/post_setup() for(var/datum/mind/changeling in changelings) - changeling.current.make_changeling() - forge_changeling_objectives(changeling) - greet_changeling(changeling) - SSticker.mode.update_changeling_icons_added(changeling) - ..() - return + changeling.add_antag_datum(/datum/antagonist/changeling) + return ..() /datum/game_mode/traitor/changeling/make_antag_chance(mob/living/carbon/human/character) //Assigns changeling to latejoiners var/csc = CONFIG_GET(number/changeling_scaling_coeff) var/changelingcap = min( round(GLOB.joined_player_list.len / (csc * 4)) + 2, round(GLOB.joined_player_list.len / (csc * 2))) - if(SSticker.mode.changelings.len >= changelingcap) //Caps number of latejoin antagonists + if(changelings.len >= changelingcap) //Caps number of latejoin antagonists ..() return - if(SSticker.mode.changelings.len <= (changelingcap - 2) || prob(100 / (csc * 4))) + if(changelings.len <= (changelingcap - 2) || prob(100 / (csc * 4))) if(ROLE_CHANGELING in character.client.prefs.be_special) if(!jobban_isbanned(character, ROLE_CHANGELING) && !jobban_isbanned(character, "Syndicate")) if(age_check(character.client)) if(!(character.job in restricted_jobs)) character.mind.make_Changling() + changelings += character.mind ..() /datum/game_mode/traitor/changeling/generate_report() diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index d9d47bd771..63900d0f89 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -273,6 +273,7 @@ Credit where due: if(plasmaman && !visualsOnly) //If we need to breathe from the plasma tank, we should probably start doing that H.internal = H.get_item_for_held_index(2) H.update_internals_hud_icon(1) + H.sec_hud_set_ID() /obj/item/paper/servant_primer name = "The Ark And You: A Primer On Servitude" diff --git a/code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm b/code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm index 8c6e1d1a35..e41acb421a 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm @@ -38,8 +38,11 @@ beckon(AM) /obj/effect/clockwork/city_of_cogs_rift/proc/beckon(atom/movable/AM) + var/turf/T = get_turf(pick(GLOB.city_of_cogs_spawns)) + if(is_servant_of_ratvar(AM)) + T = GLOB.ark_of_the_clockwork_justiciar ? get_step(GLOB.ark_of_the_clockwork_justiciar, SOUTH) : get_turf(pick(GLOB.servant_spawns)) AM.visible_message("[AM] passes through [src]!", ignored_mob = AM) - AM.forceMove(pick(!is_servant_of_ratvar(AM) ? GLOB.city_of_cogs_spawns : GLOB.servant_spawns)) + AM.forceMove(T) AM.visible_message("[AM] materializes from the air!", \ "You pass through [src] and appear [is_servant_of_ratvar(AM) ? "back at the City of Cogs" : "somewhere unfamiliar. Looks like it was a one-way trip.."].") do_sparks(5, TRUE, src) diff --git a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm index 731a8e1d7a..cbfe5d043c 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm @@ -162,7 +162,7 @@ var/locname = initial(A.name) possible_targets[avoid_assoc_duplicate_keys("[locname] [O.name]", teleportnames)] = O - for(var/mob/living/L in GLOB.living_mob_list) + for(var/mob/living/L in GLOB.alive_mob_list) if(!L.stat && is_servant_of_ratvar(L) && !L.Adjacent(invoker) && (L.z <= ZLEVEL_SPACEMAX)) //People right next to the invoker can't be portaled to, for obvious reasons possible_targets[avoid_assoc_duplicate_keys("[L.name] ([L.real_name])", teleportnames)] = L diff --git a/code/game/gamemodes/clock_cult/clock_helpers/ratvarian_language.dm b/code/game/gamemodes/clock_cult/clock_helpers/ratvarian_language.dm index a9727017d3..2d49787348 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/ratvarian_language.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/ratvarian_language.dm @@ -104,7 +104,7 @@ List of nuances: if(isliving(AM)) var/mob/living/L = AM if(!whisper) - L.say(message, "clock", spans, language=/datum/language/common) + L.say(message, "clock", spans, language=/datum/language/common, ignore_spam = TRUE) else L.whisper(message, "clock", spans, language=/datum/language/common) else diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm index 2dd65ac9db..70aeaa6520 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm @@ -1,8 +1,7 @@ /obj/item/clockwork/slab //Clockwork slab: The most important tool in Ratvar's arsenal. Allows scripture recital, tutorials, and generates components. name = "clockwork slab" desc = "A strange metal tablet. A clock in the center turns around and around." - clockwork_desc = "A link between you and the Celestial Derelict. It contains information, recites scripture, and is your most vital tool as a Servant.\n\ - Hitting a slab, a Servant with a slab, or a cache will transfer this slab's components into the target, the target's slab, or the global cache, respectively." + clockwork_desc = "A link between you and the Celestial Derelict. It contains information, recites scripture, and is your most vital tool as a Servant." icon_state = "dread_ipad" lefthand_file = 'icons/mob/inhands/antag/clockwork_lefthand.dmi' righthand_file = 'icons/mob/inhands/antag/clockwork_righthand.dmi' @@ -231,7 +230,7 @@ this will cause you to whisper your message aloud, so doing so in a public place is very suspicious and you should try to restrict it to private use.
" dat += "If you aren't willing or don't have the time to read through every section, you can still help your teammates! Ask if they've set up a base. If they have, head there \ and ask however you can help; chances are there's always something. If not, it's your job as a Servant to get one up and running! Try to find a secluded, low-traffic area, \ - like the auxilary base or somewhere deep in maintenance. You'll want to go into the Drivers section of the slab and look for Tinkerer's Cache. Find a nice spot and \ + like the auxiliary base or somewhere deep in maintenance. You'll want to go into the Drivers section of the slab and look for Tinkerer's Cache. Find a nice spot and \ create one. This serves as a storage for components, the cult's primary resource. (Your slab's probably produced a few by now.) By attacking that cache with this \ slab, you'll offload all your components into it, and all Servants will be able to use those components from any distance - all Tinkerer's Caches are linked!
" dat += "Once you have a base up and running, contact your fellows and let them know. You should come back here often to drop off the slab's components, and your fellows \ @@ -250,7 +249,7 @@ teamwork is an instrumental component of your success.
" //get it? component? ha! dat += "As a Servant of Ratvar, the tools you are given focus around building and maintaining bases and outposts. A great deal of your power comes from stationary \ structures, and without constructing a base somewhere, it's essentially impossible to succeed. Finding a good spot to build a base can be difficult, and it's recommended \ - that you choose an area in low-traffic part of the station (such as the auxilary base). Make sure to disconnect any cameras in the area beforehand.
" + that you choose an area in low-traffic part of the station (such as the auxiliary base). Make sure to disconnect any cameras in the area beforehand.
" dat += "Because of how complex being a Servant is, it isn't possible to fit much information into this section. It's highly recommended that you read the Components \ and Scripture sections next. Not knowing how these two systems work will cripple both you and your fellows, and lead to a frustrating experience for everyone.
" dat += "-=-=-=-=-=-" diff --git a/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm b/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm index 1fabeeba3f..a1c3d211fb 100644 --- a/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm +++ b/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm @@ -17,6 +17,7 @@ attack_sound = 'sound/weapons/bladeslice.ogg' weather_immunities = list("lava") movement_type = FLYING + a_intent = INTENT_HARM loot = list(/obj/item/clockwork/component/geis_capacitor/fallen_armor) light_range = 2 light_power = 1.1 @@ -24,7 +25,6 @@ unique abilities, you're a fearsome fighter in one-on-one combat, and your shield protects from projectiles!
Obey the Servants and do as they \ tell you. Your primary goal is to defend the Ark from destruction; they are your allies in this, and should be protected from harm." empower_string = "The Anima Bulwark's power flows through you! Your weapon will strike harder, your armor is sturdier, and your shield is more durable." - var/deflect_chance = 40 //Chance to deflect any given projectile (non-damaging energy projectiles are always deflected) var/max_shield_health = 3 var/shield_health = 3 //Amount of projectiles that can be deflected within var/shield_health_regen = 0 //When world.time equals this, shield health will regenerate @@ -55,8 +55,6 @@ obj_damage = 100 max_shield_health = INFINITY else if(GLOB.ratvar_approaches) //Hefty health bonus and slight attack damage increase - health = 200 - maxHealth = 200 melee_damage_upper = 15 melee_damage_lower = 15 attacktext = "carves" diff --git a/code/game/gamemodes/clock_cult/clock_scripture.dm b/code/game/gamemodes/clock_cult/clock_scripture.dm index 049a49f5f4..8a019ed74b 100644 --- a/code/game/gamemodes/clock_cult/clock_scripture.dm +++ b/code/game/gamemodes/clock_cult/clock_scripture.dm @@ -53,6 +53,7 @@ Applications: 8 servants, 3 caches, and 100 CV if(slab.busy) to_chat(invoker, "[slab] refuses to work, displaying the message: \"[slab.busy]!\"") return FALSE + pre_recital() slab.busy = "Invocation ([name]) in progress" if(GLOB.ratvar_awakens) channel_time *= 0.5 //if ratvar has awoken, half channel time and no cost @@ -176,6 +177,9 @@ Applications: 8 servants, 3 caches, and 100 CV /datum/clockwork_scripture/proc/scripture_fail() //Called if the scripture fails to invoke. +/datum/clockwork_scripture/proc/pre_recital() //Called before the scripture is recited + + /datum/clockwork_scripture/proc/post_recital() //Called after the scripture is recited //Channeled scripture begins instantly but runs constantly diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm index d7aa2777ca..bcb9d1d1df 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm @@ -7,12 +7,12 @@ /datum/clockwork_scripture/create_object/construct/clockwork_marauder descname = "Well-Rounded Combat Construct" name = "Clockwork Marauder" - desc = "Creates a shell for a clockwork marauder, a balanced frontline construct." + desc = "Creates a shell for a clockwork marauder, a balanced frontline construct that can deflect projectiles with its shield." invocations = list("Arise, avatar of Arbiter!", "Defend the Ark with vengeful zeal.") channel_time = 50 power_cost = 1000 creator_message = "Your slab disgorges several chunks of replicant alloy that form into a suit of thrumming armor." - usage_tip = "The marauder's shield can effectively deflect energy-based projectiles." + usage_tip = "Reciting this scripture multiple times in a short period will cause it to take longer!" tier = SCRIPTURE_APPLICATION one_per_tile = TRUE primary_component = BELLIGERENT_EYE @@ -22,6 +22,9 @@ object_path = /obj/item/clockwork/construct_chassis/clockwork_marauder construct_type = /mob/living/simple_animal/hostile/clockwork/marauder combat_construct = TRUE + var/static/recent_marauders = 0 + var/static/time_since_last_marauder = 0 + var/static/scaled_recital_time = 0 /datum/clockwork_scripture/create_object/construct/clockwork_marauder/update_construct_limit() var/human_servants = 0 @@ -32,15 +35,30 @@ construct_limit = human_servants / 4 //1 per 4 human servants, and a maximum of 3 marauders construct_limit = Clamp(construct_limit, 1, 3) -/datum/clockwork_scripture/create_object/prolonging_prism/check_special_requirements() - if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) - to_chat(invoker, "\"It is too late to construct one of these, champion.\"") - return FALSE - var/turf/T = get_turf(invoker) - if(!T || !(T.z in GLOB.station_z_levels)) - to_chat(invoker, "\"You must be on the station to construct one of these, champion.\"") - return FALSE - return ..() +/datum/clockwork_scripture/create_object/construct/clockwork_marauder/pre_recital() + channel_time = initial(channel_time) + calculate_scaling() + if(scaled_recital_time) + to_chat(invoker, "The Hierophant Network is under strain from repeated summoning, making this scripture [scaled_recital_time / 10] seconds slower!") + channel_time += scaled_recital_time + return TRUE + +/datum/clockwork_scripture/create_object/construct/clockwork_marauder/scripture_effects() + . = ..() + time_since_last_marauder = world.time + recent_marauders++ + calculate_scaling() + +/datum/clockwork_scripture/create_object/construct/clockwork_marauder/proc/calculate_scaling() + var/WT = world.time + var/MT = time_since_last_marauder //Cast it for quicker reference + var/marauders_to_exclude = 0 + if(world.time >= time_since_last_marauder + MARAUDER_SCRIPTURE_SCALING_THRESHOLD) + marauders_to_exclude = round(WT - MT) / MARAUDER_SCRIPTURE_SCALING_THRESHOLD //If at least 20 seconds have passed, lose one marauder for each 20 seconds + //i.e. world.time = 10000, last marauder = 9000, so we lose 5 marauders from the recent count since 10k - 9k = 1k, 1k / 200 = 5 + time_since_last_marauder = world.time //So that it can't be spammed to make the marauder exclusion plummet; this emulates "ticking" + recent_marauders = max(0, recent_marauders - marauders_to_exclude) + scaled_recital_time = min(recent_marauders * MARAUDER_SCRIPTURE_SCALING_TIME, MARAUDER_SCRIPTURE_SCALING_MAX) //Mania Motor: Creates a malevolent transmitter that will broadcast the whispers of Sevtug into the minds of nearby nonservants, causing a variety of mental effects at a power cost. diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm index a282ac3067..93d203aba0 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm @@ -129,7 +129,11 @@ /datum/clockwork_scripture/abscond/scripture_effects() var/take_pulling = invoker.pulling && isliving(invoker.pulling) && get_clockwork_power(ABSCOND_ABDUCTION_COST) - var/turf/T = get_turf(pick(GLOB.servant_spawns)) + var/turf/T + if(GLOB.ark_of_the_clockwork_justiciar) + T = get_step(GLOB.ark_of_the_clockwork_justiciar, SOUTH) + else + T = get_turf(pick(GLOB.servant_spawns)) invoker.visible_message("[invoker] flickers and phases out of existence!", \ "You feel a dizzying sense of vertigo as you're yanked back to Reebe!") T.visible_message("[invoker] flickers and phases into existence!") diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm index 16a6f3ffd7..a172f4ca41 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm @@ -322,7 +322,7 @@ to_chat(invoker, "You must not be inside an object to use this scripture!") return FALSE var/other_servants = 0 - for(var/mob/living/L in GLOB.living_mob_list) + for(var/mob/living/L in GLOB.alive_mob_list) if(is_servant_of_ratvar(L) && !L.stat && L != invoker) other_servants++ for(var/obj/structure/destructible/clockwork/powered/clockwork_obelisk/O in GLOB.all_clockwork_objects) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm index 201ce11cf6..0f13ac66ac 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -134,11 +134,21 @@ var/damage = max((obj_integrity * 0.7) / severity, 100) //requires multiple bombs to take down take_damage(damage, BRUTE, "bomb", 0) +/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/get_arrival_time(var/deciseconds = TRUE) + if(seconds_until_activation) + . = seconds_until_activation + else if(grace_period) + . = grace_period + else if(GATEWAY_RATVAR_ARRIVAL - progress_in_seconds > 0) + . = round(max((GATEWAY_RATVAR_ARRIVAL - progress_in_seconds) / (GATEWAY_SUMMON_RATE), 0), 1) + if(deciseconds) + . *= 10 + /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/get_arrival_text(s_on_time) if(seconds_until_activation) - return "[seconds_until_activation][s_on_time ? "S" : ""]" + return "[get_arrival_time()][s_on_time ? "S" : ""]" if(grace_period) - return "[grace_period][s_on_time ? "S" : ""]" + return "[get_arrival_time()][s_on_time ? "S" : ""]" . = "IMMINENT" if(!obj_integrity) . = "DETONATING" @@ -151,12 +161,12 @@ icon_state = initial(icon_state) if(is_servant_of_ratvar(user) || isobserver(user)) if(!active) - to_chat(user, "Seconds until the Ark's activation: [get_arrival_text(TRUE)]") + to_chat(user, "Time until the Ark's activation: [DisplayTimeText(get_arrival_time())]") else if(grace_period) - to_chat(user, "Crew grace period time remaining: [get_arrival_text(TRUE)]") + to_chat(user, "Crew grace period time remaining: [DisplayTimeText(get_arrival_time())]") else - to_chat(user, "Seconds until Ratvar's arrival: [get_arrival_text(TRUE)]") + to_chat(user, "Time until Ratvar's arrival: [DisplayTimeText(get_arrival_time())]") switch(progress_in_seconds) if(-INFINITY to GATEWAY_REEBE_FOUND) to_chat(user, "The Ark is feeding power into the bluespace field.") @@ -266,15 +276,16 @@ CHECK_TICK /obj/structure/destructible/clockwork/massive/celestial_gateway/attack_ghost(mob/user) - if(!user.client || !user.client.holder) - return + if(!IsAdminGhost(user)) + return ..() if(GLOB.servants_active) to_chat(user, "The Ark is already counting down.") - return + return ..() if(alert(user, "Activate the Ark's countdown?", name, "Yes", "No") == "Yes") if(alert(user, "REALLY activate the Ark's countdown?", name, "Yes", "No") == "Yes") if(alert(user, "You're REALLY SURE? This cannot be undone.", name, "Yes - Activate the Ark", "No") == "Yes - Activate the Ark") message_admins("Admin [key_name_admin(user)] started the Ark's countdown!") + log_admin("Admin [key_name(user)] started the Ark's countdown on a non-clockcult mode!") to_chat(user, "The gamemode is now being treated as clockwork cult, and the Ark is counting down from 30 \ minutes. You will need to create servant players yourself.") final_countdown(35) diff --git a/code/game/gamemodes/clock_cult/clock_structures/heralds_beacon.dm b/code/game/gamemodes/clock_cult/clock_structures/heralds_beacon.dm index a1c75ed3da..9f18ff1669 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/heralds_beacon.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/heralds_beacon.dm @@ -100,7 +100,7 @@ continue C.update_values() to_chat(C, C.empower_string) - for(var/mob/living/carbon/human/H in GLOB.living_mob_list) + for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) if(is_servant_of_ratvar(H)) to_chat(H, "The beacon's power warps your body into a clockwork form! You are now immune to many hazards, and your body is more robust against damage!") H.set_species(/datum/species/golem/clockwork/no_scrap) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm index 4850b904c8..b069e55454 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm @@ -67,7 +67,7 @@ T.ratvar_act(TRUE) var/dir_to_step_in = pick(GLOB.cardinals) var/list/meals = list() - for(var/mob/living/L in GLOB.living_mob_list) //we want to know who's alive so we don't lose and retarget a single person + for(var/mob/living/L in GLOB.alive_mob_list) //we want to know who's alive so we don't lose and retarget a single person if(L.z == z && !is_servant_of_ratvar(L) && L.mind) meals += L if(GLOB.cult_narsie && GLOB.cult_narsie.z == z) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 917b5a81a4..1391f1dbb5 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -1,3 +1,5 @@ +#define CULT_SCALING_COEFFICIENT 9.3 //Roughly one new cultist at roundstart per this many players + /datum/game_mode var/list/datum/mind/cult = list() var/list/cult_objectives = list() @@ -64,7 +66,10 @@ restricted_jobs += "Assistant" //cult scaling goes here - recommended_enemies = 3 + round(num_players()/15) + recommended_enemies = 1 + round(num_players()/CULT_SCALING_COEFFICIENT) + var/remaining = (num_players() % CULT_SCALING_COEFFICIENT) * 10 //Basically the % of how close the population is toward adding another cultis + if(prob(remaining)) + recommended_enemies++ for(var/cultists_number = 1 to recommended_enemies) @@ -256,6 +261,10 @@ SSticker.news_report = CULT_FAILURE text += "
Objective #[obj_count]: [explanation]" + if(cult.len) + text += "
The cultists were:" + for(var/datum/mind/M in cult) + text += printplayer(M) to_chat(world, text) ..() return 1 @@ -303,3 +312,5 @@ SSticker.news_report = CULT_FAILURE text += "
Objective #[obj_count]: [explanation]" to_chat(world, text) + +#undef CULT_SCALING_COEFFICIENT diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm index b8cbed5051..530b6ebb20 100644 --- a/code/game/gamemodes/cult/cult_comms.dm +++ b/code/game/gamemodes/cult/cult_comms.dm @@ -40,7 +40,8 @@ else if(!ishuman(user)) title = "Construct" my_message = "[title] [findtextEx(user.name, user.real_name) ? user.name : "[user.real_name] (as [user.name])"]: [message]" - for(var/mob/M in GLOB.mob_list) + for(var/i in GLOB.player_list) + var/mob/M = i if(iscultist(M)) to_chat(M, my_message) else if(M in GLOB.dead_mob_list) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 1926aa8f58..da222fe521 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -324,7 +324,7 @@ icon_state = "cult_armor" item_state = "cult_armor" desc = "A heavily-armored exosuit worn by warriors of the Nar-Sien cult. It can withstand hard vacuum." - w_class = WEIGHT_CLASS_SMALL + w_class = WEIGHT_CLASS_BULKY allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/tank/internals/) armor = list(melee = 70, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30, fire = 40, acid = 75) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/cult diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index a38a361cf3..be1c2ccaff 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -137,7 +137,7 @@ structure_check() searches for nearby cultist structures required for the invoca for(var/M in invokers) var/mob/living/L = M if(invocation) - L.say(invocation, language = /datum/language/common) + L.say(invocation, language = /datum/language/common, ignore_spam = TRUE) if(invoke_damage) L.apply_damage(invoke_damage, BRUTE) to_chat(L, "[src] saps your strength!") diff --git a/code/game/gamemodes/cult/supply.dm b/code/game/gamemodes/cult/supply.dm index 47807fa93a..3720e496ea 100644 --- a/code/game/gamemodes/cult/supply.dm +++ b/code/game/gamemodes/cult/supply.dm @@ -22,7 +22,7 @@ dat += "
" for(var/s in possible_summons) var/datum/cult_supply/S = s - dat += "[initial(S.invocation)] - [initial(S.desc)]
" + dat += "[initial(S.invocation)] - [initial(S.desc)]
" var/datum/browser/popup = new(user, "talisman", "", 400, 400) popup.set_content(dat.Join("")) popup.open() diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 115f931975..71955e4881 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -225,8 +225,8 @@ /obj/item/paper/talisman/horror/afterattack(mob/living/target, mob/living/user) if(iscultist(user) && (get_dist(user, target) < 7)) - to_chat(user, "You disturb [target] with visions of madness!") if(iscarbon(target)) + to_chat(user, "You disturb [target] with visions of madness!") var/mob/living/carbon/H = target H.reagents.add_reagent("mindbreaker", 12) if(is_servant_of_ratvar(target)) @@ -234,8 +234,7 @@ target.emote("scream") target.confused = max(0, target.confused + 3) target.flash_act() - qdel(src) - + qdel(src) //Talisman of Fabrication: Creates a construct shell out of 25 metal sheets, or converts plasteel into runed metal up to 25 times /obj/item/paper/talisman/construction diff --git a/code/game/gamemodes/devil/true_devil/_true_devil.dm b/code/game/gamemodes/devil/true_devil/_true_devil.dm index 9b24d096c4..10f0b3393f 100644 --- a/code/game/gamemodes/devil/true_devil/_true_devil.dm +++ b/code/game/gamemodes/devil/true_devil/_true_devil.dm @@ -17,6 +17,7 @@ var/ascended = FALSE sight = (SEE_TURFS | SEE_OBJS) status_flags = CANPUSH + spacewalk = TRUE mob_size = MOB_SIZE_LARGE var/mob/living/oldform var/list/devil_overlays[DEVIL_TOTAL_LAYERS] @@ -135,9 +136,6 @@ "[attack_message]", null, COMBAT_MESSAGE_RANGE) return TRUE -/mob/living/carbon/true_devil/Process_Spacemove(movement_dir = 0) - return 1 - /mob/living/carbon/true_devil/singularity_act() if(ascended) return 0 diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 26c3810b42..0d49a25041 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -160,7 +160,7 @@ if(CONFIG_GET(flag/protect_assistant_from_antagonist)) replacementmode.restricted_jobs += "Assistant" - message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit stop the creation of antags or end the round now.") + message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit stop the creation of antags or end the round now.") . = 1 sleep(rand(600,1800)) @@ -217,7 +217,7 @@ if(living_antag_player && living_antag_player.mind && isliving(living_antag_player) && living_antag_player.stat != DEAD && !isnewplayer(living_antag_player) &&!isbrain(living_antag_player)) return 0 //A resource saver: once we find someone who has to die for all antags to be dead, we can just keep checking them, cycling over everyone only when we lose our mark. - for(var/mob/Player in GLOB.living_mob_list) + for(var/mob/Player in GLOB.alive_mob_list) if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player) && Player.client) if(Player.mind.special_role || LAZYLEN(Player.mind.antag_datums)) //Someone's still antaging! living_antag_player = Player @@ -407,16 +407,11 @@ ////////////////////////// /proc/display_roundstart_logout_report() var/msg = "Roundstart logout report\n\n" - for(var/mob/living/L in GLOB.mob_list) + for(var/i in GLOB.mob_living_list) + var/mob/living/L = i - if(L.ckey) - var/found = 0 - for(var/client/C in GLOB.clients) - if(C.ckey == L.ckey) - found = 1 - break - if(!found) - msg += "[L.name] ([L.ckey]), the [L.job] (Disconnected)\n" + if(L.ckey && !GLOB.directory[L.ckey]) + msg += "[L.name] ([L.ckey]), the [L.job] (Disconnected)\n" if(L.ckey && L.client) @@ -452,10 +447,8 @@ continue //Ghosted while alive - - for(var/mob/M in GLOB.mob_list) - if(M.client && M.client.holder) - to_chat(M, msg) + for (var/C in GLOB.admins) + to_chat(C, msg) /datum/game_mode/proc/printplayer(datum/mind/ply, fleecheck) var/text = "
[ply.key] was [ply.name] the [ply.assigned_role] and" @@ -464,8 +457,10 @@ text += " died" else text += " survived" - if(fleecheck && (!(ply.current.z in GLOB.station_z_levels))) - text += " while fleeing the station" + if(fleecheck) + var/turf/T = get_turf(ply.current) + if(!T || !(T.z in GLOB.station_z_levels)) + text += " while fleeing the station" if(ply.current.real_name != ply.name) text += " as [ply.current.real_name]" else @@ -533,4 +528,4 @@ //By default nuke just ends the round /datum/game_mode/proc/OnNukeExplosion(off_station) if(off_station < 2) - station_was_nuked = TRUE //Will end the round on next check. \ No newline at end of file + station_was_nuked = TRUE //Will end the round on next check. diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 92dca5d3c9..9be9e59cab 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -133,9 +133,9 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( dat += "Install Module:
" dat += "The number afterwards is the amount of processing time it consumes.
" for(var/datum/AI_Module/large/module in possible_modules) - dat += "[module.module_name]\[?\] ([module.cost])
" + dat += "[module.module_name]\[?\] ([module.cost])
" for(var/datum/AI_Module/small/module in possible_modules) - dat += "[module.module_name]\[?\] ([module.cost])
" + dat += "[module.module_name]\[?\] ([module.cost])
" dat += "
" if(temp) dat += "[temp]" @@ -375,7 +375,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /obj/machinery/doomsday_device/proc/detonate(z_level = ZLEVEL_STATION_PRIMARY) sound_to_playing_players('sound/machines/alarm.ogg') sleep(100) - for(var/mob/living/L in GLOB.mob_list) + for(var/i in GLOB.mob_living_list) + var/mob/living/L = i var/turf/T = get_turf(L) if(!T || !(T.z in GLOB.station_z_levels)) continue @@ -679,7 +680,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( C.images -= I /mob/living/silicon/ai/proc/can_place_transformer(datum/action/innate/ai/place_transformer/action) - if(!eyeobj || !isturf(loc) || !canUseTopic() || !action) + if(!eyeobj || !isturf(loc) || incapacitated() || !action) return var/turf/middle = get_turf(eyeobj) var/list/turfs = list(middle, locate(middle.x - 1, middle.y, middle.z), locate(middle.x + 1, middle.y, middle.z)) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 8fead855b2..f136abdfcb 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -477,7 +477,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(ishuman(L)) var/mob/living/carbon/human/H = L species = "[H.dna.species.name]" - if(L.mind && L.mind.changeling) + if(L.mind && L.mind.has_antag_datum(/datum/antagonist/changeling)) species = "Changeling lifeform" var/obj/item/organ/heart/gland/temp = locate() in H.internal_organs if(temp) diff --git a/code/game/gamemodes/miniantags/abduction/machinery/console.dm b/code/game/gamemodes/miniantags/abduction/machinery/console.dm index d44ff57c96..f243f161c3 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/console.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/console.dm @@ -43,20 +43,20 @@ dat += "Collected Samples : [points]
" dat += "Gear Credits: [credits]
" dat += "Transfer data in exchange for supplies:
" - dat += "Advanced Baton
" - dat += "Agent Helmet
" - dat += "Agent Vest
" - dat += "Radio Silencer
" - dat += "Science Tool
" + dat += "Advanced Baton
" + dat += "Agent Helmet
" + dat += "Agent Vest
" + dat += "Radio Silencer
" + dat += "Science Tool
" else dat += "NO EXPERIMENT MACHINE DETECTED
" if(pad) dat += "Emergency Teleporter System." dat += "Consider using primary observation console first." - dat += "Activate Teleporter
" + dat += "Activate Teleporter
" if(gizmo && gizmo.marked) - dat += "Retrieve Mark
" + dat += "Retrieve Mark
" else dat += "Retrieve Mark
" else @@ -66,15 +66,15 @@ dat += "
Agent Vest Mode
" var/mode = vest.mode if(mode == VEST_STEALTH) - dat += "Combat" + dat += "Combat" dat += "Stealth" else dat += "Combat" - dat += "Stealth" + dat += "Stealth" dat+="
" - dat += "Select Agent Vest Disguise
" - dat += "[vest.flags_1 & NODROP_1 ? "Unlock" : "Lock"] Vest
" + dat += "Select Agent Vest Disguise
" + dat += "[vest.flags_1 & NODROP_1 ? "Unlock" : "Lock"] Vest
" else dat += "NO AGENT VEST DETECTED" var/datum/browser/popup = new(user, "computer", "Abductor Console", 400, 500) diff --git a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm index 2b012e5f81..ae095c12e6 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm @@ -48,7 +48,7 @@ item_count++ var/g_color = gland_colors[i] var/amount = amounts[i] - dat += "[amount]" + dat += "[amount]" if(item_count == 4) // Four boxes per line dat +="" item_count = 0 diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index 73a696fb3a..da445b94ce 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -104,9 +104,9 @@ dat += "
| "
dat += " | "
- dat += "Probe " - dat += "Dissect " - dat += "Analyze " + dat += "Probe " + dat += "Dissect " + dat += "Analyze " dat += " |
" dat += "[flash]" dat += "
" - dat += "Scan" - dat += "Close" : "open=1'>Open"]" + dat += "Scan" + dat += "Close" : "open=1'>Open"]" var/datum/browser/popup = new(user, "experiment", "Probing Console", 300, 300) popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) popup.set_content(dat) diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index c125f7648d..e4e4205db8 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -654,7 +654,8 @@ /mob/living/simple_animal/hostile/swarmer/proc/swarmer_chat(msg) var/rendered = "Swarm communication - [src] [say_quote(msg, get_spans())]" - for(var/mob/M in GLOB.mob_list) + for(var/i in GLOB.mob_list) + var/mob/M = i if(isswarmer(M)) to_chat(M, rendered) if(isobserver(M)) diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm index f422dcfcc5..ff426ab625 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm @@ -21,7 +21,8 @@ print_command_report(swarmer_report, announce=TRUE) /datum/round_event/spawn_swarmer/proc/find_swarmer() - for(var/mob/living/M in GLOB.mob_list) - if(istype(M, /mob/living/simple_animal/hostile/swarmer) && M.client) //If there is a swarmer with an active client, we've found our swarmer + for(var/i in GLOB.mob_living_list) + var/mob/living/L = i + if(istype(L, /mob/living/simple_animal/hostile/swarmer) && L.client) //If there is a swarmer with an active client, we've found our swarmer return 1 return 0 diff --git a/code/game/gamemodes/miniantags/monkey/monkey.dm b/code/game/gamemodes/miniantags/monkey/monkey.dm index e53313bbd3..379031dce9 100644 --- a/code/game/gamemodes/miniantags/monkey/monkey.dm +++ b/code/game/gamemodes/miniantags/monkey/monkey.dm @@ -76,7 +76,7 @@ return 0 var/datum/disease/D = new /datum/disease/transformation/jungle_fever() //ugly but unfortunately needed - for(var/mob/living/carbon/human/H in GLOB.living_mob_list) + for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) if(H.mind && H.stat != DEAD) if(H.HasDisease(D)) return 0 @@ -87,7 +87,7 @@ if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) return 0 var/datum/disease/D = new /datum/disease/transformation/jungle_fever() - for(var/mob/living/carbon/monkey/M in GLOB.living_mob_list) + for(var/mob/living/carbon/monkey/M in GLOB.alive_mob_list) if (M.HasDisease(D)) if(M.onCentCom() || M.onSyndieBase()) escaped_monkeys++ diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index e72babc5b0..04a5f4d2be 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -21,6 +21,7 @@ maxHealth = INFINITY layer = GHOST_LAYER healable = FALSE + spacewalk = TRUE sight = SEE_SELF see_in_dark = 8 @@ -153,8 +154,6 @@ //Immunities -/mob/living/simple_animal/revenant/Process_Spacemove(movement_dir = 0) - return 1 /mob/living/simple_animal/revenant/ex_act(severity, target) return 1 //Immune to the effects of explosions. diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index ecfb6289ec..630a5929d7 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -91,9 +91,11 @@ var/obj/item/device/nuclear_challenge/challenge = new /obj/item/device/nuclear_challenge synd_mind.current.put_in_hands(challenge, TRUE) - var/list/foundIDs = synd_mind.current.search_contents_for(/obj/item/card/id) + var/static/id_cache = typecacheof(/obj/item/card/id) + var/list/foundIDs = typecache_filter_list(synd_mind.current.GetAllContents(), id_cache) if(foundIDs.len) - for(var/obj/item/card/id/ID in foundIDs) + for(var/i in 1 to foundIDs.len) + var/obj/item/card/id/ID = foundIDs[i] ID.name = "lead agent card" ID.access += ACCESS_SYNDICATE_LEADER else diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 0251d17398..a36503e7c4 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -77,6 +77,7 @@ icon = 'icons/obj/machines/nuke_terminal.dmi' icon_state = "nuclearbomb_base" anchored = TRUE //stops it being moved + use_tag = TRUE /obj/machinery/nuclearbomb/syndicate //ui_style = "syndicate" // actually the nuke op bomb is a stole nt bomb @@ -121,15 +122,7 @@ to_chat(user, "You remove the screws from [src]'s front panel.") update_icon() return - if(NUKESTATE_UNSCREWED) - if(istype(I, /obj/item/crowbar)) - to_chat(user, "You start removing [src]'s front panel...") - playsound(loc, I.usesound, 100, 1) - if(do_after(user,30*I.toolspeed,target=src)) - to_chat(user, "You remove [src]'s front panel.") - deconstruction_state = NUKESTATE_PANEL_REMOVED - update_icon() - return + if(NUKESTATE_PANEL_REMOVED) if(istype(I, /obj/item/weldingtool)) var/obj/item/weldingtool/welder = I @@ -141,16 +134,6 @@ deconstruction_state = NUKESTATE_WELDED update_icon() return - if(NUKESTATE_WELDED) - if(istype(I, /obj/item/crowbar)) - to_chat(user, "You start prying off [src]'s inner plate...") - playsound(loc, I.usesound, 100, 1) - if(do_after(user,50*I.toolspeed,target=src)) - to_chat(user, "You pry off [src]'s inner plate. You can see the core's green glow!") - deconstruction_state = NUKESTATE_CORE_EXPOSED - update_icon() - START_PROCESSING(SSobj, core) - return if(NUKESTATE_CORE_EXPOSED) if(istype(I, /obj/item/nuke_core_container)) var/obj/item/nuke_core_container/core_box = I @@ -181,6 +164,27 @@ return . = ..() +/obj/machinery/nuclearbomb/crowbar_act(mob/user, obj/item/tool) + . = FALSE + switch(deconstruction_state) + if(NUKESTATE_UNSCREWED) + to_chat(user, "You start removing [src]'s front panel...") + playsound(loc, tool.usesound, 100, 1) + if(do_after(user, 30 * tool.toolspeed, target = src)) + to_chat(user, "You remove [src]'s front panel.") + deconstruction_state = NUKESTATE_PANEL_REMOVED + update_icon() + return TRUE + if(NUKESTATE_WELDED) + to_chat(user, "You start prying off [src]'s inner plate...") + playsound(loc, tool.usesound, 100, 1) + if(do_after(user, 50 * tool.toolspeed, target = src)) + to_chat(user, "You pry off [src]'s inner plate. You can see the core's green glow!") + deconstruction_state = NUKESTATE_CORE_EXPOSED + update_icon() + START_PROCESSING(SSobj, core) + return TRUE + /obj/machinery/nuclearbomb/proc/get_nuke_state() if(exploding) return NUKE_ON_EXPLODING diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index cd3b2ba2b2..d1c8d0193d 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -586,7 +586,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) n_p ++ else if (SSticker.IsRoundInProgress()) for(var/mob/living/carbon/human/P in GLOB.player_list) - if(P.client && !(P.mind in SSticker.mode.changelings) && !(P.mind in owners)) + if(P.client && !(P.mind.has_antag_datum(/datum/antagonist/changeling)) && !(P.mind in owners)) n_p ++ target_amount = min(target_amount, n_p) @@ -597,9 +597,12 @@ GLOBAL_LIST_EMPTY(possible_items_special) var/list/datum/mind/owners = get_owners() var/absorbedcount = 0 for(var/datum/mind/M in owners) - if(!owner || !owner.changeling || !owner.changeling.stored_profiles) + if(!M) continue - absorbedcount += M.changeling.absorbedcount + var/datum/antagonist/changeling/changeling = M.has_antag_datum(/datum/antagonist/changeling) + if(!changeling || !changeling.stored_profiles) + continue + absorbedcount += changeling.absorbedcount return absorbedcount >= target_amount @@ -696,10 +699,11 @@ GLOBAL_LIST_EMPTY(possible_items_special) if("Chief Medical Officer") department_string = "medical" - var/ling_count = SSticker.mode.changelings + var/list/lings = get_antagonists(/datum/antagonist/changeling,TRUE) + var/ling_count = lings.len for(var/datum/mind/M in SSticker.minds) - if(M in SSticker.mode.changelings) + if(M in lings) continue if(department_head in get_department_heads(M.assigned_role)) if(ling_count) @@ -723,13 +727,13 @@ GLOBAL_LIST_EMPTY(possible_items_special) //Needed heads is between min_lings and the maximum possible amount of command roles //So at the time of writing, rand(3,6), it's also capped by the amount of lings there are //Because you can't fill 6 head roles with 3 lings - + var/list/lings = get_antagonists(/datum/antagonist/changeling,TRUE) var/needed_heads = rand(min_lings,GLOB.command_positions.len) - needed_heads = min(SSticker.mode.changelings.len,needed_heads) + needed_heads = min(lings.len,needed_heads) var/list/heads = SSjob.get_living_heads() for(var/datum/mind/head in heads) - if(head in SSticker.mode.changelings) //Looking at you HoP. + if(head in lings) //Looking at you HoP. continue if(needed_heads) department_minds += head @@ -789,7 +793,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) //Check each department member's mind to see if any of them made it to centcom alive, if they did it's an automatic fail for(var/datum/mind/M in department_minds) - if(M in SSticker.mode.changelings) //Lings aren't picked for this, but let's be safe + if(M.has_antag_datum(/datum/antagonist/changeling)) //Lings aren't picked for this, but let's be safe continue if(M.current) @@ -800,7 +804,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) //Check each staff member has been replaced, by cross referencing changeling minds, changeling current dna, the staff minds and their original DNA names var/success = 0 changelings: - for(var/datum/mind/changeling in SSticker.mode.changelings) + for(var/datum/mind/changeling in get_antagonists(/datum/antagonist/changeling,TRUE)) if(success >= department_minds.len) //We did it, stop here! return 1 if(ishuman(changeling.current)) diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index c2ce2a2d78..4fa9532b42 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -194,7 +194,7 @@ if(headrevs.len) var/num_revs = 0 var/num_survivors = 0 - for(var/mob/living/carbon/survivor in GLOB.living_mob_list) + for(var/mob/living/carbon/survivor in GLOB.alive_mob_list) if(survivor.ckey) num_survivors++ if(survivor.mind) diff --git a/code/game/gamemodes/sandbox/airlock_maker.dm b/code/game/gamemodes/sandbox/airlock_maker.dm index aafbffa82e..863d92899b 100644 --- a/code/game/gamemodes/sandbox/airlock_maker.dm +++ b/code/game/gamemodes/sandbox/airlock_maker.dm @@ -1,139 +1,139 @@ -/* - This is for the sandbox for now, - maybe useful later for an actual thing? - -Sayu -*/ - -/obj/structure/door_assembly - var/datum/airlock_maker/maker = null - -/obj/structure/door_assembly/attack_hand() - ..() - if(maker) - maker.interact() - -/datum/airlock_maker - var/obj/structure/door_assembly/linked = null - - var/list/access_used = null - var/require_all = 1 - - var/paintjob = "none" - var/glassdoor = 0 - - var/doorname = "airlock" - -/datum/airlock_maker/New(var/atom/target_loc) - linked = new(target_loc) - linked.maker = src - linked.anchored = FALSE - access_used = list() - - interact() - -/datum/airlock_maker/proc/linkpretty(href,desc,active) - if(!desc) - var/static/list/defaults = list("No","Yes") - desc = defaults[active+1] - if(active) - return "[desc]" - return "[desc]" - -/datum/airlock_maker/proc/interact() - var/list/leftcolumn = list() - var/list/rightcolumn = list() - leftcolumn += "Required Access" - for(var/access in get_all_accesses()) - leftcolumn += linkpretty("access=[access]",get_access_desc(access),access in access_used) - leftcolumn += "Require all listed accesses: [linkpretty("reqall",null,require_all)]" - - rightcolumn += "Paintjob" - for(var/option in list("none","engineering","atmos","security","command","medical","research","mining","maintenance","external","highsecurity")) - rightcolumn += linkpretty("paint=[option]",option,option == paintjob) - rightcolumn += "Glass door: " + linkpretty("glass",null,glassdoor) + "
" - var/length = max(leftcolumn.len,rightcolumn.len) - - var/dat = "You may move the model airlock around. A new airlock will be built in its space when you click done, below.
" - dat += "Door name: \"[doorname]\"" - dat += "
| " - if(i<=leftcolumn.len) - dat += leftcolumn[i] - dat += " | " - if(i<=rightcolumn.len) - dat += rightcolumn[i] - dat += " |
Finalize Airlock Construction | Cancel and Destroy Airlock" - usr << browse(dat,"window=airlockmaker") - -/datum/airlock_maker/Topic(var/href,var/list/href_list) - if(!usr) - return - if(!src || !linked || !linked.loc) - usr << browse(null,"window=airlockmaker") - return - - if("rename" in href_list) - var/newname = stripped_input(usr,"New airlock name:","Name the airlock",doorname) - if(newname) - doorname = newname - if("access" in href_list) - var/value = text2num(href_list["access"]) - access_used ^= value - if("reqall" in href_list) - require_all = !require_all - if("paint" in href_list) - paintjob = href_list["paint"] - if("glass" in href_list) - glassdoor = !glassdoor - - if("cancel" in href_list) - usr << browse(null,"window=airlockmaker") - qdel(linked) - qdel(src) - return - - if("done" in href_list) - usr << browse(null,"window=airlockmaker") - var/turf/t_loc = linked.loc - qdel(linked) - if(!istype(t_loc)) - return - - var/target_type = "/obj/machinery/door/airlock" - if(glassdoor) - if(paintjob != "none") - if(paintjob in list("external","highsecurity","maintenance")) // no glass version - target_type += "/[paintjob]" - else - target_type += "/glass_[paintjob]" - else - target_type += "/glass" - else if(paintjob != "none") - target_type += "/[paintjob]" - var/final = target_type - target_type = text2path(final) - if(!target_type) - to_chat(usr, "Didn't work, contact Sayu with this: [final]") - usr << browse(null,"window=airlockmaker") - return - - var/obj/machinery/door/D = new target_type(t_loc) - - D.name = doorname - - if(access_used.len == 0) - D.req_access = null - D.req_one_access = null - else if(require_all) - D.req_access = access_used.Copy() - D.req_one_access = null - else - D.req_access = null - D.req_one_access = access_used.Copy() - - return - - interact() +/* + This is for the sandbox for now, + maybe useful later for an actual thing? + -Sayu +*/ + +/obj/structure/door_assembly + var/datum/airlock_maker/maker = null + +/obj/structure/door_assembly/attack_hand() + ..() + if(maker) + maker.interact() + +/datum/airlock_maker + var/obj/structure/door_assembly/linked = null + + var/list/access_used = null + var/require_all = 1 + + var/paintjob = "none" + var/glassdoor = 0 + + var/doorname = "airlock" + +/datum/airlock_maker/New(var/atom/target_loc) + linked = new(target_loc) + linked.maker = src + linked.anchored = FALSE + access_used = list() + + interact() + +/datum/airlock_maker/proc/linkpretty(href,desc,active) + if(!desc) + var/static/list/defaults = list("No","Yes") + desc = defaults[active+1] + if(active) + return "[desc]" + return "[desc]" + +/datum/airlock_maker/proc/interact() + var/list/leftcolumn = list() + var/list/rightcolumn = list() + leftcolumn += "Required Access" + for(var/access in get_all_accesses()) + leftcolumn += linkpretty("access=[access]",get_access_desc(access),access in access_used) + leftcolumn += "Require all listed accesses: [linkpretty("reqall",null,require_all)]" + + rightcolumn += "Paintjob" + for(var/option in list("none","engineering","atmos","security","command","medical","research","mining","maintenance","external","highsecurity")) + rightcolumn += linkpretty("paint=[option]",option,option == paintjob) + rightcolumn += "Glass door: " + linkpretty("glass",null,glassdoor) + "
" + var/length = max(leftcolumn.len,rightcolumn.len) + + var/dat = "You may move the model airlock around. A new airlock will be built in its space when you click done, below.
" + dat += "Door name: \"[doorname]\"" + dat += "
| " + if(i<=leftcolumn.len) + dat += leftcolumn[i] + dat += " | " + if(i<=rightcolumn.len) + dat += rightcolumn[i] + dat += " |
Finalize Airlock Construction | Cancel and Destroy Airlock" + usr << browse(dat,"window=airlockmaker") + +/datum/airlock_maker/Topic(var/href,var/list/href_list) + if(!usr) + return + if(!src || !linked || !linked.loc) + usr << browse(null,"window=airlockmaker") + return + + if("rename" in href_list) + var/newname = stripped_input(usr,"New airlock name:","Name the airlock",doorname) + if(newname) + doorname = newname + if("access" in href_list) + var/value = text2num(href_list["access"]) + access_used ^= value + if("reqall" in href_list) + require_all = !require_all + if("paint" in href_list) + paintjob = href_list["paint"] + if("glass" in href_list) + glassdoor = !glassdoor + + if("cancel" in href_list) + usr << browse(null,"window=airlockmaker") + qdel(linked) + qdel(src) + return + + if("done" in href_list) + usr << browse(null,"window=airlockmaker") + var/turf/t_loc = linked.loc + qdel(linked) + if(!istype(t_loc)) + return + + var/target_type = "/obj/machinery/door/airlock" + if(glassdoor) + if(paintjob != "none") + if(paintjob in list("external","highsecurity","maintenance")) // no glass version + target_type += "/[paintjob]" + else + target_type += "/glass_[paintjob]" + else + target_type += "/glass" + else if(paintjob != "none") + target_type += "/[paintjob]" + var/final = target_type + target_type = text2path(final) + if(!target_type) + to_chat(usr, "Didn't work, contact Sayu with this: [final]") + usr << browse(null,"window=airlockmaker") + return + + var/obj/machinery/door/D = new target_type(t_loc) + + D.name = doorname + + if(access_used.len == 0) + D.req_access = null + D.req_one_access = null + else if(require_all) + D.req_access = access_used.Copy() + D.req_one_access = null + else + D.req_access = null + D.req_one_access = access_used.Copy() + + return + + interact() diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 15cd346b2d..cf2b867941 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -77,26 +77,26 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) hsbinfo = "
" if(admin) hsbinfo += "Administration
" - hsbinfo += "- Toggle Object Spawning
" - hsbinfo += "- Toggle Item Spawn Panel Auto-close
" + 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
" + 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]
" + hsbinfo += "- [T]
" else hsbinfo += "
[T]
" hsbinfo += "
" - hsbinfo += "- Spawn Clothing...
" - hsbinfo += "- Spawn Reagent Container...
" - hsbinfo += "- Spawn Other Item...
" + hsbinfo += "- Spawn Clothing...
" + hsbinfo += "- Spawn Reagent Container...
" + hsbinfo += "- Spawn Other Item...
" usr << browse(hsbinfo, "window=hsbpanel") @@ -235,12 +235,12 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) if(!GLOB.hsboxspawn) return if(!clothinfo) - clothinfo = "Clothing (Reagent Containers) (Other Items)
" + 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 reverseRange(all_items)) - clothinfo += "[O]
" + clothinfo += "[O]
" usr << browse(clothinfo,"window=sandbox") @@ -249,12 +249,12 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) if(!GLOB.hsboxspawn) return if(!reaginfo) - reaginfo = "Reagent Containers (Clothing) (Other Items)
" + 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 reverseRange(all_items)) - reaginfo += "[O]
" + reaginfo += "[O]
" usr << browse(reaginfo,"window=sandbox") @@ -263,13 +263,13 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) if(!GLOB.hsboxspawn) return if(!objinfo) - objinfo = "Other Items (Clothing) (Reagent Containers)
" + 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 reverseRange(all_items)) - objinfo += "[O]
" + objinfo += "[O]
" usr << browse(objinfo,"window=sandbox") diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 62e922f62a..a4229942c5 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -83,7 +83,7 @@ /datum/game_mode/traitor/proc/add_latejoin_traitor(datum/mind/character) var/datum/antagonist/traitor/new_antag = new antag_datum(character) new_antag.should_specialise = TRUE - character.add_antag_datum(antag_datum) + character.add_antag_datum(new_antag) @@ -144,6 +144,7 @@ else text += "
The [special_role_text] has failed!" SSblackbox.add_details("traitor_success","FAIL") + SEND_SOUND(traitor.current, 'sound/ambience/ambifailure.ogg') text += "
" diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index ced6ebbd35..3007ec51ba 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -288,7 +288,7 @@ possible = list() if(!link) return - for(var/mob/living/carbon/human/H in GLOB.living_mob_list) + for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) if(md5(H.dna.uni_identity) in link.fingerprints) possible |= H diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 776b5d6981..484961b6f8 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -212,7 +212,7 @@ /proc/makeNewConstruct(mob/living/simple_animal/hostile/construct/ctype, mob/target, mob/stoner = null, cultoverride = 0, loc_override = null) var/mob/living/simple_animal/hostile/construct/newstruct = new ctype((loc_override) ? (loc_override) : (get_turf(target))) if(stoner) - newstruct.faction |= "\ref[stoner]" + newstruct.faction |= "[REF(stoner)]" newstruct.master = stoner var/datum/action/innate/seek_master/SM = new() SM.Grant(newstruct) @@ -244,7 +244,7 @@ S.key = T.key S.language_holder = U.language_holder.copy(S) if(U) - S.faction |= "\ref[U]" //Add the master as a faction, allowing inter-mob cooperation + S.faction |= "[REF(U)]" //Add the master as a faction, allowing inter-mob cooperation if(U && iscultist(U)) SSticker.mode.add_cultist(S.mind, 0) S.cancel_camera() diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 0838bfeed6..5b87255d37 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -425,7 +425,7 @@ /datum/spellbook_entry/item/warpwhistle name = "Warp Whistle" - desc = "A strange whistle that will transport you to a distant safe place on the station. There is a window of vulnerability at the begining of every use." + desc = "A strange whistle that will transport you to a distant safe place on the station. There is a window of vulnerability at the beginning of every use." item_path = /obj/item/warpwhistle category = "Mobility" cost = 1 @@ -652,7 +652,7 @@ var/list/cat_dat = list() for(var/category in categories) cat_dat[category] = "
" - dat += "
" + spell_info+= "[E.buy_word]
" else spell_info+= "Can't [E.buy_word]
" if(E.CanRefund(user,src)) - spell_info+= "Refund
" + spell_info+= "Refund
" spell_info += "
" if(cat_dat[E.category]) cat_dat[E.category] += spell_info diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 60260d2a4f..97a41098f2 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -28,12 +28,6 @@ Class Variables: component_parts (list) A list of component parts of machine used by frame based machines. - uid (num) - Unique id of machine across all machines. - - gl_uid (global num) - Next uid value in sequence - stat (bitflag) Machine status bit flags. Possible bit flags: @@ -77,9 +71,6 @@ Class Procs: Default definition does nothing. - assign_uid() 'game/machinery/machine.dm' - Called by machine to assign a value to the uid variable. - process() 'game/machinery/machine.dm' Called by the 'machinery subsystem' once per machinery tick for each machine that is listed in its 'machines' list. @@ -112,17 +103,14 @@ Class Procs: var/power_channel = EQUIP //EQUIP,ENVIRON or LIGHT var/list/component_parts = null //list of all the parts used to build it, if made from certain kinds of frames. - var/uid - var/global/gl_uid = 1 var/panel_open = FALSE var/state_open = FALSE var/critical_machine = FALSE //If this machine is critical to station operation and should have the area be excempted from power failures. var/list/occupant_typecache //if set, turned into typecache in Initialize, other wise, defaults to mob/living typecache var/atom/movable/occupant = null - var/unsecuring_tool = /obj/item/wrench var/interact_open = FALSE // Can the machine be interacted with when in maint/when the panel is open. var/interact_offline = 0 // Can the machine be interacted with while de-powered. - var/speed_process = 0 // Process as fast as possible? + var/speed_process = FALSE // Process as fast as possible? var/obj/item/circuitboard/circuit // Circuit to be created and inserted when the machinery is created /obj/machinery/Initialize() @@ -303,10 +291,6 @@ Class Procs: /obj/machinery/proc/RefreshParts() //Placeholder proc for machines that are built using frames. return -/obj/machinery/proc/assign_uid() - uid = gl_uid - gl_uid++ - /obj/machinery/proc/default_pry_open(obj/item/crowbar/C) . = !(state_open || panel_open || is_operational() || (flags_1 & NODECONSTRUCT_1)) && istype(C) if(.) @@ -506,3 +490,19 @@ Class Procs: . = ..() if (AM == occupant) occupant = null + +/obj/machinery/proc/adjust_item_drop_location(atom/movable/AM) // Adjust item drop location to a 3x3 grid inside the tile, returns slot id from 0 to 8 + var/md5 = md5(AM.name) // Oh, and it's deterministic too. A specific item will always drop from the same slot. + for (var/i in 1 to 32) + #if DM_VERSION >= 513 + #warning 512 is definitely stable now, remove the old code + #endif + + #if DM_VERSION >= 512 + . += hex2num(md5[i]) + #else + . += hex2num(copytext(md5,i,i+1)) + #endif + . = . % 9 + AM.pixel_x = -8 + ((.%3)*8) + AM.pixel_y = -8 + (round( . / 3)*8) \ No newline at end of file diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index 673591aef1..84a18e3352 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -107,8 +107,8 @@ GLOBAL_LIST_EMPTY(announcement_systems) return - var/contents = "Arrival Announcement: ([(arrivalToggle ? "On" : "Off")])
\n[arrival]
\n" - contents += "Departmental Head Announcement: ([(newheadToggle ? "On" : "Off")])
\n[newhead]
\n" + var/contents = "Arrival Announcement: ([(arrivalToggle ? "On" : "Off")])
\n[arrival]
\n" + contents += "Departmental Head Announcement: ([(newheadToggle ? "On" : "Off")])
\n[newhead]
\n" var/datum/browser/popup = new(user, "announcement_config", "Automated Announcement Configuration", 370, 220) popup.set_content(contents) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 44c6812d05..d783be292e 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -240,8 +240,8 @@ var/dat = "
Autolathe Menu:
" dat += materials_printout() - dat += "
Browsing [selected_category]:
" dat += materials_printout() @@ -275,22 +275,22 @@ if(disabled || !can_build(D)) dat += "[D.name]" else - dat += "[D.name]" + dat += "[D.name]" if(ispath(D.build_path, /obj/item/stack)) GET_COMPONENT(materials, /datum/component/material_container) var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY) if (max_multiplier>10 && !disabled) - dat += " x10" + dat += " x10" if (max_multiplier>25 && !disabled) - dat += " x25" + dat += " x25" if(max_multiplier > 0 && !disabled) - dat += " x[max_multiplier]" + dat += " x[max_multiplier]" else if(!disabled && can_build(D, 5)) - dat += " x5" + dat += " x5" if(!disabled && can_build(D, 10)) - dat += " x10" + dat += " x10" dat += "[get_design_cost(D)]
" @@ -298,7 +298,7 @@ return dat /obj/machinery/autolathe/proc/search_win(mob/user) - var/dat = "Return to main menu" + var/dat = "Return to main menu" dat += "
Search results:
" dat += materials_printout() @@ -307,17 +307,17 @@ if(disabled || !can_build(D)) dat += "[D.name]" else - dat += "[D.name]" + dat += "[D.name]" if(ispath(D.build_path, /obj/item/stack)) GET_COMPONENT(materials, /datum/component/material_container) var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY) if (max_multiplier>10 && !disabled) - dat += " x10" + dat += " x10" if (max_multiplier>25 && !disabled) - dat += " x25" + dat += " x25" if(max_multiplier > 0 && !disabled) - dat += " x[max_multiplier]" + dat += " x[max_multiplier]" dat += "[get_design_cost(D)]
" diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index 9d446aa77c..b8d20b0c59 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -62,11 +62,11 @@ var/dat = "[world.name] secure vault. Authorized personnel only.
" dat += "Current Balance: [SSshuttle.points] credits.
" if(!siphoning) - dat += "Siphon Credits
" + dat += "Siphon Credits
" else - dat += "Halt Credit Siphon
" + dat += "Halt Credit Siphon
" - dat += "Close" + dat += "Close" var/datum/browser/popup = new(user, "computer", "Bank Vault", 300, 200) popup.set_content("
" - if(table.check_patient()) - patient = table.patient - dat += get_patient_info() - else - patient = null - dat += "No patient detected" - else - dat += "Operating table not found." - - var/datum/browser/popup = new(user, "op", "Operating Computer", 400, 500) - popup.set_content(dat) - popup.open() - -/obj/machinery/computer/operating/proc/get_patient_info() - var/dat = {" -
Patient:
[patient.stat ? "Non-Responsive" : "Stable"]-
Blood Type:
[patient.dna.blood_type]
-
- -
Health:
[patient.health]%
\> Brute Damage:
[patient.getBruteLoss()]%
\> Resp. Damage:
[patient.getOxyLoss()]%
\> Toxin Content:
[patient.getToxLoss()]%
\> Burn Severity:
[patient.getFireLoss()]%
Initiated Procedures
"
- for(var/datum/surgery/procedure in patient.surgeries)
- dat += "[capitalize(procedure.name)]
" - var/datum/surgery_step/surgery_step = procedure.get_surgery_step() - dat += "Next step: [capitalize(surgery_step.name)]" - if(surgery_step.repeatable) - dat += " or " - var/datum/surgery_step/next_step = procedure.get_surgery_next_step() - if(next_step) - dat += "[capitalize(next_step.name)]" - else - dat += "finish operation" - dat += "
" - dat += "
"
- return dat
+/obj/machinery/computer/operating
+ name = "operating computer"
+ desc = "Used to monitor the vitals of a patient during surgery."
+ icon_screen = "crew"
+ icon_keyboard = "med_key"
+ circuit = /obj/item/circuitboard/computer/operating
+ var/mob/living/carbon/human/patient
+ var/obj/structure/table/optable/table
+ light_color = LIGHT_COLOR_BLUE
+
+/obj/machinery/computer/operating/Initialize()
+ . = ..()
+ find_table()
+
+/obj/machinery/computer/operating/proc/find_table()
+ for(var/direction in GLOB.cardinals)
+ table = locate(/obj/structure/table/optable, get_step(src, direction))
+ if(table)
+ table.computer = src
+ break
+
+/obj/machinery/computer/operating/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "operating_computer", name, 350, 470, master_ui, state)
+ ui.open()
+
+/obj/machinery/computer/operating/ui_data(mob/user)
+ var/list/data = list()
+ data["table"] = table
+ if(table)
+ data["patient"] = list()
+ if(table.check_patient())
+ patient = table.patient
+ switch(patient.stat)
+ if(CONSCIOUS)
+ data["patient"]["stat"] = "Conscious"
+ data["patient"]["statstate"] = "good"
+ if(SOFT_CRIT)
+ data["patient"]["stat"] = "Conscious"
+ data["patient"]["statstate"] = "average"
+ if(UNCONSCIOUS)
+ data["patient"]["stat"] = "Unconscious"
+ data["patient"]["statstate"] = "average"
+ if(DEAD)
+ data["patient"]["stat"] = "Dead"
+ data["patient"]["statstate"] = "bad"
+ data["patient"]["health"] = patient.health
+ data["patient"]["blood_type"] = patient.dna.blood_type
+ data["patient"]["maxHealth"] = patient.maxHealth
+ data["patient"]["minHealth"] = HEALTH_THRESHOLD_DEAD
+ data["patient"]["bruteLoss"] = patient.getBruteLoss()
+ data["patient"]["fireLoss"] = patient.getFireLoss()
+ data["patient"]["toxLoss"] = patient.getToxLoss()
+ data["patient"]["oxyLoss"] = patient.getOxyLoss()
+ if(patient.surgeries.len)
+ data["procedures"] = list()
+ for(var/datum/surgery/procedure in patient.surgeries)
+ var/datum/surgery_step/surgery_step = procedure.get_surgery_step()
+ var/alternative_step
+ if(surgery_step.repeatable)
+ var/datum/surgery_step/next_step = procedure.get_surgery_next_step()
+ if(next_step)
+ alternative_step = capitalize(next_step.name)
+ else
+ alternative_step = "Finish operation"
+ data["procedures"] += list(list(
+ "name" = capitalize(procedure.name),
+ "next_step" = capitalize(surgery_step.name),
+ "alternative_step" = alternative_step
+ ))
+ return data
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index b590763ffe..920dd118c5 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -61,10 +61,10 @@
else
dat += "AI functional"
if (!src.active)
- dat += {"" - var/datum/surgery_step/surgery_step = procedure.get_surgery_step() - dat += "Next step: [capitalize(surgery_step.name)]" - if(surgery_step.repeatable) - dat += " or " - var/datum/surgery_step/next_step = procedure.get_surgery_next_step() - if(next_step) - dat += "[capitalize(next_step.name)]" - else - dat += "finish operation" - dat += "
" - dat += "
Begin Reconstruction"} + dat += {"
Begin Reconstruction"} else dat += "
Reconstruction in process, please wait.
" - dat += {"
Close"} + dat += {"
Close"} var/datum/browser/popup = new(user, "computer", "AI System Integrity Restorer", 400, 500) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index c93c96429c..aa644eb738 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -9,7 +9,7 @@ var/list/apcs //APCs the computer has access to var/mob/living/operator //Who's operating the computer right now var/obj/machinery/power/apc/active_apc //The APC we're using right now - var/list/filters //For sorting the results + var/list/result_filters //For sorting the results var/checking_logs = 0 var/list/logs var/authenticated = 0 @@ -18,7 +18,7 @@ /obj/machinery/computer/apc_control/Initialize() . = ..() apcs = list() //To avoid BYOND making the list run through a ton of procs - filters = list("Name" = null, "Charge Above" = null, "Charge Below" = null, "Responsive" = null) + result_filters = list("Name" = null, "Charge Above" = null, "Charge Below" = null, "Responsive" = null) /obj/machinery/computer/apc_control/process() apcs = list() //Clear the list every tick @@ -52,28 +52,28 @@ if(!checking_logs) dat += "Logged in as [auth_id].
" dat += "Filters
" - dat += "Name: [filters["Name"] ? filters["Name"] : "None set"]
" - dat += "Charge: \>[filters["Charge Above"] ? filters["Charge Above"] : "NaN"]% and \<[filters["Charge Below"] ? filters["Charge Below"] : "NaN"]%
" - dat += "Accessible: [filters["Responsive"] ? "Non-Responsive Only" : "All"]
" + dat += "Name: [result_filters["Name"] ? result_filters["Name"] : "None set"]
" + dat += "Charge: \>[result_filters["Charge Above"] ? result_filters["Charge Above"] : "NaN"]% and \<[result_filters["Charge Below"] ? result_filters["Charge Below"] : "NaN"]%
" + dat += "Accessible: [result_filters["Responsive"] ? "Non-Responsive Only" : "All"]
" for(var/A in apcs) var/obj/machinery/power/apc/APC = apcs[A] - if(filters["Name"] && !findtext(APC.name, filters["Name"]) && !findtext(APC.area.name, filters["Name"])) + if(result_filters["Name"] && !findtext(APC.name, result_filters["Name"]) && !findtext(APC.area.name, result_filters["Name"])) continue - if(filters["Charge Above"] && (APC.cell.charge / APC.cell.maxcharge) < filters["Charge Above"] / 100) + if(result_filters["Charge Above"] && (APC.cell.charge / APC.cell.maxcharge) < result_filters["Charge Above"] / 100) continue - if(filters["Charge Below"] && (APC.cell.charge / APC.cell.maxcharge) > filters["Charge Below"] / 100) + if(result_filters["Charge Below"] && (APC.cell.charge / APC.cell.maxcharge) > result_filters["Charge Below"] / 100) continue - if(filters["Responsive"] && !APC.aidisabled) + if(result_filters["Responsive"] && !APC.aidisabled) continue - dat += "[A]
\ + dat += "[A]
\ Charge: [DisplayPower(APC.cell.charge)] / [DisplayPower(APC.cell.maxcharge)] ([round((APC.cell.charge / APC.cell.maxcharge) * 100)]%)
\ Area: [APC.area]
\ [APC.aidisabled || APC.panel_open ? "APC does not respond to interface query." : "APC responds to interface query."]
" - dat += "Check Logs
" - dat += "Log Out
" + dat += "Check Logs
" + dat += "Log Out
" if(emagged) dat += "WARNING: Logging functionality partially disabled from outside source.
" - dat += "Restore logging functionality?
" + dat += "Restore logging functionality?
" else if(logs.len) for(var/entry in logs) @@ -81,11 +81,11 @@ else dat += "No activity has been recorded at this time.
" if(emagged) - dat += "@#%! CLEAR LOGS" - dat += "Return" + dat += "@#%! CLEAR LOGS" + dat += "Return" operator = user else - dat = "Please swipe a valid ID to log in..." + dat = "Please swipe a valid ID to log in..." var/datum/browser/popup = new(user, "apc_control", name, 600, 400) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) @@ -153,7 +153,7 @@ return log_activity("changed name filter to \"[new_filter]\"") playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - filters["Name"] = new_filter + result_filters["Name"] = new_filter if(href_list["above_filter"]) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (greater than).", name) as null|num @@ -163,7 +163,7 @@ if(new_filter) new_filter = Clamp(new_filter, 0, 100) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - filters["Charge Above"] = new_filter + result_filters["Charge Above"] = new_filter if(href_list["below_filter"]) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (lesser than).", name) as null|num @@ -173,13 +173,13 @@ if(new_filter) new_filter = Clamp(new_filter, 0, 100) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - filters["Charge Below"] = new_filter + result_filters["Charge Below"] = new_filter if(href_list["access_filter"]) - if(isnull(filters["Responsive"])) - filters["Responsive"] = 1 + if(isnull(result_filters["Responsive"])) + result_filters["Responsive"] = 1 log_activity("sorted by non-responsive APCs only") else - filters["Responsive"] = !filters["Responsive"] + result_filters["Responsive"] = !result_filters["Responsive"] log_activity("sorted by all APCs") playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) if(href_list["check_logs"]) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 7748022da1..4203971522 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -134,18 +134,18 @@ if(..()) return user.set_machine(src) - var/dat = "Close" + var/dat = "Close" dat += "
[enemy_name]
[temp]
Food: [food] | Fuel: [fuel]" dat += "
Engine Parts: [engine] | Hull Panels: [hull] | Electronics: [electronics]" if(turns == 7) - dat += "" + dat += "" else - dat += "" - dat += "" - dat += "" + dat += "" + dat += "" + dat += "" else dat = "
The Orion Trail
Experience the journey of your ancestors!
" - dat += "
[deadname] tried to fight back, but was killed." else eventdat += "
Fortunately, you fended them off without any trouble." - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" canContinueEvent = 1 if(ORION_TRAIL_FLUX) eventdat += "This region of space is highly turbulent.
If we go slowly we may avoid more damage, but if we keep our speed we won't waste supplies." eventdat += "
What will you do?" - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" if(ORION_TRAIL_ILLNESS) eventdat += "A deadly illness has been contracted!" var/deadname = remove_crewmember() eventdat += "
[deadname] was killed by the disease." - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" canContinueEvent = 1 if(ORION_TRAIL_BREAKDOWN) eventdat += "Oh no! The engine has broken down!" eventdat += "
You can repair it with an engine part, or you can make repairs for 3 days." if(engine >= 1) - eventdat += "" + eventdat += "" else - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" if(ORION_TRAIL_MALFUNCTION) eventdat += "The ship's systems are malfunctioning!" eventdat += "
You can replace the broken electronics with spares, or you can spend 3 days troubleshooting the AI." if(electronics >= 1) - eventdat += "" + eventdat += "" else - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" if(ORION_TRAIL_COLLISION) eventdat += "Something hit us! Looks like there's some hull damage." @@ -818,23 +818,23 @@ eventdat += "
[deadname] was killed by rapid depressurization." eventdat += "
You can repair the damage with hull plates, or you can spend the next 3 days welding scrap together." if(hull >= 1) - eventdat += "" + eventdat += "" else - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" if(ORION_TRAIL_BLACKHOLE) eventdat += "You were swept away into the black hole." - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" settlers = list() if(ORION_TRAIL_LING) eventdat += "Strange reports warn of changelings infiltrating crews on trips to Orion..." if(settlers.len <= 2) eventdat += "
Your crew's chance of reaching Orion is so slim the changelings likely avoided your ship..." - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" if(prob(10)) // "likely", I didn't say it was guaranteed! lings_aboard = min(++lings_aboard,2) else @@ -844,9 +844,9 @@ else if(prob(70)) lings_aboard = min(++lings_aboard,2) - eventdat += "" - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" + eventdat += "" canContinueEvent = 1 if(ORION_TRAIL_LING_ATTACK) @@ -892,8 +892,8 @@ else lings_aboard = max(0,--lings_aboard) - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" canContinueEvent = 1 @@ -903,8 +903,8 @@ eventdat += "The spaceport is on high alert! You've been barred from docking by the local authorities after your failed raid." if(last_spaceport_action) eventdat += "
Last Spaceport Action: [last_spaceport_action]" - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" else eventdat += "Your jump into the sector yields a spaceport - a lucky find!" eventdat += "
This spaceport is home to travellers who failed to reach Orion, but managed to find a different home..." @@ -943,13 +943,13 @@ //Buy crew if(food >= 10 && fuel >= 10) - eventdat += "
Hire a New Crewmember (-10FU, -10FO)
" + eventdat += "Hire a New Crewmember (-10FU, -10FO)
" else eventdat += "You cannot afford a new crewmember.
" //Sell crew if(settlers.len > 1) - eventdat += "Sell Crew for Fuel and Food (+7FU, +7FO)
" + eventdat += "Sell Crew for Fuel and Food (+7FU, +7FO)
" else eventdat += "You have no other crew to sell.
" @@ -958,37 +958,37 @@ //Engine parts if(fuel > 5) - eventdat += "" + eventdat += "" else eventdat += "You cannot afford engine parts." //Hull plates if(fuel > 5) - eventdat += "
" + eventdat += "" else eventdat += "You cannot afford hull plates." //Electronics if(fuel > 5) - eventdat += "
" + eventdat += "" else eventdat += "You cannot afford spare electronics." //Trade if(fuel > 5) - eventdat += "
Trade Fuel for Food (-5FU,+5FO)
" + eventdat += "Trade Fuel for Food (-5FU,+5FO)
" else eventdat += "You don't have 5FU to trade. 5) - eventdat += "
Trade Food for Fuel (+5FU,-5FO)
" + eventdat += "Trade Food for Fuel (+5FU,-5FO)
" else eventdat += "You don't have 5FO to trade."
- dat = "Crew Manifest:
Please use security record computer to modify entries.
[crew]Print
Access ID modification console.
"
+ dat = "Crew Manifest:
Please use security record computer to modify entries.
[crew]Print
Access ID modification console.
"
else if(mode == 2)
// JOB MANAGEMENT
- dat = "Return"
+ dat = "Return"
dat += " || Confirm Identity: "
var/S
if(scan)
S = html_encode(scan.name)
else
S = "--------"
- dat += "[S]"
+ dat += "[S]"
dat += "
| Job | Slots | Open job | Close job | Prioritize |
| Name | -ID | +Name | +ID | Fingerprints (F) | DNA (D) | -Blood Type | +Blood Type | Physical Status | Mental Status |
|---|---|---|---|---|---|---|---|---|
| [] | ", background, src, R.fields["id"], R.fields["name"]) + dat += text("||||||||
| [] | ", background, R.fields["id"], R.fields["name"]) dat += text("[] | ", R.fields["id"]) dat += text("F: [] D: [] | ", R.fields["fingerprint"], b_dna)
dat += text("[] | ", blood_type) @@ -102,11 +102,11 @@ dat += "
" // if(GLOB.data_core.general) // for(var/datum/data/record/R in sortRecord(GLOB.data_core.general)) -// dat += "[R.fields["id"]]: [R.fields["name"]]
" +// dat += "[R.fields["id"]]: [R.fields["name"]]
" // //Foreach goto(132) - dat += text("
Back", src) + dat += "
Back" if(3) - dat += text("Records Maintenance
\nBackup To Disk
\nUpload From Disk
\nDelete All Records
\n
\nBack", src, src, src, src) + 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"]] | ||
| Sex: | [active1.fields["sex"]] | ||
| Age: | [active1.fields["age"]] | ||
| Species: | [active1.fields["species"]] | ||
| Fingerprint: | [active1.fields["fingerprint"]] | ||
| Physical Status: | [active1.fields["p_stat"]] | ||
| Mental Status: | [active1.fields["m_stat"]] | ||
| Sex: | [active1.fields["sex"]] | ||
| 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"]] | ||
| 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[text("com_[]", counter)]] | |||
| Delete Entry | |||
| [active2.fields[text("com_[]", counter)]] | |||
| Delete Entry | |||
| Add Entry | |||
| Add Entry | |||
Delete Record (Medical Only) | |||
Delete Record (Medical Only) | |||
| Medical Record Lost! | |||
New Record | |||
| Print Record | |||
| Back | |||
New Record | |||
| Print Record | |||
| Back |
[Dis.name]" - dat += "
Back" + dat += "
[Dis.name]" + dat += "
Back" if(6) dat += "
Medical Robots:" var/bdat = null - for(var/mob/living/simple_animal/bot/medbot/M in GLOB.living_mob_list) + for(var/mob/living/simple_animal/bot/medbot/M in GLOB.alive_mob_list) if(M.z != src.z) continue //only find medibots on the same z-level as the computer var/turf/bl = get_turf(M) @@ -191,7 +191,7 @@ else else - dat += text("{Log In}", src) + dat += "{Log In}" var/datum/browser/popup = new(user, "med_rec", "Medical Records Console", 600, 400) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) @@ -286,7 +286,7 @@
Severity: [Dis.severity]"} else if(href_list["del_all"]) - src.temp = text("Are you sure you wish to delete all records?
\n\tYes
\n\tNo
", src, src) + src.temp = "Are you sure you wish to delete all records?
\n\tYes
\n\tNo
" else if(href_list["del_all2"]) investigate_log("[usr.name] ([usr.key]) has deleted all medical records.", INVESTIGATE_RECORDS) @@ -377,13 +377,13 @@ src.active2.fields["notes"] = t1 if("p_stat") if(active1) - src.temp = text("Physical Condition:
\n\t*Deceased*
\n\t*Unconscious*
\n\tActive
\n\tPhysically Unfit
", src, src, src, src) + src.temp = "Physical Condition:
\n\t*Deceased*
\n\t*Unconscious*
\n\tActive
\n\tPhysically Unfit
" if("m_stat") if(active1) - src.temp = text("Mental Condition:
\n\t*Insane*
\n\t*Unstable*
\n\t*Watch*
\n\tStable
", src, src, src, src) + src.temp = "Mental Condition:
\n\t*Insane*
\n\t*Unstable*
\n\t*Watch*
\n\tStable
" if("blood_type") if(active2) - src.temp = text("Blood Type:
\n\tA- A+
\n\tB- B+
\n\tAB- AB+
\n\tO- O+
", src, src, src, src, src, src, src, src) + 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("Please input DNA hash:", "Med. records", src.active2.fields["b_dna"], null) @@ -452,7 +452,7 @@ else if(href_list["del_r"]) if(active2) - src.temp = text("Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
", src, src) + src.temp = "Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
" else if(href_list["del_r2"]) investigate_log("[usr.name] ([usr.key]) has deleted the medical records for [active1.fields["name"]].", INVESTIGATE_RECORDS) @@ -575,7 +575,7 @@ if(4) R.fields["blood_type"] = random_blood_type() if(5) - R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit") + R.fields["p_stat"] = pick("*Unconscious*", "Active", "Physically Unfit") if(6) R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable") continue diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 5ba20bc527..d41bcce164 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -1,473 +1,472 @@ - -// Allows you to monitor messages that passes the server. - - - - -/obj/machinery/computer/message_monitor - name = "message monitor console" - desc = "Used to Monitor the crew's messages, that are sent via PDA. Can also be used to view Request Console messages." - icon_screen = "comm_logs" - circuit = /obj/item/circuitboard/computer/message_monitor - //Server linked to. - var/obj/machinery/message_server/linkedServer = null - //Sparks effect - For emag - var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread - //Messages - Saves me time if I want to change something. - var/noserver = "ALERT: No server detected." - var/incorrectkey = "ALERT: Incorrect decryption key!" - var/defaultmsg = "Welcome. Please select an option." - var/rebootmsg = "%$&(�: Critical %$$@ Error // !RestArting!
�%@%(*$%&(�&?*(%&�/{}" - var/time = 100 * length(src.linkedServer.decryptkey) - addtimer(CALLBACK(src, .proc/UnmagConsole), time) - message = rebootmsg - else - to_chat(user, "A no server error appears on the screen.") - -/obj/machinery/computer/message_monitor/Initialize() - . = ..() - //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. - if(!linkedServer) - if(GLOB.message_servers && GLOB.message_servers.len > 0) - linkedServer = GLOB.message_servers[1] - -/obj/machinery/computer/message_monitor/attack_hand(mob/living/user) - if(..()) - return - //If the computer is being hacked or is emagged, display the reboot message. - if(hacking || emagged) - message = rebootmsg - var/dat = "
\[Authenticated\] /"
- dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]
"
- else
- dat += " \[Unauthenticated\] /"
- dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]
"
-
- if(hacking || emagged)
- screen = 2
- else if(!auth || !linkedServer || (linkedServer.stat & (NOPOWER|BROKEN)))
- if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN)))
- message = noserver
- screen = 0
-
- switch(screen)
- //Main menu
- if(0)
- // = TAB
- var/i = 0
- dat += "" - - //Bottom message - if(!auth) - dat += "
" - dat += "
| X | Sender | Recipient | Message |
|---|---|---|---|
| [pda.sender] | [pda.recipient] | [pda.message][pda.photo ? "(Photo)":""] |
It will take 20 seconds for every character that the password has." - dat += "In the meantime, this console can reveal your true intentions if you let someone access it. Make sure no humans enter the room during that time." - else - //It's the same message as the one above but in binary. Because robots understand binary and humans don't... well I thought it was clever. - dat += {"01000010011100100111010101110100011001010010110
- 10110011001101111011100100110001101101001011011100110011
- 10010000001100110011011110111001000100000011100110110010
- 10111001001110110011001010111001000100000011010110110010
- 10111100100101110001000000100100101110100001000000111011
- 10110100101101100011011000010000001110100011000010110101
- 10110010100100000001100100011000000100000011100110110010
- 10110001101101111011011100110010001110011001000000110011
- 00110111101110010001000000110010101110110011001010111001
- 00111100100100000011000110110100001100001011100100110000
- 10110001101110100011001010111001000100000011101000110100
- 00110000101110100001000000111010001101000011001010010000
- 00111000001100001011100110111001101110111011011110111001
- 00110010000100000011010000110000101110011001011100010000
- 00100100101101110001000000111010001101000011001010010000
- 00110110101100101011000010110111001110100011010010110110
- 10110010100101100001000000111010001101000011010010111001
- 10010000001100011011011110110111001110011011011110110110
- 00110010100100000011000110110000101101110001000000111001
- 00110010101110110011001010110000101101100001000000111100
- 10110111101110101011100100010000001110100011100100111010
- 10110010100100000011010010110111001110100011001010110111
- 00111010001101001011011110110111001110011001000000110100
- 10110011000100000011110010110111101110101001000000110110
- 00110010101110100001000000111001101101111011011010110010
- 10110111101101110011001010010000001100001011000110110001
- 10110010101110011011100110010000001101001011101000010111
- 00010000001001101011000010110101101100101001000000111001
- 10111010101110010011001010010000001101110011011110010000
- 00110100001110101011011010110000101101110011100110010000
- 00110010101101110011101000110010101110010001000000111010
- 00110100001100101001000000111001001101111011011110110110
- 10010000001100100011101010111001001101001011011100110011
- 10010000001110100011010000110000101110100001000000111010
- 001101001011011010110010100101110"} - - //Fake messages - if(3) - dat += "
" - - dat += {"
| Sender | -Sender's Job | -Recipient | -Message |
| [customsender] | -[customjob] | -[customrecepient ? customrecepient.owner : "NONE"] | -[custommessage] |
" - dat += {"
| X | Sending Dep. | Receiving Dep. | -Message | Stamp | ID Auth. | Priority. |
|---|---|---|---|---|---|---|
| [rc.send_dpt] | -[rc.rec_dpt] | [rc.message] | [rc.stamp] | [rc.id_auth] | [rc.priority] |
[custommessage]
" - if (!customrecepient.silent) - playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1) - customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3) - if( customrecepient.loc && ishuman(customrecepient.loc) ) - var/mob/living/carbon/human/H = customrecepient.loc - to_chat(H, "[icon2html(customrecepient, viewers(H))] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)") - log_talk(usr,"[key_name(usr)] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA) - customrecepient.cut_overlays() - customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r")) - //Sender is faking as someone who exists - else - src.linkedServer.send_pda_message("[customrecepient.owner]", "[PDARec.owner]","[custommessage]") - customrecepient.tnote += "← From [PDARec.owner] ([customjob]):
[custommessage]
" - if (!customrecepient.silent) - playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1) - customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3) - if( customrecepient.loc && ishuman(customrecepient.loc) ) - var/mob/living/carbon/human/H = customrecepient.loc - to_chat(H, "[icon2html(customrecepient, H)] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)") - log_talk(usr,"[key_name(usr)] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA) - customrecepient.cut_overlays() - customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r")) - //Finally.. - ResetMessage() - - //Request Console Logs - KEY REQUIRED - if(href_list["viewr"]) - if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN))) - message = noserver - else - if(auth) - src.screen = 4 - - if (href_list["back"]) - src.screen = 0 - - return src.attack_hand(usr) - - -/obj/item/paper/monitorkey - //..() - name = "monitor decryption key" - var/obj/machinery/message_server/server = null - -/obj/item/paper/monitorkey/Initialize() - ..() - return INITIALIZE_HINT_LATELOAD - -/obj/item/paper/monitorkey/LateInitialize() - if(GLOB.message_servers) - for(var/obj/machinery/message_server/server in GLOB.message_servers) - if(!isnull(server)) - if(!isnull(server.decryptkey)) - info = "
Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." - info_links = info - add_overlay("paper_words") - break +// Allows you to monitor messages that passes the server. + + + + +/obj/machinery/computer/message_monitor + name = "message monitor console" + desc = "Used to Monitor the crew's messages, that are sent via PDA. Can also be used to view Request Console messages." + icon_screen = "comm_logs" + circuit = /obj/item/circuitboard/computer/message_monitor + //Server linked to. + var/obj/machinery/message_server/linkedServer = null + //Sparks effect - For emag + var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread + //Messages - Saves me time if I want to change something. + var/noserver = "ALERT: No server detected." + var/incorrectkey = "ALERT: Incorrect decryption key!" + var/defaultmsg = "Welcome. Please select an option." + var/rebootmsg = "%$&(�: Critical %$$@ Error // !RestArting!
�%@%(*$%&(�&?*(%&�/{}" + var/time = 100 * length(src.linkedServer.decryptkey) + addtimer(CALLBACK(src, .proc/UnmagConsole), time) + message = rebootmsg + else + to_chat(user, "A no server error appears on the screen.") + +/obj/machinery/computer/message_monitor/Initialize() + . = ..() + //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. + if(!linkedServer) + if(GLOB.message_servers && GLOB.message_servers.len > 0) + linkedServer = GLOB.message_servers[1] + +/obj/machinery/computer/message_monitor/attack_hand(mob/living/user) + if(..()) + return + //If the computer is being hacked or is emagged, display the reboot message. + if(hacking || emagged) + message = rebootmsg + var/dat = "
\[Authenticated\] /"
+ dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]
"
+ else
+ dat += " \[Unauthenticated\] /"
+ dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]
"
+
+ if(hacking || emagged)
+ screen = 2
+ else if(!auth || !linkedServer || (linkedServer.stat & (NOPOWER|BROKEN)))
+ if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN)))
+ message = noserver
+ screen = 0
+
+ switch(screen)
+ //Main menu
+ if(0)
+ // = TAB
+ var/i = 0
+ dat += "" + + //Bottom message + if(!auth) + dat += "
" + dat += "
| X | Sender | Recipient | Message |
|---|---|---|---|
| [pda.sender] | [pda.recipient] | [pda.message][pda.photo ? "(Photo)":""] |
It will take 20 seconds for every character that the password has." + dat += "In the meantime, this console can reveal your true intentions if you let someone access it. Make sure no humans enter the room during that time." + else + //It's the same message as the one above but in binary. Because robots understand binary and humans don't... well I thought it was clever. + dat += {"01000010011100100111010101110100011001010010110
+ 10110011001101111011100100110001101101001011011100110011
+ 10010000001100110011011110111001000100000011100110110010
+ 10111001001110110011001010111001000100000011010110110010
+ 10111100100101110001000000100100101110100001000000111011
+ 10110100101101100011011000010000001110100011000010110101
+ 10110010100100000001100100011000000100000011100110110010
+ 10110001101101111011011100110010001110011001000000110011
+ 00110111101110010001000000110010101110110011001010111001
+ 00111100100100000011000110110100001100001011100100110000
+ 10110001101110100011001010111001000100000011101000110100
+ 00110000101110100001000000111010001101000011001010010000
+ 00111000001100001011100110111001101110111011011110111001
+ 00110010000100000011010000110000101110011001011100010000
+ 00100100101101110001000000111010001101000011001010010000
+ 00110110101100101011000010110111001110100011010010110110
+ 10110010100101100001000000111010001101000011010010111001
+ 10010000001100011011011110110111001110011011011110110110
+ 00110010100100000011000110110000101101110001000000111001
+ 00110010101110110011001010110000101101100001000000111100
+ 10110111101110101011100100010000001110100011100100111010
+ 10110010100100000011010010110111001110100011001010110111
+ 00111010001101001011011110110111001110011001000000110100
+ 10110011000100000011110010110111101110101001000000110110
+ 00110010101110100001000000111001101101111011011010110010
+ 10110111101101110011001010010000001100001011000110110001
+ 10110010101110011011100110010000001101001011101000010111
+ 00010000001001101011000010110101101100101001000000111001
+ 10111010101110010011001010010000001101110011011110010000
+ 00110100001110101011011010110000101101110011100110010000
+ 00110010101101110011101000110010101110010001000000111010
+ 00110100001100101001000000111001001101111011011110110110
+ 10010000001100100011101010111001001101001011011100110011
+ 10010000001110100011010000110000101110100001000000111010
+ 001101001011011010110010100101110"} + + //Fake messages + if(3) + dat += "
" + + dat += {"
| Sender | +Sender's Job | +Recipient | +Message |
| [customsender] | +[customjob] | +[customrecepient ? customrecepient.owner : "NONE"] | +[custommessage] |
" + dat += {"
| X | Sending Dep. | Receiving Dep. | +Message | Stamp | ID Auth. | Priority. |
|---|---|---|---|---|---|---|
| [rc.send_dpt] | +[rc.rec_dpt] | [rc.message] | [rc.stamp] | [rc.id_auth] | [rc.priority] |
[custommessage]
" + if (!customrecepient.silent) + playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1) + customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3) + if( customrecepient.loc && ishuman(customrecepient.loc) ) + var/mob/living/carbon/human/H = customrecepient.loc + to_chat(H, "[icon2html(customrecepient, viewers(H))] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)") + log_talk(usr,"[key_name(usr)] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA) + customrecepient.cut_overlays() + customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r")) + //Sender is faking as someone who exists + else + src.linkedServer.send_pda_message("[customrecepient.owner]", "[PDARec.owner]","[custommessage]") + customrecepient.tnote += "← From [PDARec.owner] ([customjob]):
[custommessage]
" + if (!customrecepient.silent) + playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1) + customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3) + if( customrecepient.loc && ishuman(customrecepient.loc) ) + var/mob/living/carbon/human/H = customrecepient.loc + to_chat(H, "[icon2html(customrecepient, H)] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)") + log_talk(usr,"[key_name(usr)] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA) + customrecepient.cut_overlays() + customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r")) + //Finally.. + ResetMessage() + + //Request Console Logs - KEY REQUIRED + if(href_list["viewr"]) + if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + else + if(auth) + src.screen = 4 + + if (href_list["back"]) + src.screen = 0 + + return src.attack_hand(usr) + + +/obj/item/paper/monitorkey + //..() + name = "monitor decryption key" + var/obj/machinery/message_server/server = null + +/obj/item/paper/monitorkey/Initialize() + ..() + return INITIALIZE_HINT_LATELOAD + +/obj/item/paper/monitorkey/LateInitialize() + if(GLOB.message_servers) + for(var/obj/machinery/message_server/server in GLOB.message_servers) + if(!isnull(server)) + if(!isnull(server.decryptkey)) + info = "
Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." + info_links = info + add_overlay("paper_words") + break diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 61bf091af3..c13e80e48b 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -48,21 +48,21 @@ if(connected) var/d2 if(timing) //door controls do not need timers. - d2 = "Stop Time Launch" + d2 = "Stop Time Launch" else - d2 = "Initiate Time Launch" - dat += "
\nTimer System: [d2]\nTime Left: [DisplayTimeText(time)] - - + +" + d2 = "Initiate Time Launch" + dat += "
\nTimer System: [d2]\nTime Left: [DisplayTimeText(time)] - - + +" var/temp = "" var/list/L = list( 0.25, 0.5, 1, 2, 4, 8, 16 ) for(var/t in L) if(t == connected.power) temp += "[t] " else - temp += "[t] " - dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
" + temp += "[t] " + dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
" else - dat += "
\nToggle Outer Door
" - dat += "
Close" + dat += "
\nToggle Outer Door
" + dat += "
Close" add_fingerprint(usr) var/datum/browser/popup = new(user, "computer", title, 400, 500) popup.set_content(dat) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 3e9d6df42a..d2005d0a55 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -21,16 +21,16 @@ user.set_machine(src) var/dat = "" if(screen == 0) - dat += "
Unlock Console" + dat += "
Unlock Console" else if(screen == 1) dat += "
Prisoner ID Management
" if(inserted_id) - dat += text("[inserted_id]") - dat += text("Collected Points: [inserted_id.points]. Reset.
") - dat += text("Card goal: [inserted_id.goal]. Set
") + dat += text("[inserted_id]
") + dat += text("Collected Points: [inserted_id.points]. Reset.
") + dat += text("Card goal: [inserted_id.goal]. Set
") dat += text("Space Law recommends quotas of 100 points per minute they would normally serve in the brig.
") else - dat += text("Insert Prisoner ID.
") + dat += text("Insert Prisoner ID.
") dat += "
Prisoner Implant Management
" dat += "Chemical Implants
" var/turf/Tr = null @@ -42,9 +42,9 @@ continue dat += "ID: [C.imp_in.name] | Remaining Units: [C.reagents.total_volume]
" dat += "| Inject: " - dat += "((1))" - dat += "((5))" - dat += "((10))
" + dat += "((1))" + dat += "((5))" + dat += "((10))
" dat += "********************************
" dat += "
Tracking Implants
" for(var/obj/item/implant/tracking/T in GLOB.tracked_implants) @@ -61,9 +61,9 @@ loc_display = mob_loc.loc dat += "ID: [T.imp_in.name] | Location: [loc_display]
" - dat += "(Message Holder) |
" + dat += "(Message Holder) |
" dat += "********************************
" - dat += "
Lock Console" + dat += "
Lock Console" var/datum/browser/popup = new(user, "computer", "Prisoner Management Console", 400, 500) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 9960032d1d..51188989f1 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -1,176 +1,176 @@ - - - -/obj/machinery/computer/robotics - name = "robotics control console" - desc = "Used to remotely lockdown or detonate linked Cyborgs." - icon_screen = "robot" - icon_keyboard = "rd_key" + + + +/obj/machinery/computer/robotics + name = "robotics control console" + desc = "Used to remotely lockdown or detonate linked Cyborgs." + icon_screen = "robot" + icon_keyboard = "rd_key" req_access = list(ACCESS_ROBOTICS) - circuit = /obj/item/circuitboard/computer/robotics - var/temp = null - - light_color = LIGHT_COLOR_PINK - -/obj/machinery/computer/robotics/proc/can_control(mob/user, mob/living/silicon/robot/R) - if(!istype(R)) - return 0 - if(isAI(user)) - if (R.connected_ai != user) - return 0 - if(iscyborg(user)) - if (R != user) - return 0 - if(R.scrambledcodes) - return 0 - return 1 - -/obj/machinery/computer/robotics/attack_hand(mob/user) - if(..()) - return - interact(user) - -/obj/machinery/computer/robotics/interact(mob/user) - if (src.z > 6) - to_chat(user, "Unable to establish a connection: \black You're too far away from the station!") - return - user.set_machine(src) - var/dat - var/robots = 0 - for(var/mob/living/silicon/robot/R in GLOB.mob_list) - if(!can_control(user, R)) - continue - robots++ - dat += "[R.name] |" - if(R.stat) - dat += " Not Responding |" - else if (!R.canmove) - dat += " Locked Down |" - else - dat += " Operating Normally |" - if (!R.canmove) - else if(R.cell) - dat += " Battery Installed ([R.cell.charge]/[R.cell.maxcharge]) |" - else - dat += " No Cell Installed |" - if(R.module) - dat += " Module Installed ([R.module.name]) |" - else - dat += " No Module Installed |" - if(R.connected_ai) - dat += " Slaved to [R.connected_ai.name] |" - else - dat += " Independent from AI |" - if(issilicon(user) || IsAdminGhost(user)) - if(is_servant_of_ratvar(user) && user != R) - dat += "(Convert) " - else if(((issilicon(user) && is_special_character(user)) || IsAdminGhost(user)) && !R.emagged && (user != R || R.syndicate)) - dat += "(Hack) " - dat += "([R.canmove ? "Lockdown" : "Release"]) " - dat += "(Destroy)" - dat += "
" - - if(!robots) - dat += "No Cyborg Units detected within access parameters." - dat += "
" - - var/drones = 0 - for(var/mob/living/simple_animal/drone/D in GLOB.mob_list) - if(D.hacked) - continue - drones++ - dat += "[D.name] |" - if(D.stat) - dat += " Not Responding |" - dat += "(Destroy)" - dat += "
" - - if(!drones) - dat += "No Drone Units detected within access parameters." - - var/datum/browser/popup = new(user, "computer", "Cyborg Control Console", 400, 500) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - return - -/obj/machinery/computer/robotics/Topic(href, href_list) - if(..()) - return - - if (href_list["temp"]) - src.temp = null - - else if (href_list["killbot"]) - if(src.allowed(usr)) - var/mob/living/silicon/robot/R = locate(href_list["killbot"]) in GLOB.silicon_mobs - if(can_control(usr, R)) - var/choice = input("Are you certain you wish to detonate [R.name]?") in list("Confirm", "Abort") - if(choice == "Confirm" && can_control(usr, R) && !..()) - if(R.syndicate && R.emagged) - to_chat(R, "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered.") - if(R.connected_ai) - to_chat(R.connected_ai, "
ALERT - Cyborg detonation detected: [R.name]
") - R.ResetSecurityCodes() - else - var/turf/T = get_turf(R) - message_admins("[ADMIN_LOOKUPFLW(usr)] detonated [key_name(R, R.client)][ADMIN_JMP(T)]!") - log_game("\[key_name(usr)] detonated [key_name(R)]!") - if(R.connected_ai) - to_chat(R.connected_ai, "
ALERT - Cyborg detonation detected: [R.name]
") - R.self_destruct() - else - to_chat(usr, "Access Denied.") - - else if (href_list["stopbot"]) - if(src.allowed(usr)) - var/mob/living/silicon/robot/R = locate(href_list["stopbot"]) in GLOB.silicon_mobs - if(can_control(usr, R)) - var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort") - if(choice == "Confirm" && can_control(usr, R) && !..()) - message_admins("[ADMIN_LOOKUPFLW(usr)] [R.canmove ? "locked down" : "released"] [key_name(R, R.client)][ADMIN_LOOKUPFLW(R)]!") - log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [key_name(R)]!") - R.SetLockdown(!R.lockcharge) - to_chat(R, "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]") - if(R.connected_ai) - to_chat(R.connected_ai, "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
") - - else - to_chat(usr, "Access Denied.") - - else if (href_list["magbot"]) - if((issilicon(usr) && is_special_character(usr)) || IsAdminGhost(usr)) - var/mob/living/silicon/robot/R = locate(href_list["magbot"]) in GLOB.silicon_mobs - if(istype(R) && !R.emagged && ((R.syndicate && R == usr) || R.connected_ai == usr || IsAdminGhost(usr)) && !R.scrambledcodes && can_control(usr, R)) - log_game("[key_name(usr)] emagged [R.name] using robotic console!") - message_admins("[key_name_admin(usr)] emagged cyborg [key_name_admin(R)] using robotic console!") - R.SetEmagged(1) - if(is_special_character(R)) - R.verbs += /mob/living/silicon/robot/proc/ResetSecurityCodes - - else if(href_list["convert"]) - if(issilicon(usr) && is_special_character(usr)) - var/mob/living/silicon/robot/R = locate(href_list["convert"]) in GLOB.silicon_mobs - if(istype(R) && !is_servant_of_ratvar(R) && is_servant_of_ratvar(usr) && R.connected_ai == usr) - log_game("[key_name(usr)] converted [R.name] using robotic console!") - message_admins("[key_name_admin(usr)] converted cyborg [key_name_admin(R)] using robotic console!") - add_servant_of_ratvar(R) - - else if (href_list["killdrone"]) - if(src.allowed(usr)) + circuit = /obj/item/circuitboard/computer/robotics + var/temp = null + + light_color = LIGHT_COLOR_PINK + +/obj/machinery/computer/robotics/proc/can_control(mob/user, mob/living/silicon/robot/R) + if(!istype(R)) + return 0 + if(isAI(user)) + if (R.connected_ai != user) + return 0 + if(iscyborg(user)) + if (R != user) + return 0 + if(R.scrambledcodes) + return 0 + return 1 + +/obj/machinery/computer/robotics/attack_hand(mob/user) + if(..()) + return + interact(user) + +/obj/machinery/computer/robotics/interact(mob/user) + if (src.z > 6) + to_chat(user, "Unable to establish a connection: \black You're too far away from the station!") + return + user.set_machine(src) + var/dat + var/robots = 0 + for(var/mob/living/silicon/robot/R in GLOB.silicon_mobs) + if(!can_control(user, R)) + continue + robots++ + dat += "[R.name] |" + if(R.stat) + dat += " Not Responding |" + else if (!R.canmove) + dat += " Locked Down |" + else + dat += " Operating Normally |" + if (!R.canmove) + else if(R.cell) + dat += " Battery Installed ([R.cell.charge]/[R.cell.maxcharge]) |" + else + dat += " No Cell Installed |" + if(R.module) + dat += " Module Installed ([R.module.name]) |" + else + dat += " No Module Installed |" + if(R.connected_ai) + dat += " Slaved to [R.connected_ai.name] |" + else + dat += " Independent from AI |" + if(issilicon(user) || IsAdminGhost(user)) + if(is_servant_of_ratvar(user) && user != R) + dat += "(Convert) " + else if(((issilicon(user) && is_special_character(user)) || IsAdminGhost(user)) && !R.emagged && (user != R || R.syndicate)) + dat += "(Hack) " + dat += "([R.canmove ? "Lockdown" : "Release"]) " + dat += "(Destroy)" + dat += "
" + + if(!robots) + dat += "No Cyborg Units detected within access parameters." + dat += "
" + + var/drones = 0 + for(var/mob/living/simple_animal/drone/D in GLOB.drones_list) + if(D.hacked) + continue + drones++ + dat += "[D.name] |" + if(D.stat) + dat += " Not Responding |" + dat += "(Destroy)" + dat += "
" + + if(!drones) + dat += "No Drone Units detected within access parameters." + + var/datum/browser/popup = new(user, "computer", "Cyborg Control Console", 400, 500) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/computer/robotics/Topic(href, href_list) + if(..()) + return + + if (href_list["temp"]) + src.temp = null + + else if (href_list["killbot"]) + if(src.allowed(usr)) + var/mob/living/silicon/robot/R = locate(href_list["killbot"]) in GLOB.silicon_mobs + if(can_control(usr, R)) + var/choice = input("Are you certain you wish to detonate [R.name]?") in list("Confirm", "Abort") + if(choice == "Confirm" && can_control(usr, R) && !..()) + if(R.syndicate && R.emagged) + to_chat(R, "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered.") + if(R.connected_ai) + to_chat(R.connected_ai, "
ALERT - Cyborg detonation detected: [R.name]
") + R.ResetSecurityCodes() + else + var/turf/T = get_turf(R) + message_admins("[ADMIN_LOOKUPFLW(usr)] detonated [key_name(R, R.client)][ADMIN_JMP(T)]!") + log_game("\[key_name(usr)] detonated [key_name(R)]!") + if(R.connected_ai) + to_chat(R.connected_ai, "
ALERT - Cyborg detonation detected: [R.name]
") + R.self_destruct() + else + to_chat(usr, "Access Denied.") + + else if (href_list["stopbot"]) + if(src.allowed(usr)) + var/mob/living/silicon/robot/R = locate(href_list["stopbot"]) in GLOB.silicon_mobs + if(can_control(usr, R)) + var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort") + if(choice == "Confirm" && can_control(usr, R) && !..()) + message_admins("[ADMIN_LOOKUPFLW(usr)] [R.canmove ? "locked down" : "released"] [key_name(R, R.client)][ADMIN_LOOKUPFLW(R)]!") + log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [key_name(R)]!") + R.SetLockdown(!R.lockcharge) + to_chat(R, "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]") + if(R.connected_ai) + to_chat(R.connected_ai, "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
") + + else + to_chat(usr, "Access Denied.") + + else if (href_list["magbot"]) + if((issilicon(usr) && is_special_character(usr)) || IsAdminGhost(usr)) + var/mob/living/silicon/robot/R = locate(href_list["magbot"]) in GLOB.silicon_mobs + if(istype(R) && !R.emagged && ((R.syndicate && R == usr) || R.connected_ai == usr || IsAdminGhost(usr)) && !R.scrambledcodes && can_control(usr, R)) + log_game("[key_name(usr)] emagged [R.name] using robotic console!") + message_admins("[key_name_admin(usr)] emagged cyborg [key_name_admin(R)] using robotic console!") + R.SetEmagged(1) + if(is_special_character(R)) + R.verbs += /mob/living/silicon/robot/proc/ResetSecurityCodes + + else if(href_list["convert"]) + if(issilicon(usr) && is_special_character(usr)) + var/mob/living/silicon/robot/R = locate(href_list["convert"]) in GLOB.silicon_mobs + if(istype(R) && !is_servant_of_ratvar(R) && is_servant_of_ratvar(usr) && R.connected_ai == usr) + log_game("[key_name(usr)] converted [R.name] using robotic console!") + message_admins("[key_name_admin(usr)] converted cyborg [key_name_admin(R)] using robotic console!") + add_servant_of_ratvar(R) + + else if (href_list["killdrone"]) + if(src.allowed(usr)) var/mob/living/simple_animal/drone/D = locate(href_list["killdrone"]) in GLOB.mob_list - if(D.hacked) - to_chat(usr, "ERROR: [D] is not responding to external commands.") - else + if(D.hacked) + to_chat(usr, "ERROR: [D] is not responding to external commands.") + else var/turf/T = get_turf(D) message_admins("[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(D)][ADMIN_JMP(T)]!") log_game("[key_name(usr)] detonated [key_name(D)]!") - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(3, 1, D) - s.start() - D.visible_message("\the [D] self destructs!") - D.gib() + var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread + s.set_up(3, 1, D) + s.start() + D.visible_message("\the [D] self destructs!") + D.gib() - - src.updateUsrDialog() - return + + src.updateUsrDialog() + return diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 81204a69f0..7e73ef0c64 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -63,9 +63,9 @@ var/dat if(temp) - dat = text("[]
Clear Screen", temp, src) + dat = text("[]
Clear Screen", temp) else - dat = text("Confirm Identity: []
", src, (scan ? text("[]", scan.name) : "----------")) + dat = text("Confirm Identity: []
", (scan ? text("[]", scan.name) : "----------")) if(authenticated) switch(screen) if(1) @@ -111,7 +111,7 @@ "} dat += {"
"}
- dat += text("New Record
", src)
+ dat += "New Record
"
//search bar
dat += {"
| Name | -ID | -Rank | -Fingerprints | +Name | +ID | +Rank | +Fingerprints | Criminal Status | |||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| [] | ", R.fields["name"], R.fields["id"], R.fields["rank"], R.fields["fingerprint"], src, R, R.fields["name"]) + dat += text("[] | ", R.fields["name"], R.fields["id"], R.fields["rank"], R.fields["fingerprint"], R.fields["name"]) dat += text("[] | ", R.fields["id"]) dat += text("[] | ", R.fields["rank"]) dat += text("[] | ", R.fields["fingerprint"]) @@ -173,11 +173,11 @@ var complete_list = maintable.innerHTML;
|
-
|
|
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 += "
Minor Crimes: Add New" + dat += "
Criminal Status: [active2.fields["criminal"]]" + dat += "
Minor Crimes: Add New" dat +={"
| [c.crimeDetails] | " dat += "[c.author] | " dat += "[c.time] | " - dat += "\[X\] | " + dat += "\[X\] | " dat += "" dat += "
Major Crimes: Add New" + dat += "
Major Crimes: Add New" dat +={"
| [c.crimeDetails] | " dat += "[c.author] | " dat += "[c.time] | " - dat += "\[X\] | " + dat += "\[X\] | " dat += "
\nImportant Notes:
\n\t [active2.fields["notes"]] " + dat += "
\nImportant Notes:
\n\t [active2.fields["notes"]] " dat += "
Comments/Log
" var/counter = 1 while(active2.fields[text("com_[]", counter)]) dat += (active2.fields[text("com_[]", counter)] + "
") if(active2.fields[text("com_[]", counter)] != "Deleted") - dat += text("Delete Entry
", src, counter) + dat += text("Delete Entry
", counter) counter++ - dat += text("Add Entry
", src) - dat += text("Delete Record (Security Only)
", src) + dat += "Add Entry
" + dat += "Delete Record (Security Only)
" else dat += "Security Record Lost!
" - dat += text("New Security Record
", src) - dat += text("Delete Record (ALL)
Print Record
Print Wanted Poster
Back
", src, src, src, src) + dat += "New Security Record
" + dat += "Delete Record (ALL)
Print Record
Print Wanted Poster
Back
" else else - dat += text("{Log In}", src) + dat += "{Log In}" var/datum/browser/popup = new(user, "secure_rec", "Security Records Console", 600, 400) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) @@ -451,8 +451,8 @@ What a mess.*/ if("Delete All Records") temp = "" temp += "Are you sure you wish to delete all Security records?
" - temp += "Yes
" - temp += "No" + temp += "Yes
" + temp += "No" if("Purge All Records") investigate_log("[usr.name] ([usr.key]) has purged all the security records.", INVESTIGATE_RECORDS) @@ -476,14 +476,14 @@ What a mess.*/ if("Delete Record (ALL)") if(active1) temp = "
Are you sure you wish to delete the record (ALL)?
" - temp += "Yes" - temp += "No" + 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" + temp += "Yes
" + temp += "No" if("Delete Entry") if((istype(active2, /datum/data/record) && active2.fields[text("com_[]", href_list["del_c"])])) @@ -657,11 +657,11 @@ What a mess.*/ if(istype(active2, /datum/data/record)) temp = "
Criminal Status:
" temp += "- "
- temp += "
- None " - temp += "
- *Arrest* " - temp += "
- Incarcerated " - temp += "
- Parolled " - temp += "
- Discharged " + temp += "
- None " + temp += "
- *Arrest* " + temp += "
- Incarcerated " + temp += "
- Parolled " + temp += "
- Discharged " temp += "
Rank:
" temp += "" else alert(usr, "You do not have the required rank to do this!") @@ -699,7 +699,7 @@ What a mess.*/ if("released") active2.fields["criminal"] = "Discharged" investigate_log("[active1.fields["name"]] has been set from [old_field] to [active2.fields["criminal"]] by [usr.name] ([usr.key]).", INVESTIGATE_RECORDS) - for(var/mob/living/carbon/human/H in GLOB.mob_list) //thanks for forcing me to do this, whoever wrote this shitty records system + for(var/mob/living/carbon/human/H in GLOB.carbon_list) H.sec_hud_set_security_status() if("Delete Record (Security) Execute") investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", INVESTIGATE_RECORDS) diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 019d52fe86..6769244335 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -1,85 +1,87 @@ -/obj/machinery/computer/station_alert - name = "station alert console" - desc = "Used to access the station's automated alert system." - icon_screen = "alert:0" - icon_keyboard = "atmos_key" - circuit = /obj/item/circuitboard/computer/stationalert - var/alarms = list("Fire" = list(), "Atmosphere" = list(), "Power" = list()) - - light_color = LIGHT_COLOR_CYAN - +/obj/machinery/computer/station_alert + name = "station alert console" + desc = "Used to access the station's automated alert system." + icon_screen = "alert:0" + icon_keyboard = "atmos_key" + circuit = /obj/item/circuitboard/computer/stationalert + var/alarms = list("Fire" = list(), "Atmosphere" = list(), "Power" = list()) + + light_color = LIGHT_COLOR_CYAN + +/obj/machinery/computer/station_alert/Initialize() + . = ..() + GLOB.alert_consoles += src + +/obj/machinery/computer/station_alert/Destroy() + GLOB.alert_consoles -= src + return ..() + /obj/machinery/computer/station_alert/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ - datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) - ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - ui = new(user, src, ui_key, "station_alert", name, 300, 500, master_ui, state) - ui.open() - -/obj/machinery/computer/station_alert/ui_data(mob/user) - var/list/data = list() - - data["alarms"] = list() - for(var/class in alarms) - data["alarms"][class] = list() - for(var/area in alarms[class]) - data["alarms"][class] += area - - return data - -/obj/machinery/computer/station_alert/proc/triggerAlarm(class, area/A, O, obj/source) - if(source.z != z) - return - if(stat & (BROKEN)) - return - - var/list/L = alarms[class] - for(var/I in L) - if (I == A.name) - var/list/alarm = L[I] - var/list/sources = alarm[3] - if (!(source in sources)) - sources += source - return 1 - var/obj/machinery/camera/C = null - var/list/CL = null - if(O && islist(O)) - CL = O - if (CL.len == 1) - C = CL[1] - else if(O && istype(O, /obj/machinery/camera)) - C = O - L[A.name] = list(A, (C ? C : O), list(source)) - return 1 - - -/obj/machinery/computer/station_alert/proc/cancelAlarm(class, area/A, obj/origin) - if(stat & (BROKEN)) - return - var/list/L = alarms[class] - var/cleared = 0 - for (var/I in L) - if (I == A.name) - var/list/alarm = L[I] - var/list/srcs = alarm[3] - if (origin in srcs) - srcs -= origin - if (srcs.len == 0) - cleared = 1 - L -= I - return !cleared - - -/obj/machinery/computer/station_alert/process() - ..() - -/obj/machinery/computer/station_alert/update_icon() - ..() - if(stat & (NOPOWER|BROKEN)) - return - var/active_alarms = FALSE - for(var/cat in alarms) - var/list/L = alarms[cat] - if(L.len) - active_alarms = TRUE - if(active_alarms) - add_overlay("alert:2") + datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "station_alert", name, 300, 500, master_ui, state) + ui.open() + +/obj/machinery/computer/station_alert/ui_data(mob/user) + . = list() + + .["alarms"] = list() + for(var/class in alarms) + .["alarms"][class] = list() + for(var/area in alarms[class]) + .["alarms"][class] += area + +/obj/machinery/computer/station_alert/proc/triggerAlarm(class, area/A, O, obj/source) + if(source.z != z) + return + if(stat & (BROKEN)) + return + + var/list/L = alarms[class] + for(var/I in L) + if (I == A.name) + var/list/alarm = L[I] + var/list/sources = alarm[3] + if (!(source in sources)) + sources += source + return 1 + var/obj/machinery/camera/C = null + var/list/CL = null + if(O && islist(O)) + CL = O + if (CL.len == 1) + C = CL[1] + else if(O && istype(O, /obj/machinery/camera)) + C = O + L[A.name] = list(A, (C ? C : O), list(source)) + return 1 + + +/obj/machinery/computer/station_alert/proc/cancelAlarm(class, area/A, obj/origin) + if(stat & (BROKEN)) + return + var/list/L = alarms[class] + var/cleared = 0 + for (var/I in L) + if (I == A.name) + var/list/alarm = L[I] + var/list/srcs = alarm[3] + if (origin in srcs) + srcs -= origin + if (srcs.len == 0) + cleared = 1 + L -= I + return !cleared + +/obj/machinery/computer/station_alert/update_icon() + ..() + if(stat & (NOPOWER|BROKEN)) + return + var/active_alarms = FALSE + for(var/cat in alarms) + var/list/L = alarms[cat] + if(L.len) + active_alarms = TRUE + if(active_alarms) + add_overlay("alert:2") diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index 4fefdb044e..c879bc175a 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -97,8 +97,8 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E if(uplinkholder) dat += "[uplinkholder.hidden_uplink.telecrystals] telecrystals remain in this uplink." if(linkedboss) - dat += "Donate TC: 1 | 5 | All" - dat += "
Eject Uplink" + dat += "Donate TC: 1 | 5 | All" + dat += "
Eject Uplink" var/datum/browser/popup = new(user, "computer", "Telecrystal Upload/Receive Station", 700, 500) @@ -167,7 +167,7 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E var/dat = "" - dat += "Scan for TC stations.
" + dat += "Scan for TC stations.
" dat += "[storedcrystals] telecrystals are available for distribution.
" dat += "
" @@ -177,11 +177,11 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E if(A.uplinkholder) dat += "[A.uplinkholder.hidden_uplink.telecrystals] telecrystals." if(storedcrystals) - dat+= "
Add TC: 1 | 5 | 10 | All" + dat+= "
Add TC: 1 | 5 | 10 | All" dat += "
" if(TCstations.len && storedcrystals) - dat += "
Evenly distribute remaining TC.
" + dat += "
Evenly distribute remaining TC.
" for(var/entry in transferlog) diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index ab4c72ab41..7261c44fc5 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -27,8 +27,8 @@ /obj/machinery/computer/teleporter/proc/link_power_station() if(power_station) return - for(dir in GLOB.cardinals) - power_station = locate(/obj/machinery/teleport/station, get_step(src, dir)) + for(var/direction in GLOB.cardinals) + power_station = locate(/obj/machinery/teleport/station, get_step(src, direction)) if(power_station) break return power_station @@ -70,16 +70,16 @@ data += "Calibration: Sub-Optimal" data += "
" - data += "Change regime
" - data += "Set target
" + data += "Change regime
" + data += "Set target
" if(locked) - data += "
Get target from memory
" - data += "Eject GPS device
" + data += "
Get target from memory
" + data += "Eject GPS device
" else data += "
Get target from memory
" data += "Eject GPS device
" - data += "
Calibrate Hub" + data += "
Calibrate Hub" var/datum/browser/popup = new(user, "teleporter", name, 400, 400) popup.set_content(data) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index de26806273..ec8779b7d2 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -92,21 +92,21 @@ user.set_machine(src) var/list/dat = list() dat +="
"
- dat += "[!active ? "BREAK IT DOWN" : "SHUT IT DOWN"]
" + dat += "[!active ? "BREAK IT DOWN" : "SHUT IT DOWN"]
" dat += "
" + dat += "[!active ? "BREAK IT DOWN" : "SHUT IT DOWN"]
" dat += "
" - dat += " Select Track
" + dat += " Select Track
" dat += "Track Selected: [selection.song_name]
" dat += "Track Length: [DisplayTimeText(selection.song_length)]
" dat += "
DJ's Soundboard:
" dat +="
"
- dat += "Air Horn "
- dat += "Station Alert "
- dat += "Warning Siren "
- dat += "Honk
" - dat += "Shotgun Pump" - dat += "Gunshot" - dat += "Esword" - dat += "Harm Alarm" + dat += "Air Horn " + dat += "Station Alert " + dat += "Warning Siren " + dat += "Honk
" + dat += "Shotgun Pump" + dat += "Gunshot" + dat += "Esword" + dat += "Harm Alarm" var/datum/browser/popup = new(user, "vending", "Radiance Dance Machine - Mark IV", 400, 350) popup.set_content(dat.Join()) popup.open() diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 889fe42cf7..780b7ac1f2 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -84,8 +84,8 @@ open_machine() /obj/machinery/dna_scannernew/proc/locate_computer(type_) - for(dir in list(NORTH,EAST,SOUTH,WEST)) - var/C = locate(type_, get_step(src, dir)) + for(var/direction in GLOB.cardinals) + var/C = locate(type_, get_step(src, direction)) if(C) return C return null diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index aac80cc1a0..4b8da75d87 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -39,8 +39,7 @@ #define NOT_ELECTRIFIED 0 #define ELECTRIFIED_PERMANENT -1 - - +#define AI_ELECTRIFY_DOOR_TIME 30 /obj/machinery/door/airlock name = "airlock" @@ -68,7 +67,7 @@ var/justzap = FALSE normalspeed = 1 var/obj/item/electronics/airlock/electronics = null - var/hasShocked = FALSE //Prevents multiple shocks from happening + var/shockCooldown = FALSE //Prevents multiple shocks from happening autoclose = TRUE var/obj/item/device/doorCharge/charge = null //If applied, causes an explosion upon opening the door var/obj/item/note //Any papers pinned to the airlock @@ -118,6 +117,15 @@ max_integrity = normal_integrity if(damage_deflection == AIRLOCK_DAMAGE_DEFLECTION_N && security_level > AIRLOCK_SECURITY_METAL) damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R + prepare_huds() + var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC] + diag_hud.add_to_hud(src) + diag_hud_set_electrified() + + return INITIALIZE_HINT_LATELOAD + +/obj/machinery/door/airlock/LateInitialize() + . = ..() if(abandoned) var/outcome = rand(1,100) switch(outcome) @@ -136,10 +144,6 @@ welded = TRUE if(24 to 30) panel_open = TRUE - prepare_huds() - var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC] - diag_hud.add_to_hud(src) - diag_hud_set_electrified() update_icon() @@ -359,6 +363,9 @@ /obj/machinery/door/airlock/proc/loseBackupPower() if(src.secondsBackupPowerLost < 60) src.secondsBackupPowerLost = 60 + if(!spawnPowerRestoreRunning) + spawnPowerRestoreRunning = TRUE + INVOKE_ASYNC(src, .proc/handlePowerRestore) /obj/machinery/door/airlock/proc/regainBackupPower() if(src.secondsBackupPowerLost > 0) @@ -370,14 +377,14 @@ /obj/machinery/door/airlock/proc/shock(mob/user, prb) if(!hasPower()) // unpowered, no shock return FALSE - if(hasShocked > world.time) + if(shockCooldown > world.time) return FALSE //Already shocked someone recently? if(!prob(prb)) return FALSE //you lucked out, no shock for you do_sparks(5, TRUE, src) var/tmp/check_range = TRUE if(electrocute_mob(user, get_area(src), src, 1, check_range)) - hasShocked = world.time + 10 + shockCooldown = world.time + 10 return TRUE else return FALSE @@ -607,110 +614,7 @@ to_chat(user, "Unable to interface. Airlock control panel damaged.") return - //Separate interface for the AI. - user.set_machine(src) - var/t1 = text("Airlock Control
\n") - if(src.secondsMainPowerLost > 0) - if(!wires.is_cut(WIRE_POWER1) && !wires.is_cut(WIRE_POWER2)) - t1 += text("Main power is offline for [] seconds.
\n", src.secondsMainPowerLost) - else - t1 += text("Main power is offline indefinitely.
\n") - else - t1 += text("Main power is online.") - - if(src.secondsBackupPowerLost > 0) - if(!wires.is_cut(WIRE_BACKUP1) && !wires.is_cut(WIRE_BACKUP2)) - t1 += text("Backup power is offline for [] seconds.
\n", src.secondsBackupPowerLost) - else - t1 += text("Backup power is offline indefinitely.
\n") - else if(src.secondsMainPowerLost > 0) - t1 += text("Backup power is online.") - else - t1 += text("Backup power is offline, but will turn on if main power fails.") - t1 += "
\n" - - if(wires.is_cut(WIRE_IDSCAN)) - t1 += text("IdScan wire is cut.
\n") - else if(src.aiDisabledIdScanner) - t1 += text("IdScan disabled. Enable?
\n", src) - else - t1 += text("IdScan enabled. Disable?
\n", src) - - if(src.emergency) - t1 += text("Emergency Access Override is enabled. Disable?
\n", src) - else - t1 += text("Emergency Access Override is disabled. Enable?
\n", src) - - if(wires.is_cut(WIRE_POWER1)) - t1 += text("Main Power Input wire is cut.
\n") - if(wires.is_cut(WIRE_POWER2)) - t1 += text("Main Power Output wire is cut.
\n") - if(!secondsMainPowerLost) - t1 += text("Temporarily disrupt main power?.
\n", src) - if(!secondsBackupPowerLost) - t1 += text("Temporarily disrupt backup power?.
\n", src) - - if(wires.is_cut(WIRE_BACKUP1)) - t1 += text("Backup Power Input wire is cut.
\n") - if(wires.is_cut(WIRE_BACKUP2)) - t1 += text("Backup Power Output wire is cut.
\n") - - if(wires.is_cut(WIRE_BOLTS)) - t1 += text("Door bolt drop wire is cut.
\n") - else if(!src.locked) - t1 += text("Door bolts are up. Drop them?
\n", src) - else - t1 += text("Door bolts are down.") - if(src.hasPower()) - t1 += text(" Raise?
\n", src) - else - t1 += text(" Cannot raise door bolts due to power failure.
\n") - - if(wires.is_cut(WIRE_LIGHT)) - t1 += text("Door bolt lights wire is cut.
\n") - else if(!src.lights) - t1 += text("Door bolt lights are off. Enable?
\n", src) - else - t1 += text("Door bolt lights are on. Disable?
\n", src) - - if(wires.is_cut(WIRE_SHOCK)) - t1 += text("Electrification wire is cut.
\n") - if(secondsElectrified==ELECTRIFIED_PERMANENT) - t1 += text("Door is electrified indefinitely. Un-electrify it?
\n", src) - else if(secondsElectrified>NOT_ELECTRIFIED) - t1 += text("Door is electrified temporarily ([] seconds). Un-electrify it?
\n", secondsElectrified, src) - else - t1 += text("Door is not electrified. Electrify it for 30 seconds? Or, Electrify it indefinitely until someone cancels the electrification?
\n", src, src) - - if(wires.is_cut(WIRE_SAFETY)) - t1 += text("Door force sensors not responding.
\n") - else if(src.safe) - t1 += text("Door safeties operating normally. Override?
\n",src) - else - t1 += text("Danger. Door safeties disabled. Restore?
\n",src) - - if(wires.is_cut(WIRE_TIMING)) - t1 += text("Door timing circuitry not responding.
\n") - else if(src.normalspeed) - t1 += text("Door timing circuitry operating normally. Override?
\n",src) - else - t1 += text("Warning. Door timing circuitry operating abnormally. Restore?
\n",src) - - if(src.welded) - t1 += text("Door appears to have been welded shut.
\n") - else if(!src.locked) - if(src.density) - t1 += text("Open door
\n", src) - else - t1 += text("Close door
\n", src) - - t1 += text("\n", src) - user << browse(t1, "window=airlock") - onclose(user, "airlock") - -//aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 11 lift access override -//aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 11 enable access override - + ui_interact(user) /obj/machinery/door/airlock/proc/hack(mob/user) set waitfor = 0 @@ -797,11 +701,18 @@ /obj/machinery/door/airlock/proc/electrified_loop() while (secondsElectrified > 0) - secondsElectrified-- - if(secondsElectrified <= 0) - set_electrified(NOT_ELECTRIFIED) - updateUsrDialog() - sleep(10) + sleep(10) + if(QDELETED(src)) + return + + secondsElectrified -= 1 + updateDialog() + // This is to protect against changing to permanent, mid loop. + if(secondsElectrified==0) + set_electrified(NOT_ELECTRIFIED) + else + set_electrified(ELECTRIFIED_PERMANENT) + updateDialog() /obj/machinery/door/airlock/Topic(href, href_list, var/nowindow = 0) // If you add an if(..()) check you must first remove the var/nowindow parameter. @@ -811,206 +722,16 @@ if(!usr.canUseTopic(src) && !IsAdminGhost(usr)) return add_fingerprint(usr) - if(href_list["close"]) - usr << browse(null, "window=airlock") - if(usr.machine==src) - usr.unset_machine() - return if((in_range(src, usr) && isturf(loc)) && panel_open) usr.set_machine(src) - - - if((issilicon(usr) && src.canAIControl(usr)) || IsAdminGhost(usr)) - //AI - //aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 8 door safties, 9 door speed, 11 emergency access - //aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 8 door safties, 9 door speed, 11 emergency access - if(href_list["aiDisable"]) - var/code = text2num(href_list["aiDisable"]) - switch (code) - if(1) - //disable idscan - if(wires.is_cut(WIRE_IDSCAN)) - to_chat(usr, "The IdScan wire has been cut - So, you can't disable it, but it is already disabled anyways.") - else if(src.aiDisabledIdScanner) - to_chat(usr, "You've already disabled the IdScan feature.") - else - aiDisabledIdScanner = TRUE - if(2) - //disrupt main power - if(!secondsMainPowerLost) - src.loseMainPower() - update_icon() - else - to_chat(usr, "Main power is already offline.") - if(3) - //disrupt backup power - if(!secondsBackupPowerLost) - src.loseBackupPower() - update_icon() - else - to_chat(usr, "Backup power is already offline.") - if(4) - //drop door bolts - if(wires.is_cut(WIRE_BOLTS)) - to_chat(usr, "You can't drop the door bolts - The door bolt dropping wire has been cut.") - else - bolt() - if(5) - //un-electrify door - if(wires.is_cut(WIRE_SHOCK)) - to_chat(usr, text("Can't un-electrify the airlock - The electrification wire is cut.")) - else if(isElectrified()) - set_electrified(0) - - if(8) - // Safeties! We don't need no stinking safeties! - if(wires.is_cut(WIRE_SAFETY)) - to_chat(usr, text("Control to door sensors is disabled.")) - else if (src.safe) - safe = FALSE - else - to_chat(usr, text("Firmware reports safeties already overriden.")) - - if(9) - // Door speed control - if(wires.is_cut(WIRE_TIMING)) - to_chat(usr, text("Control to door timing circuitry has been severed.")) - else if (src.normalspeed) - normalspeed = 0 - else - to_chat(usr, text("Door timing circuitry already accelerated.")) - if(7) - //close door - if(src.welded) - to_chat(usr, text("The airlock has been welded shut!")) - else if(src.locked) - to_chat(usr, text("The door bolts are down!")) - else if(!src.density) - close() - else - open() - - if(10) - // Bolt lights - if(wires.is_cut(WIRE_LIGHT)) - to_chat(usr, text("Control to door bolt lights has been severed.")) - else if (src.lights) - lights = FALSE - update_icon() - else - to_chat(usr, text("Door bolt lights are already disabled!")) - - if(11) - // Emergency access - if (src.emergency) - emergency = FALSE - update_icon() - else - to_chat(usr, text("Emergency access is already disabled!")) - - - else if(href_list["aiEnable"]) - var/code = text2num(href_list["aiEnable"]) - switch (code) - if(1) - //enable idscan - if(wires.is_cut(WIRE_IDSCAN)) - to_chat(usr, "You can't enable IdScan - The IdScan wire has been cut.") - else if(src.aiDisabledIdScanner) - aiDisabledIdScanner = FALSE - else - to_chat(usr, "The IdScan feature is not disabled.") - if(4) - //raise door bolts - if(wires.is_cut(WIRE_BOLTS)) - to_chat(usr, text("The door bolt drop wire is cut - you can't raise the door bolts.
\n")) - else if(!src.locked) - to_chat(usr, text("The door bolts are already up.
\n")) - else - if(src.hasPower()) - unbolt() - else - to_chat(usr, text("Cannot raise door bolts due to power failure.
\n")) - - if(5) - //electrify door for 30 seconds - if(wires.is_cut(WIRE_SHOCK)) - to_chat(usr, text("The electrification wire has been cut.
\n")) - else if(secondsElectrified==ELECTRIFIED_PERMANENT) - to_chat(usr, text("The door is already indefinitely electrified. You'd have to un-electrify it before you can re-electrify it with a non-forever duration.
\n")) - else if(isElectrified()) - to_chat(usr, text("The door is already electrified. You can't re-electrify it while it's already electrified.
\n")) - else - shockedby += "\[[time_stamp()]\][usr](ckey:[usr.ckey])" - add_logs(usr, src, "electrified") - set_electrified(30) - addtimer(CALLBACK(src, .proc/electrified_loop), 10) - if(6) - //electrify door indefinitely - if(wires.is_cut(WIRE_SHOCK)) - to_chat(usr, text("The electrification wire has been cut.
\n")) - else if(secondsElectrified==ELECTRIFIED_PERMANENT) - to_chat(usr, text("The door is already indefinitely electrified.
\n")) - else if(isElectrified()) - to_chat(usr, text("The door is already electrified. You can't re-electrify it while it's already electrified.
\n")) - else - shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])") - add_logs(usr, src, "electrified") - set_electrified(ELECTRIFIED_PERMANENT) - - if (8) // Not in order >.> - // Safeties! Maybe we do need some stinking safeties! - if(wires.is_cut(WIRE_SAFETY)) - to_chat(usr, text("Control to door sensors is disabled.")) - else if (!src.safe) - safe = TRUE - src.updateUsrDialog() - else - to_chat(usr, text("Firmware reports safeties already in place.")) - - if(9) - // Door speed control - if(wires.is_cut(WIRE_TIMING)) - to_chat(usr, text("Control to door timing circuitry has been severed.")) - else if (!src.normalspeed) - normalspeed = 1 - src.updateUsrDialog() - else - to_chat(usr, text("Door timing circuitry currently operating normally.")) - - if(7) - //open door - if(src.welded) - to_chat(usr, text("The airlock has been welded shut!")) - else if(src.locked) - to_chat(usr, text("The door bolts are down!")) - else if(src.density) - open() - else - close() - if(10) - // Bolt lights - if(wires.is_cut(WIRE_LIGHT)) - to_chat(usr, text("Control to door bolt lights has been severed.")) - else if (!src.lights) - lights = TRUE - update_icon() - src.updateUsrDialog() - else - to_chat(usr, text("Door bolt lights are already enabled!")) - if(11) - // Emergency access - if (!src.emergency) - emergency = TRUE - update_icon() - else - to_chat(usr, text("Emergency access is already enabled!")) - add_fingerprint(usr) if(!nowindow) updateUsrDialog() + else + updateDialog() + /obj/machinery/door/airlock/attackby(obj/item/C, mob/user, params) if(!issilicon(user) && !IsAdminGhost(user)) @@ -1566,6 +1287,8 @@ /obj/machinery/door/airlock/proc/set_electrified(seconds) secondsElectrified = seconds diag_hud_set_electrified() + if(secondsElectrified > 0) + INVOKE_ASYNC(src, .proc/electrified_loop) /obj/machinery/door/airlock/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() @@ -1631,6 +1354,243 @@ else if(istype(note, /obj/item/photo)) return "photo" +/obj/machinery/door/airlock/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ + datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "ai_airlock", name, 550, 456, master_ui, state) + ui.open() + +/obj/machinery/door/airlock/ui_data() + var/list/data = list() + + var/list/power = list() + power["main"] = src.secondsMainPowerLost ? 0 : 2 // boolean + power["main_timeleft"] = src.secondsMainPowerLost + power["backup"] = src.secondsBackupPowerLost ? 0 : 2 // boolean + power["backup_timeleft"] = src.secondsBackupPowerLost + data["power"] = power + + data["shock"] = secondsElectrified == 0 ? 2 : 0 + data["shock_timeleft"] = secondsElectrified + data["id_scanner"] = !aiDisabledIdScanner + data["emergency"] = emergency // access + data["locked"] = locked // bolted + data["lights"] = lights // bolt lights + data["safe"] = safe // safeties + data["speed"] = normalspeed // safe speed + data["welded"] = welded // welded + data["opened"] = !density // opened + + var/list/wire = list() + wire["main_1"] = !wires.is_cut(WIRE_POWER1) + wire["main_2"] = !wires.is_cut(WIRE_POWER2) + wire["backup_1"] = !wires.is_cut(WIRE_BACKUP1) + wire["backup_2"] = !wires.is_cut(WIRE_BACKUP2) + wire["shock"] = !wires.is_cut(WIRE_SHOCK) + wire["id_scanner"] = !wires.is_cut(WIRE_IDSCAN) + wire["bolts"] = !wires.is_cut(WIRE_BOLTS) + wire["lights"] = !wires.is_cut(WIRE_LIGHT) + wire["safe"] = !wires.is_cut(WIRE_SAFETY) + wire["timing"] = !wires.is_cut(WIRE_TIMING) + + data["wires"] = wire + return data + +/obj/machinery/door/airlock/ui_act(action, params) + if(..()) + return + if(!user_allowed(usr)) + return + switch(action) + if("disrupt-main") + if(!secondsMainPowerLost) + loseMainPower() + update_icon() + else + to_chat(usr, "Main power is already offline.") + . = TRUE + if("disrupt-backup") + if(!secondsBackupPowerLost) + loseBackupPower() + update_icon() + else + to_chat(usr, "Backup power is already offline.") + . = TRUE + if("shock-restore") + shock_restore(usr) + . = TRUE + if("shock-temp") + shock_temp(usr) + . = TRUE + if("shock-perm") + shock_perm(usr) + . = TRUE + if("idscan-on") + if(wires.is_cut(WIRE_IDSCAN)) + to_chat(usr, "You can't enable IdScan - The IdScan wire has been cut.") + else if(src.aiDisabledIdScanner) + aiDisabledIdScanner = FALSE + else + to_chat(usr, "The IdScan feature is not disabled.") + . = TRUE + if("idscan-off") + if(wires.is_cut(WIRE_IDSCAN)) + to_chat(usr, "The IdScan wire has been cut - So, you can't disable it, but it is already disabled anyways.") + else if(aiDisabledIdScanner) + to_chat(usr, "You've already disabled the IdScan feature.") + else + aiDisabledIdScanner = TRUE + . = TRUE + if("emergency-on") + emergency_on(usr) + . = TRUE + if("emergency-off") + emergency_off(usr) + . = TRUE + if("bolt-raise") + bolt_raise(usr) + . = TRUE + if("bolt-drop") + bolt_drop(usr) + . = TRUE + if("light-on") + if(wires.is_cut(WIRE_LIGHT)) + to_chat(usr, "Control to door bolt lights has been severed.") + else if (!src.lights) + lights = TRUE + update_icon() + else + to_chat(usr, text("Door bolt lights are already enabled!")) + . = TRUE + if("light-off") + if(wires.is_cut(WIRE_LIGHT)) + to_chat(usr, "Control to door bolt lights has been severed.") + else if (lights) + lights = FALSE + update_icon() + else + to_chat(usr, "Door bolt lights are already disabled!") + . = TRUE + if("safe-on") + if(wires.is_cut(WIRE_SAFETY)) + to_chat(usr, "Control to door sensors is disabled.") + else if (!src.safe) + safe = TRUE + else + to_chat(usr, "Firmware reports safeties already in place.") + . = TRUE + if("safe-off") + if(wires.is_cut(WIRE_SAFETY)) + to_chat(usr, "Control to door sensors is disabled.") + else if (safe) + safe = FALSE + else + to_chat(usr, "Firmware reports safeties already overriden.") + . = TRUE + if("speed-on") + if(wires.is_cut(WIRE_TIMING)) + to_chat(usr, "Control to door timing circuitry has been severed.") + else if (!src.normalspeed) + normalspeed = 1 + else + to_chat(usr,"Door timing circuitry currently operating normally.") + . = TRUE + if("speed-off") + if(wires.is_cut(WIRE_TIMING)) + to_chat(usr, "Control to door timing circuitry has been severed.") + else if (normalspeed) + normalspeed = 0 + else + to_chat(usr, "Door timing circuitry already accelerated.") + + . = TRUE + if("open-close") + user_toggle_open(usr) + . = TRUE + +/obj/machinery/door/airlock/proc/user_allowed(mob/user) + return (issilicon(user) && canAIControl(user)) || IsAdminGhost(user) + +/obj/machinery/door/airlock/proc/shock_restore(mob/user) + if(!user_allowed(user)) + return + if(wires.is_cut(WIRE_SHOCK)) + to_chat(user, "Can't un-electrify the airlock - The electrification wire is cut.") + else if(isElectrified()) + set_electrified(0) + +/obj/machinery/door/airlock/proc/shock_temp(mob/user) + if(!user_allowed(user)) + return + if(wires.is_cut(WIRE_SHOCK)) + to_chat(user, "The electrification wire has been cut") + else + shockedby += "\[[time_stamp()]\][user](ckey:[user.ckey])" + add_logs(user, src, "electrified") + set_electrified(AI_ELECTRIFY_DOOR_TIME) + +/obj/machinery/door/airlock/proc/shock_perm(mob/user) + if(!user_allowed(user)) + return + if(wires.is_cut(WIRE_SHOCK)) + to_chat(user, "The electrification wire has been cut") + else + shockedby += text("\[[time_stamp()]\][user](ckey:[user.ckey])") + add_logs(user, src, "electrified") + set_electrified(ELECTRIFIED_PERMANENT) + +/obj/machinery/door/airlock/proc/emergency_on(mob/user) + if(!user_allowed(user)) + return + if (!emergency) + emergency = TRUE + update_icon() + else + to_chat(user, "Emergency access is already enabled!") + +/obj/machinery/door/airlock/proc/emergency_off(mob/user) + if(!user_allowed(user)) + return + if (emergency) + emergency = FALSE + update_icon() + else + to_chat(user, "Emergency access is already disabled!") + +/obj/machinery/door/airlock/proc/bolt_raise(mob/user) + if(!user_allowed(user)) + return + if(wires.is_cut(WIRE_BOLTS)) + to_chat(user, "The door bolt drop wire is cut - you can't raise the door bolts") + else if(!src.locked) + to_chat(user, "The door bolts are already up") + else + if(src.hasPower()) + unbolt() + else + to_chat(user, "Cannot raise door bolts due to power failure") + +/obj/machinery/door/airlock/proc/bolt_drop(mob/user) + if(!user_allowed(user)) + return + if(wires.is_cut(WIRE_BOLTS)) + to_chat(user, "You can't drop the door bolts - The door bolt dropping wire has been cut.") + else + bolt() + +/obj/machinery/door/airlock/proc/user_toggle_open(mob/user) + if(!user_allowed(user)) + return + if(welded) + to_chat(user, text("The airlock has been welded shut!")) + else if(locked) + to_chat(user, text("The door bolts are down!")) + else if(!density) + close() + else + open() + #undef AIRLOCK_CLOSED #undef AIRLOCK_CLOSING #undef AIRLOCK_OPEN @@ -1653,3 +1613,4 @@ #undef NOT_ELECTRIFIED #undef ELECTRIFIED_PERMANENT +#undef AI_ELECTRIFY_DOOR_TIME diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 883cc3986f..fa6275809d 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -103,7 +103,7 @@ move_update_air(T) /obj/machinery/door/CanPass(atom/movable/mover, turf/target) - if(istype(mover) && mover.checkpass(PASSGLASS)) + if(istype(mover) && (mover.pass_flags & PASSGLASS)) return !opacity return !density diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 63da575fc1..ad746d089f 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -212,7 +212,7 @@ CanAtmosPass = ATMOS_PASS_PROC /obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target) - if(istype(mover) && mover.checkpass(PASSGLASS)) + if(istype(mover) && (mover.pass_flags & PASSGLASS)) return 1 if(get_dir(loc, target) == dir) //Make sure looking at appropriate border return !density @@ -220,7 +220,7 @@ return 1 /obj/machinery/door/firedoor/border_only/CheckExit(atom/movable/mover as mob|obj, turf/target) - if(istype(mover) && mover.checkpass(PASSGLASS)) + if(istype(mover) && (mover.pass_flags & PASSGLASS)) return 1 if(get_dir(loc, target) == dir) return !density diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 4809f3ff49..2313afec3b 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -90,7 +90,7 @@ return /obj/machinery/door/window/CanPass(atom/movable/mover, turf/target) - if(istype(mover) && mover.checkpass(PASSGLASS)) + if(istype(mover) && (mover.pass_flags & PASSGLASS)) return 1 if(get_dir(loc, target) == dir) //Make sure looking at appropriate border return !density @@ -118,7 +118,7 @@ return !density || (dir != to_dir) || (check_access(ID) && hasPower()) /obj/machinery/door/window/CheckExit(atom/movable/mover as mob|obj, turf/target) - if(istype(mover) && mover.checkpass(PASSGLASS)) + if(istype(mover) && (mover.pass_flags & PASSGLASS)) return 1 if(get_dir(loc, target) == dir) return !density diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 5e0d018554..e243494f2b 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -277,29 +277,29 @@ if(!exteriorAirlock || !interiorAirlock) if(!exteriorAirlock) if(interiorAirlock.density) - output = "Open Interior Airlock
" + output = "Open Interior Airlock
" else - output = "Close Interior Airlock
" + output = "Close Interior Airlock
" else if(exteriorAirlock.density) - output = "Open Exterior Airlock
" + output = "Open Exterior Airlock
" else - output = "Close Exterior Airlock
" + output = "Close Exterior Airlock
" else if(exteriorAirlock.density) if(interiorAirlock.density) - output = {"Open Exterior Airlock
- Open Interior Airlock
"} + output = {"Open Exterior Airlock
+ Open Interior Airlock
"} else - output = {"Cycle to Exterior Airlock
- Close Interior Airlock
"} + output = {"Cycle to Exterior Airlock
+ Close Interior Airlock
"} else if(interiorAirlock.density) - output = {"Close Exterior Airlock
- Cycle to Interior Airlock
"} + output = {"Close Exterior Airlock
+ Cycle to Interior Airlock
"} else - output = {"Close Exterior Airlock
- Close Interior Airlock
"} + output = {"Close Exterior Airlock
+ Close Interior Airlock
"} output = {"Access Control Console
diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index 59d58bc9a5..f34191370d 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -1,296 +1,296 @@ -//States for airlock_control -#define AIRLOCK_STATE_INOPEN -2 -#define AIRLOCK_STATE_PRESSURIZE -1 -#define AIRLOCK_STATE_CLOSED 0 -#define AIRLOCK_STATE_DEPRESSURIZE 1 -#define AIRLOCK_STATE_OUTOPEN 2 - -/datum/computer/file/embedded_program/airlock_controller - var/id_tag - var/exterior_door_tag - var/interior_door_tag - var/airpump_tag - var/sensor_tag - var/sanitize_external - - state = AIRLOCK_STATE_CLOSED - var/target_state = AIRLOCK_STATE_CLOSED - var/sensor_pressure = null - -/datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal, receive_method, receive_param) - var/receive_tag = signal.data["tag"] - if(!receive_tag) - return - - if(receive_tag==sensor_tag) - if(signal.data["pressure"]) - sensor_pressure = text2num(signal.data["pressure"]) - - else if(receive_tag==exterior_door_tag) - memory["exterior_status"] = signal.data["door_status"] - - else if(receive_tag==interior_door_tag) - memory["interior_status"] = signal.data["door_status"] - - else if(receive_tag==airpump_tag) - if(signal.data["power"]) - memory["pump_status"] = signal.data["direction"] - else - memory["pump_status"] = "off" - - else if(receive_tag==id_tag) - switch(signal.data["command"]) - if("cycle") - if(state < AIRLOCK_STATE_CLOSED) - target_state = AIRLOCK_STATE_OUTOPEN - else - target_state = AIRLOCK_STATE_INOPEN - -/datum/computer/file/embedded_program/airlock_controller/receive_user_command(command) - switch(command) - if("cycle_closed") - target_state = AIRLOCK_STATE_CLOSED - if("cycle_exterior") - target_state = AIRLOCK_STATE_OUTOPEN - if("cycle_interior") - target_state = AIRLOCK_STATE_INOPEN - if("abort") - target_state = AIRLOCK_STATE_CLOSED - -/datum/computer/file/embedded_program/airlock_controller/process() - var/process_again = 1 - while(process_again) - process_again = 0 - switch(state) - if(AIRLOCK_STATE_INOPEN) // state -2 - if(target_state > state) - if(memory["interior_status"] == "closed") - state = AIRLOCK_STATE_CLOSED - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - signal.data["command"] = "secure_close" - post_signal(signal) - else - if(memory["pump_status"] != "off") - var/datum/signal/signal = new - signal.data = list( - "tag" = airpump_tag, - "power" = 0, - "sigtype"="command" - ) - post_signal(signal) - - if(AIRLOCK_STATE_PRESSURIZE) - if(target_state < state) - if(sensor_pressure >= ONE_ATMOSPHERE*0.95) - if(memory["interior_status"] == "open") - state = AIRLOCK_STATE_INOPEN - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - signal.data["command"] = "secure_open" - post_signal(signal) - else - var/datum/signal/signal = new - signal.data = list( - "tag" = airpump_tag, - "sigtype"="command" - ) - if(memory["pump_status"] == "siphon") - signal.data["stabalize"] = 1 - else if(memory["pump_status"] != "release") - signal.data["power"] = 1 - post_signal(signal) - else if(target_state > state) - state = AIRLOCK_STATE_CLOSED - process_again = 1 - - if(AIRLOCK_STATE_CLOSED) - if(target_state > state) - if(memory["interior_status"] == "closed") - state = AIRLOCK_STATE_DEPRESSURIZE - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - signal.data["command"] = "secure_close" - post_signal(signal) - else if(target_state < state) - if(memory["exterior_status"] == "closed") - state = AIRLOCK_STATE_PRESSURIZE - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - signal.data["command"] = "secure_close" - post_signal(signal) - - else - if(memory["pump_status"] != "off") - var/datum/signal/signal = new - signal.data = list( - "tag" = airpump_tag, - "power" = 0, - "sigtype"="command" - ) - post_signal(signal) - - if(AIRLOCK_STATE_DEPRESSURIZE) - var/target_pressure = ONE_ATMOSPHERE*0.05 - if(sanitize_external) - target_pressure = ONE_ATMOSPHERE*0.01 - - if(sensor_pressure <= target_pressure) - if(target_state > state) - if(memory["exterior_status"] == "open") - state = AIRLOCK_STATE_OUTOPEN - else - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - signal.data["command"] = "secure_open" - post_signal(signal) - else if(target_state < state) - state = AIRLOCK_STATE_CLOSED - process_again = 1 - else if((target_state < state) && !sanitize_external) - state = AIRLOCK_STATE_CLOSED - process_again = 1 - else - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.data = list( - "tag" = airpump_tag, - "sigtype"="command" - ) - if(memory["pump_status"] == "release") - signal.data["purge"] = 1 - else if(memory["pump_status"] != "siphon") - signal.data["power"] = 1 - post_signal(signal) - - if(AIRLOCK_STATE_OUTOPEN) //state 2 - if(target_state < state) - if(memory["exterior_status"] == "closed") - if(sanitize_external) - state = AIRLOCK_STATE_DEPRESSURIZE - process_again = 1 - else - state = AIRLOCK_STATE_CLOSED - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - signal.data["command"] = "secure_close" - post_signal(signal) - else - if(memory["pump_status"] != "off") - var/datum/signal/signal = new - signal.data = list( - "tag" = airpump_tag, - "power" = 0, - "sigtype"="command" - ) - post_signal(signal) - - memory["sensor_pressure"] = sensor_pressure - memory["processing"] = state != target_state - //sensor_pressure = null //not sure if we can comment this out. Uncomment in case of problems -rastaf0 - - return 1 - - -/obj/machinery/embedded_controller/radio/airlock_controller - icon = 'icons/obj/airlock_machines.dmi' - icon_state = "airlock_control_standby" - - name = "airlock console" - density = FALSE - - frequency = 1449 - power_channel = ENVIRON - - // Setup parameters only - var/id_tag - var/exterior_door_tag - var/interior_door_tag - var/airpump_tag - var/sensor_tag - var/sanitize_external - -/obj/machinery/embedded_controller/radio/airlock_controller/Initialize(mapload) - . = ..() - if(!mapload) - return - - var/datum/computer/file/embedded_program/airlock_controller/new_prog = new - - new_prog.id_tag = id_tag - new_prog.exterior_door_tag = exterior_door_tag - new_prog.interior_door_tag = interior_door_tag - new_prog.airpump_tag = airpump_tag - new_prog.sensor_tag = sensor_tag - new_prog.sanitize_external = sanitize_external - - new_prog.master = src - program = new_prog - -/obj/machinery/embedded_controller/radio/airlock_controller/update_icon() - if(on && program) - if(program.memory["processing"]) - icon_state = "airlock_control_process" - else - icon_state = "airlock_control_standby" - else - icon_state = "airlock_control_off" - - -/obj/machinery/embedded_controller/radio/airlock_controller/return_text() - var/state_options = null - - var/state = 0 - var/sensor_pressure = "----" - var/exterior_status = "----" - var/interior_status = "----" - var/pump_status = "----" - var/current_status = "Inactive
" - if(program) - state = program.state - sensor_pressure = program.memory["sensor_pressure"] ? program.memory["sensor_pressure"] : "----" - exterior_status = program.memory["exterior_status"] ? program.memory["exterior_status"] : "----" - interior_status = program.memory["interior_status"] ? program.memory["interior_status"] : "----" - pump_status = program.memory["pump_status"] ? program.memory["pump_status"] : "----" - - switch(state) - if(AIRLOCK_STATE_INOPEN) - state_options = {"Close Interior Airlock
-Cycle to Exterior Airlock
"} - current_status = "Interior Airlock Open
Chamber Pressurized" - if(AIRLOCK_STATE_PRESSURIZE) - state_options = "Abort Cycling
" - current_status = "Cycling to Interior Airlock
Chamber Pressurizing" - if(AIRLOCK_STATE_CLOSED) - state_options = {"Open Interior Airlock
-Open Exterior Airlock
"} - if(AIRLOCK_STATE_DEPRESSURIZE) - state_options = "Abort Cycling
" - current_status = "Cycling to Exterior Airlock
Chamber Depressurizing" - if(AIRLOCK_STATE_OUTOPEN) - state_options = {"Cycle to Interior Airlock
-Close Exterior Airlock
"} - current_status = "Exterior Airlock Open
Chamber Depressurized" - - var/output = {"
" + if(program) + state = program.state + sensor_pressure = program.memory["sensor_pressure"] ? program.memory["sensor_pressure"] : "----" + exterior_status = program.memory["exterior_status"] ? program.memory["exterior_status"] : "----" + interior_status = program.memory["interior_status"] ? program.memory["interior_status"] : "----" + pump_status = program.memory["pump_status"] ? program.memory["pump_status"] : "----" + + switch(state) + if(AIRLOCK_STATE_INOPEN) + state_options = {"Close Interior Airlock
+Cycle to Exterior Airlock
"} + current_status = "Interior Airlock Open
Chamber Pressurized" + if(AIRLOCK_STATE_PRESSURIZE) + state_options = "Abort Cycling
" + current_status = "Cycling to Interior Airlock
Chamber Pressurizing" + if(AIRLOCK_STATE_CLOSED) + state_options = {"Open Interior Airlock
+Open Exterior Airlock
"} + if(AIRLOCK_STATE_DEPRESSURIZE) + state_options = "Abort Cycling
" + current_status = "Cycling to Exterior Airlock
Chamber Depressurizing" + if(AIRLOCK_STATE_OUTOPEN) + state_options = {"Cycle to Interior Airlock
+Close Exterior Airlock
"} + current_status = "Exterior Airlock Open
Chamber Depressurized" + + var/output = {"
-Activate Vent / Pump
-Activate Vent / Clear
"} - var/output = {"Vent Control Console
-[state_options]
"} - - return output + if(!mapload) + return + var/datum/computer/file/embedded_program/simple_vent_controller/new_prog = new + + new_prog.airpump_tag = airpump_tag + new_prog.master = src + program = new_prog + +/obj/machinery/embedded_controller/radio/simple_vent_controller/update_icon() + if(on && program) + icon_state = "airlock_control_standby" + else + icon_state = "airlock_control_off" + + +/obj/machinery/embedded_controller/radio/simple_vent_controller/return_text() + var/state_options = null + state_options = {"Deactivate Vent
+Activate Vent / Pump
+Activate Vent / Clear
"} + var/output = {"Vent Control Console
+[state_options]
"} + + return output diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm new file mode 100644 index 0000000000..b521f404ce --- /dev/null +++ b/code/game/machinery/exonet_node.dm @@ -0,0 +1,106 @@ +/obj/machinery/exonet_node + name = "exonet node" + icon = 'icons/obj/stationobjs.dmi' + icon_state = "exonet_node" + idle_power_usage = 25 + var/on = TRUE + var/toggle = TRUE + density = TRUE + anchored = TRUE + circuit = /obj/item/circuitboard/machine/exonet_node + max_integrity = 300 + integrity_failure = 100 + armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70) + desc = "This machine is exonet node." + var/list/logs = list() // Gets written to by exonet's send_message() function. + var/opened = FALSE + +/obj/machinery/exonet_node/Initialize() + . = ..() + SScircuit.all_exonet_nodes += src + +/obj/machinery/exonet_node/Destroy() + SScircuit.all_exonet_nodes -= src + return ..() + +/obj/machinery/exonet_node/proc/is_operating() + return on && !stat + +// Proc: update_icon() +// Parameters: None +// Description: Self explanatory. +/obj/machinery/exonet_node/update_icon() + icon_state = "[initial(icon_state)][on? "" : "_off"]" + +// Proc: update_power() +// Parameters: None +// Description: Sets the device on/off and adjusts power draw based on stat and toggle variables. +/obj/machinery/exonet_node/proc/update_power() + on = is_operational() && toggle + use_power = on + update_icon() + +// Proc: emp_act() +// Parameters: 1 (severity - how strong the EMP is, with lower numbers being stronger) +// Description: Shuts off the machine for awhile if an EMP hits it. Ion anomalies also call this to turn it off. +/obj/machinery/exonet_node/emp_act(severity) + if(!(stat & EMPED)) + stat |= EMPED + var/duration = (300 * 10)/severity + addtimer(CALLBACK(src, /obj/machinery/exonet_node/proc/unemp_act), rand(duration - 20, duration + 20)) + update_icon() + ..() + +/obj/machinery/exonet_node/proc/unemp_act(severity) + stat &= ~EMPED + +// Proc: attackby() +// Parameters: 2 (I - the item being whacked against the machine, user - the person doing the whacking) +// Description: Handles deconstruction. +/obj/machinery/exonet_node/attackby(obj/item/I, mob/user) + if(istype(I, /obj/item/screwdriver)) + default_deconstruction_screwdriver(user, I) + else if(istype(I, /obj/item/crowbar)) + default_deconstruction_crowbar(user, I) + else + return ..() + +// Proc: attack_ai() +// Parameters: 1 (user - the AI clicking on the machine) +// Description: Redirects to attack_hand() +/obj/machinery/exonet_node/attack_ai(mob/user) + ui_interact(user) + + +/obj/machinery/exonet_node/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, var/force_open = 1,datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "exonet_node", name, 600, 300, master_ui, state) + ui.open() + +/obj/machinery/exonet_node/ui_data(mob/user) + var/list/data = list() + data["toggle"] = toggle + data["logs"] = logs + return data + +/obj/machinery/exonet_node/ui_act(action, params) + if(..()) + return + switch(action) + if("toggle_power") + toggle = !toggle + update_power() + if(!toggle) + investigate_log("has been turned off by [key_name(usr)].", INVESTIGATE_EXONET) + . = TRUE + update_icon() + add_fingerprint(usr) + +// Proc: get_exonet_node() +// Parameters: None +// Description: Helper proc to get a reference to an Exonet node. + +/obj/machinery/exonet_node/proc/write_log(var/origin_address, var/target_address, var/data_type, var/content) + var/msg = "[time2text(world.time, "hh:mm:ss")] | FROM [origin_address] TO [target_address] | TYPE: [data_type] | CONTENT: [content]" + logs.Add(msg) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 83d51bae0c..39df6f409e 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -1,3 +1,5 @@ +#define FIREALARM_COOLDOWN 67 // Chosen fairly arbitrarily, it is the length of the audio in FireAlarm.ogg. The actual track length is 7 seconds 8ms but but the audio stops at 6s 700ms + /obj/item/electronics/firealarm name = "fire alarm electronics" desc = "A fire alarm circuit. Can handle heat levels up to 40 degrees celsius." @@ -25,7 +27,8 @@ var/detecting = 1 var/buildstage = 2 // 2 = complete, 1 = no wires, 0 = circuit gone resistance_flags = FIRE_PROOF - + var/last_alarm = 0 + var/area/myarea = null /obj/machinery/firealarm/New(loc, dir, building) ..() @@ -37,6 +40,12 @@ pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24) pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0 update_icon() + myarea = get_area(src) + LAZYADD(myarea.firealarms, src) + +/obj/machinery/firealarm/Destroy() + LAZYREMOVE(myarea.firealarms, src) + return ..() /obj/machinery/firealarm/power_change() ..() @@ -87,29 +96,24 @@ playsound(src, "sparks", 50, 1) /obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume) - if(!emagged && detecting && !stat && (temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT)) + if((temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT) && (last_alarm+FIREALARM_COOLDOWN < world.time) && !emagged && detecting && !stat) alarm() ..() /obj/machinery/firealarm/proc/alarm() - if(!is_operational()) + if(!is_operational() && (last_alarm+FIREALARM_COOLDOWN < world.time)) return + last_alarm = world.time var/area/A = get_area(src) A.firealert(src) playsound(src.loc, 'goon/sound/machinery/FireAlarm.ogg', 75) -/obj/machinery/firealarm/proc/alarm_in(time) - addtimer(CALLBACK(src, .proc/alarm), time) - /obj/machinery/firealarm/proc/reset() if(!is_operational()) return var/area/A = get_area(src) A.firereset(src) -/obj/machinery/firealarm/proc/reset_in(time) - addtimer(CALLBACK(src, .proc/reset), time) - /obj/machinery/firealarm/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) @@ -248,8 +252,14 @@ if(prob(33)) alarm() +/obj/machinery/firealarm/singularity_pull(S, current_size) + if (current_size >= STAGE_FIVE) // If the singulo is strong enough to pull anchored objects, the fire alarm experiences integrity failure + deconstruct() + ..() + /obj/machinery/firealarm/obj_break(damage_flag) if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1) && buildstage != 0) //can't break the electronics if there isn't any inside. + LAZYREMOVE(myarea.firealarms, src) stat |= BROKEN update_icon() diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index 3b4503c3c8..7de077c016 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -67,7 +67,7 @@ var/mob/thismob = i var/list/mob_info = list() mob_info["name"] = thismob.real_name - mob_info["mob"] = "\ref[thismob]" + mob_info["mob"] = "[REF(thismob)]" mobs += list(mob_info) data["mobs"] = mobs diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index f7a4138348..afc463a60e 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -120,8 +120,8 @@ Possible to do for anyone motivated enough: if(temp) dat = temp else - dat = "Request an AI's presence.
" - dat += "Call another holopad.
" + dat = "Request an AI's presence.
" + dat += "Call another holopad.
" if(LAZYLEN(holo_calls)) dat += "=====================================================
" @@ -131,7 +131,7 @@ Possible to do for anyone motivated enough: for(var/I in holo_calls) var/datum/holocall/HC = I if(HC.connected_holopad != src) - dat += "Answer call from [get_area(HC.calling_holopad)].
" + dat += "Answer call from [get_area(HC.calling_holopad)].
" one_unanswered_call = TRUE else one_answered_call = TRUE @@ -142,7 +142,7 @@ Possible to do for anyone motivated enough: for(var/I in holo_calls) var/datum/holocall/HC = I if(HC.connected_holopad == src) - dat += "Disconnect call from [HC.user].
" + dat += "Disconnect call from [HC.user].
" var/datum/browser/popup = new(user, "holopad", name, 300, 130) @@ -166,22 +166,22 @@ Possible to do for anyone motivated enough: if(last_request + 200 < world.time) last_request = world.time temp = "You requested an AI's presence.
" - temp += "Main Menu" + temp += "Main Menu" var/area/area = get_area(src) for(var/mob/living/silicon/ai/AI in GLOB.silicon_mobs) if(!AI.client) continue - to_chat(AI, "Your presence is requested at \the [area].") + to_chat(AI, "Your presence is requested at \the [area].") else temp = "A request for AI presence was already sent recently.
" - temp += "Main Menu" + temp += "Main Menu" else if(href_list["Holocall"]) if(outgoing_call) return temp = "You must stand on the holopad to make a call!
" - temp += "Main Menu" + temp += "Main Menu" if(usr.loc == loc) var/list/callnames = list() for(var/I in holopads) @@ -196,7 +196,7 @@ Possible to do for anyone motivated enough: if(usr.loc == loc) temp = "Dialing...
" - temp += "Main Menu" + temp += "Main Menu" new /datum/holocall(usr, src, callnames[result]) else if(href_list["connectcall"]) diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index b37be1c4c2..f31a2d2436 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -160,7 +160,7 @@ /obj/machinery/limbgrower/proc/main_win(mob/user) var/dat = "
" - dat += "Chemical Storage" + dat += "Chemical Storage" dat += materials_printout() dat += "
"
- dat += "
<< Back
" + dat += "
<< Back
" if(2) //req. supplies dat += "Which department do you need supplies from?
" @@ -160,13 +160,13 @@ GLOBAL_LIST_EMPTY(allConsoles) if (dpt != department) dat += ""
dat += "[dpt] "
- dat += "Normal High"
+ dat += " Normal High"
if(hackState)
- dat += "EXTREME"
+ dat += "EXTREME"
dat += " "
dat += " "
dat += "
" - dat += "Shotgun Pump" - dat += "Gunshot" - dat += "Esword" - dat += "Harm Alarm" + dat += "Air Horn " + dat += "Station Alert " + dat += "Warning Siren " + dat += "Honk
" + dat += "Shotgun Pump" + dat += "Gunshot" + dat += "Esword" + dat += "Harm Alarm" var/datum/browser/popup = new(user, "vending", "Radiance Dance Machine - Mark IV", 400, 350) popup.set_content(dat.Join()) popup.open() diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 889fe42cf7..780b7ac1f2 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -84,8 +84,8 @@ open_machine() /obj/machinery/dna_scannernew/proc/locate_computer(type_) - for(dir in list(NORTH,EAST,SOUTH,WEST)) - var/C = locate(type_, get_step(src, dir)) + for(var/direction in GLOB.cardinals) + var/C = locate(type_, get_step(src, direction)) if(C) return C return null diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index aac80cc1a0..4b8da75d87 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -39,8 +39,7 @@ #define NOT_ELECTRIFIED 0 #define ELECTRIFIED_PERMANENT -1 - - +#define AI_ELECTRIFY_DOOR_TIME 30 /obj/machinery/door/airlock name = "airlock" @@ -68,7 +67,7 @@ var/justzap = FALSE normalspeed = 1 var/obj/item/electronics/airlock/electronics = null - var/hasShocked = FALSE //Prevents multiple shocks from happening + var/shockCooldown = FALSE //Prevents multiple shocks from happening autoclose = TRUE var/obj/item/device/doorCharge/charge = null //If applied, causes an explosion upon opening the door var/obj/item/note //Any papers pinned to the airlock @@ -118,6 +117,15 @@ max_integrity = normal_integrity if(damage_deflection == AIRLOCK_DAMAGE_DEFLECTION_N && security_level > AIRLOCK_SECURITY_METAL) damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R + prepare_huds() + var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC] + diag_hud.add_to_hud(src) + diag_hud_set_electrified() + + return INITIALIZE_HINT_LATELOAD + +/obj/machinery/door/airlock/LateInitialize() + . = ..() if(abandoned) var/outcome = rand(1,100) switch(outcome) @@ -136,10 +144,6 @@ welded = TRUE if(24 to 30) panel_open = TRUE - prepare_huds() - var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC] - diag_hud.add_to_hud(src) - diag_hud_set_electrified() update_icon() @@ -359,6 +363,9 @@ /obj/machinery/door/airlock/proc/loseBackupPower() if(src.secondsBackupPowerLost < 60) src.secondsBackupPowerLost = 60 + if(!spawnPowerRestoreRunning) + spawnPowerRestoreRunning = TRUE + INVOKE_ASYNC(src, .proc/handlePowerRestore) /obj/machinery/door/airlock/proc/regainBackupPower() if(src.secondsBackupPowerLost > 0) @@ -370,14 +377,14 @@ /obj/machinery/door/airlock/proc/shock(mob/user, prb) if(!hasPower()) // unpowered, no shock return FALSE - if(hasShocked > world.time) + if(shockCooldown > world.time) return FALSE //Already shocked someone recently? if(!prob(prb)) return FALSE //you lucked out, no shock for you do_sparks(5, TRUE, src) var/tmp/check_range = TRUE if(electrocute_mob(user, get_area(src), src, 1, check_range)) - hasShocked = world.time + 10 + shockCooldown = world.time + 10 return TRUE else return FALSE @@ -607,110 +614,7 @@ to_chat(user, "Unable to interface. Airlock control panel damaged.") return - //Separate interface for the AI. - user.set_machine(src) - var/t1 = text("Airlock Control
\n") - if(src.secondsMainPowerLost > 0) - if(!wires.is_cut(WIRE_POWER1) && !wires.is_cut(WIRE_POWER2)) - t1 += text("Main power is offline for [] seconds.
\n", src.secondsMainPowerLost) - else - t1 += text("Main power is offline indefinitely.
\n") - else - t1 += text("Main power is online.") - - if(src.secondsBackupPowerLost > 0) - if(!wires.is_cut(WIRE_BACKUP1) && !wires.is_cut(WIRE_BACKUP2)) - t1 += text("Backup power is offline for [] seconds.
\n", src.secondsBackupPowerLost) - else - t1 += text("Backup power is offline indefinitely.
\n") - else if(src.secondsMainPowerLost > 0) - t1 += text("Backup power is online.") - else - t1 += text("Backup power is offline, but will turn on if main power fails.") - t1 += "
\n" - - if(wires.is_cut(WIRE_IDSCAN)) - t1 += text("IdScan wire is cut.
\n") - else if(src.aiDisabledIdScanner) - t1 += text("IdScan disabled. Enable?
\n", src) - else - t1 += text("IdScan enabled. Disable?
\n", src) - - if(src.emergency) - t1 += text("Emergency Access Override is enabled. Disable?
\n", src) - else - t1 += text("Emergency Access Override is disabled. Enable?
\n", src) - - if(wires.is_cut(WIRE_POWER1)) - t1 += text("Main Power Input wire is cut.
\n") - if(wires.is_cut(WIRE_POWER2)) - t1 += text("Main Power Output wire is cut.
\n") - if(!secondsMainPowerLost) - t1 += text("Temporarily disrupt main power?.
\n", src) - if(!secondsBackupPowerLost) - t1 += text("Temporarily disrupt backup power?.
\n", src) - - if(wires.is_cut(WIRE_BACKUP1)) - t1 += text("Backup Power Input wire is cut.
\n") - if(wires.is_cut(WIRE_BACKUP2)) - t1 += text("Backup Power Output wire is cut.
\n") - - if(wires.is_cut(WIRE_BOLTS)) - t1 += text("Door bolt drop wire is cut.
\n") - else if(!src.locked) - t1 += text("Door bolts are up. Drop them?
\n", src) - else - t1 += text("Door bolts are down.") - if(src.hasPower()) - t1 += text(" Raise?
\n", src) - else - t1 += text(" Cannot raise door bolts due to power failure.
\n") - - if(wires.is_cut(WIRE_LIGHT)) - t1 += text("Door bolt lights wire is cut.
\n") - else if(!src.lights) - t1 += text("Door bolt lights are off. Enable?
\n", src) - else - t1 += text("Door bolt lights are on. Disable?
\n", src) - - if(wires.is_cut(WIRE_SHOCK)) - t1 += text("Electrification wire is cut.
\n") - if(secondsElectrified==ELECTRIFIED_PERMANENT) - t1 += text("Door is electrified indefinitely. Un-electrify it?
\n", src) - else if(secondsElectrified>NOT_ELECTRIFIED) - t1 += text("Door is electrified temporarily ([] seconds). Un-electrify it?
\n", secondsElectrified, src) - else - t1 += text("Door is not electrified. Electrify it for 30 seconds? Or, Electrify it indefinitely until someone cancels the electrification?
\n", src, src) - - if(wires.is_cut(WIRE_SAFETY)) - t1 += text("Door force sensors not responding.
\n") - else if(src.safe) - t1 += text("Door safeties operating normally. Override?
\n",src) - else - t1 += text("Danger. Door safeties disabled. Restore?
\n",src) - - if(wires.is_cut(WIRE_TIMING)) - t1 += text("Door timing circuitry not responding.
\n") - else if(src.normalspeed) - t1 += text("Door timing circuitry operating normally. Override?
\n",src) - else - t1 += text("Warning. Door timing circuitry operating abnormally. Restore?
\n",src) - - if(src.welded) - t1 += text("Door appears to have been welded shut.
\n") - else if(!src.locked) - if(src.density) - t1 += text("Open door
\n", src) - else - t1 += text("Close door
\n", src) - - t1 += text("\n", src) - user << browse(t1, "window=airlock") - onclose(user, "airlock") - -//aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 11 lift access override -//aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 11 enable access override - + ui_interact(user) /obj/machinery/door/airlock/proc/hack(mob/user) set waitfor = 0 @@ -797,11 +701,18 @@ /obj/machinery/door/airlock/proc/electrified_loop() while (secondsElectrified > 0) - secondsElectrified-- - if(secondsElectrified <= 0) - set_electrified(NOT_ELECTRIFIED) - updateUsrDialog() - sleep(10) + sleep(10) + if(QDELETED(src)) + return + + secondsElectrified -= 1 + updateDialog() + // This is to protect against changing to permanent, mid loop. + if(secondsElectrified==0) + set_electrified(NOT_ELECTRIFIED) + else + set_electrified(ELECTRIFIED_PERMANENT) + updateDialog() /obj/machinery/door/airlock/Topic(href, href_list, var/nowindow = 0) // If you add an if(..()) check you must first remove the var/nowindow parameter. @@ -811,206 +722,16 @@ if(!usr.canUseTopic(src) && !IsAdminGhost(usr)) return add_fingerprint(usr) - if(href_list["close"]) - usr << browse(null, "window=airlock") - if(usr.machine==src) - usr.unset_machine() - return if((in_range(src, usr) && isturf(loc)) && panel_open) usr.set_machine(src) - - - if((issilicon(usr) && src.canAIControl(usr)) || IsAdminGhost(usr)) - //AI - //aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 8 door safties, 9 door speed, 11 emergency access - //aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 8 door safties, 9 door speed, 11 emergency access - if(href_list["aiDisable"]) - var/code = text2num(href_list["aiDisable"]) - switch (code) - if(1) - //disable idscan - if(wires.is_cut(WIRE_IDSCAN)) - to_chat(usr, "The IdScan wire has been cut - So, you can't disable it, but it is already disabled anyways.") - else if(src.aiDisabledIdScanner) - to_chat(usr, "You've already disabled the IdScan feature.") - else - aiDisabledIdScanner = TRUE - if(2) - //disrupt main power - if(!secondsMainPowerLost) - src.loseMainPower() - update_icon() - else - to_chat(usr, "Main power is already offline.") - if(3) - //disrupt backup power - if(!secondsBackupPowerLost) - src.loseBackupPower() - update_icon() - else - to_chat(usr, "Backup power is already offline.") - if(4) - //drop door bolts - if(wires.is_cut(WIRE_BOLTS)) - to_chat(usr, "You can't drop the door bolts - The door bolt dropping wire has been cut.") - else - bolt() - if(5) - //un-electrify door - if(wires.is_cut(WIRE_SHOCK)) - to_chat(usr, text("Can't un-electrify the airlock - The electrification wire is cut.")) - else if(isElectrified()) - set_electrified(0) - - if(8) - // Safeties! We don't need no stinking safeties! - if(wires.is_cut(WIRE_SAFETY)) - to_chat(usr, text("Control to door sensors is disabled.")) - else if (src.safe) - safe = FALSE - else - to_chat(usr, text("Firmware reports safeties already overriden.")) - - if(9) - // Door speed control - if(wires.is_cut(WIRE_TIMING)) - to_chat(usr, text("Control to door timing circuitry has been severed.")) - else if (src.normalspeed) - normalspeed = 0 - else - to_chat(usr, text("Door timing circuitry already accelerated.")) - if(7) - //close door - if(src.welded) - to_chat(usr, text("The airlock has been welded shut!")) - else if(src.locked) - to_chat(usr, text("The door bolts are down!")) - else if(!src.density) - close() - else - open() - - if(10) - // Bolt lights - if(wires.is_cut(WIRE_LIGHT)) - to_chat(usr, text("Control to door bolt lights has been severed.")) - else if (src.lights) - lights = FALSE - update_icon() - else - to_chat(usr, text("Door bolt lights are already disabled!")) - - if(11) - // Emergency access - if (src.emergency) - emergency = FALSE - update_icon() - else - to_chat(usr, text("Emergency access is already disabled!")) - - - else if(href_list["aiEnable"]) - var/code = text2num(href_list["aiEnable"]) - switch (code) - if(1) - //enable idscan - if(wires.is_cut(WIRE_IDSCAN)) - to_chat(usr, "You can't enable IdScan - The IdScan wire has been cut.") - else if(src.aiDisabledIdScanner) - aiDisabledIdScanner = FALSE - else - to_chat(usr, "The IdScan feature is not disabled.") - if(4) - //raise door bolts - if(wires.is_cut(WIRE_BOLTS)) - to_chat(usr, text("The door bolt drop wire is cut - you can't raise the door bolts.
\n")) - else if(!src.locked) - to_chat(usr, text("The door bolts are already up.
\n")) - else - if(src.hasPower()) - unbolt() - else - to_chat(usr, text("Cannot raise door bolts due to power failure.
\n")) - - if(5) - //electrify door for 30 seconds - if(wires.is_cut(WIRE_SHOCK)) - to_chat(usr, text("The electrification wire has been cut.
\n")) - else if(secondsElectrified==ELECTRIFIED_PERMANENT) - to_chat(usr, text("The door is already indefinitely electrified. You'd have to un-electrify it before you can re-electrify it with a non-forever duration.
\n")) - else if(isElectrified()) - to_chat(usr, text("The door is already electrified. You can't re-electrify it while it's already electrified.
\n")) - else - shockedby += "\[[time_stamp()]\][usr](ckey:[usr.ckey])" - add_logs(usr, src, "electrified") - set_electrified(30) - addtimer(CALLBACK(src, .proc/electrified_loop), 10) - if(6) - //electrify door indefinitely - if(wires.is_cut(WIRE_SHOCK)) - to_chat(usr, text("The electrification wire has been cut.
\n")) - else if(secondsElectrified==ELECTRIFIED_PERMANENT) - to_chat(usr, text("The door is already indefinitely electrified.
\n")) - else if(isElectrified()) - to_chat(usr, text("The door is already electrified. You can't re-electrify it while it's already electrified.
\n")) - else - shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])") - add_logs(usr, src, "electrified") - set_electrified(ELECTRIFIED_PERMANENT) - - if (8) // Not in order >.> - // Safeties! Maybe we do need some stinking safeties! - if(wires.is_cut(WIRE_SAFETY)) - to_chat(usr, text("Control to door sensors is disabled.")) - else if (!src.safe) - safe = TRUE - src.updateUsrDialog() - else - to_chat(usr, text("Firmware reports safeties already in place.")) - - if(9) - // Door speed control - if(wires.is_cut(WIRE_TIMING)) - to_chat(usr, text("Control to door timing circuitry has been severed.")) - else if (!src.normalspeed) - normalspeed = 1 - src.updateUsrDialog() - else - to_chat(usr, text("Door timing circuitry currently operating normally.")) - - if(7) - //open door - if(src.welded) - to_chat(usr, text("The airlock has been welded shut!")) - else if(src.locked) - to_chat(usr, text("The door bolts are down!")) - else if(src.density) - open() - else - close() - if(10) - // Bolt lights - if(wires.is_cut(WIRE_LIGHT)) - to_chat(usr, text("Control to door bolt lights has been severed.")) - else if (!src.lights) - lights = TRUE - update_icon() - src.updateUsrDialog() - else - to_chat(usr, text("Door bolt lights are already enabled!")) - if(11) - // Emergency access - if (!src.emergency) - emergency = TRUE - update_icon() - else - to_chat(usr, text("Emergency access is already enabled!")) - add_fingerprint(usr) if(!nowindow) updateUsrDialog() + else + updateDialog() + /obj/machinery/door/airlock/attackby(obj/item/C, mob/user, params) if(!issilicon(user) && !IsAdminGhost(user)) @@ -1566,6 +1287,8 @@ /obj/machinery/door/airlock/proc/set_electrified(seconds) secondsElectrified = seconds diag_hud_set_electrified() + if(secondsElectrified > 0) + INVOKE_ASYNC(src, .proc/electrified_loop) /obj/machinery/door/airlock/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() @@ -1631,6 +1354,243 @@ else if(istype(note, /obj/item/photo)) return "photo" +/obj/machinery/door/airlock/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ + datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "ai_airlock", name, 550, 456, master_ui, state) + ui.open() + +/obj/machinery/door/airlock/ui_data() + var/list/data = list() + + var/list/power = list() + power["main"] = src.secondsMainPowerLost ? 0 : 2 // boolean + power["main_timeleft"] = src.secondsMainPowerLost + power["backup"] = src.secondsBackupPowerLost ? 0 : 2 // boolean + power["backup_timeleft"] = src.secondsBackupPowerLost + data["power"] = power + + data["shock"] = secondsElectrified == 0 ? 2 : 0 + data["shock_timeleft"] = secondsElectrified + data["id_scanner"] = !aiDisabledIdScanner + data["emergency"] = emergency // access + data["locked"] = locked // bolted + data["lights"] = lights // bolt lights + data["safe"] = safe // safeties + data["speed"] = normalspeed // safe speed + data["welded"] = welded // welded + data["opened"] = !density // opened + + var/list/wire = list() + wire["main_1"] = !wires.is_cut(WIRE_POWER1) + wire["main_2"] = !wires.is_cut(WIRE_POWER2) + wire["backup_1"] = !wires.is_cut(WIRE_BACKUP1) + wire["backup_2"] = !wires.is_cut(WIRE_BACKUP2) + wire["shock"] = !wires.is_cut(WIRE_SHOCK) + wire["id_scanner"] = !wires.is_cut(WIRE_IDSCAN) + wire["bolts"] = !wires.is_cut(WIRE_BOLTS) + wire["lights"] = !wires.is_cut(WIRE_LIGHT) + wire["safe"] = !wires.is_cut(WIRE_SAFETY) + wire["timing"] = !wires.is_cut(WIRE_TIMING) + + data["wires"] = wire + return data + +/obj/machinery/door/airlock/ui_act(action, params) + if(..()) + return + if(!user_allowed(usr)) + return + switch(action) + if("disrupt-main") + if(!secondsMainPowerLost) + loseMainPower() + update_icon() + else + to_chat(usr, "Main power is already offline.") + . = TRUE + if("disrupt-backup") + if(!secondsBackupPowerLost) + loseBackupPower() + update_icon() + else + to_chat(usr, "Backup power is already offline.") + . = TRUE + if("shock-restore") + shock_restore(usr) + . = TRUE + if("shock-temp") + shock_temp(usr) + . = TRUE + if("shock-perm") + shock_perm(usr) + . = TRUE + if("idscan-on") + if(wires.is_cut(WIRE_IDSCAN)) + to_chat(usr, "You can't enable IdScan - The IdScan wire has been cut.") + else if(src.aiDisabledIdScanner) + aiDisabledIdScanner = FALSE + else + to_chat(usr, "The IdScan feature is not disabled.") + . = TRUE + if("idscan-off") + if(wires.is_cut(WIRE_IDSCAN)) + to_chat(usr, "The IdScan wire has been cut - So, you can't disable it, but it is already disabled anyways.") + else if(aiDisabledIdScanner) + to_chat(usr, "You've already disabled the IdScan feature.") + else + aiDisabledIdScanner = TRUE + . = TRUE + if("emergency-on") + emergency_on(usr) + . = TRUE + if("emergency-off") + emergency_off(usr) + . = TRUE + if("bolt-raise") + bolt_raise(usr) + . = TRUE + if("bolt-drop") + bolt_drop(usr) + . = TRUE + if("light-on") + if(wires.is_cut(WIRE_LIGHT)) + to_chat(usr, "Control to door bolt lights has been severed.") + else if (!src.lights) + lights = TRUE + update_icon() + else + to_chat(usr, text("Door bolt lights are already enabled!")) + . = TRUE + if("light-off") + if(wires.is_cut(WIRE_LIGHT)) + to_chat(usr, "Control to door bolt lights has been severed.") + else if (lights) + lights = FALSE + update_icon() + else + to_chat(usr, "Door bolt lights are already disabled!") + . = TRUE + if("safe-on") + if(wires.is_cut(WIRE_SAFETY)) + to_chat(usr, "Control to door sensors is disabled.") + else if (!src.safe) + safe = TRUE + else + to_chat(usr, "Firmware reports safeties already in place.") + . = TRUE + if("safe-off") + if(wires.is_cut(WIRE_SAFETY)) + to_chat(usr, "Control to door sensors is disabled.") + else if (safe) + safe = FALSE + else + to_chat(usr, "Firmware reports safeties already overriden.") + . = TRUE + if("speed-on") + if(wires.is_cut(WIRE_TIMING)) + to_chat(usr, "Control to door timing circuitry has been severed.") + else if (!src.normalspeed) + normalspeed = 1 + else + to_chat(usr,"Door timing circuitry currently operating normally.") + . = TRUE + if("speed-off") + if(wires.is_cut(WIRE_TIMING)) + to_chat(usr, "Control to door timing circuitry has been severed.") + else if (normalspeed) + normalspeed = 0 + else + to_chat(usr, "Door timing circuitry already accelerated.") + + . = TRUE + if("open-close") + user_toggle_open(usr) + . = TRUE + +/obj/machinery/door/airlock/proc/user_allowed(mob/user) + return (issilicon(user) && canAIControl(user)) || IsAdminGhost(user) + +/obj/machinery/door/airlock/proc/shock_restore(mob/user) + if(!user_allowed(user)) + return + if(wires.is_cut(WIRE_SHOCK)) + to_chat(user, "Can't un-electrify the airlock - The electrification wire is cut.") + else if(isElectrified()) + set_electrified(0) + +/obj/machinery/door/airlock/proc/shock_temp(mob/user) + if(!user_allowed(user)) + return + if(wires.is_cut(WIRE_SHOCK)) + to_chat(user, "The electrification wire has been cut") + else + shockedby += "\[[time_stamp()]\][user](ckey:[user.ckey])" + add_logs(user, src, "electrified") + set_electrified(AI_ELECTRIFY_DOOR_TIME) + +/obj/machinery/door/airlock/proc/shock_perm(mob/user) + if(!user_allowed(user)) + return + if(wires.is_cut(WIRE_SHOCK)) + to_chat(user, "The electrification wire has been cut") + else + shockedby += text("\[[time_stamp()]\][user](ckey:[user.ckey])") + add_logs(user, src, "electrified") + set_electrified(ELECTRIFIED_PERMANENT) + +/obj/machinery/door/airlock/proc/emergency_on(mob/user) + if(!user_allowed(user)) + return + if (!emergency) + emergency = TRUE + update_icon() + else + to_chat(user, "Emergency access is already enabled!") + +/obj/machinery/door/airlock/proc/emergency_off(mob/user) + if(!user_allowed(user)) + return + if (emergency) + emergency = FALSE + update_icon() + else + to_chat(user, "Emergency access is already disabled!") + +/obj/machinery/door/airlock/proc/bolt_raise(mob/user) + if(!user_allowed(user)) + return + if(wires.is_cut(WIRE_BOLTS)) + to_chat(user, "The door bolt drop wire is cut - you can't raise the door bolts") + else if(!src.locked) + to_chat(user, "The door bolts are already up") + else + if(src.hasPower()) + unbolt() + else + to_chat(user, "Cannot raise door bolts due to power failure") + +/obj/machinery/door/airlock/proc/bolt_drop(mob/user) + if(!user_allowed(user)) + return + if(wires.is_cut(WIRE_BOLTS)) + to_chat(user, "You can't drop the door bolts - The door bolt dropping wire has been cut.") + else + bolt() + +/obj/machinery/door/airlock/proc/user_toggle_open(mob/user) + if(!user_allowed(user)) + return + if(welded) + to_chat(user, text("The airlock has been welded shut!")) + else if(locked) + to_chat(user, text("The door bolts are down!")) + else if(!density) + close() + else + open() + #undef AIRLOCK_CLOSED #undef AIRLOCK_CLOSING #undef AIRLOCK_OPEN @@ -1653,3 +1613,4 @@ #undef NOT_ELECTRIFIED #undef ELECTRIFIED_PERMANENT +#undef AI_ELECTRIFY_DOOR_TIME diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 883cc3986f..fa6275809d 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -103,7 +103,7 @@ move_update_air(T) /obj/machinery/door/CanPass(atom/movable/mover, turf/target) - if(istype(mover) && mover.checkpass(PASSGLASS)) + if(istype(mover) && (mover.pass_flags & PASSGLASS)) return !opacity return !density diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 63da575fc1..ad746d089f 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -212,7 +212,7 @@ CanAtmosPass = ATMOS_PASS_PROC /obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target) - if(istype(mover) && mover.checkpass(PASSGLASS)) + if(istype(mover) && (mover.pass_flags & PASSGLASS)) return 1 if(get_dir(loc, target) == dir) //Make sure looking at appropriate border return !density @@ -220,7 +220,7 @@ return 1 /obj/machinery/door/firedoor/border_only/CheckExit(atom/movable/mover as mob|obj, turf/target) - if(istype(mover) && mover.checkpass(PASSGLASS)) + if(istype(mover) && (mover.pass_flags & PASSGLASS)) return 1 if(get_dir(loc, target) == dir) return !density diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 4809f3ff49..2313afec3b 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -90,7 +90,7 @@ return /obj/machinery/door/window/CanPass(atom/movable/mover, turf/target) - if(istype(mover) && mover.checkpass(PASSGLASS)) + if(istype(mover) && (mover.pass_flags & PASSGLASS)) return 1 if(get_dir(loc, target) == dir) //Make sure looking at appropriate border return !density @@ -118,7 +118,7 @@ return !density || (dir != to_dir) || (check_access(ID) && hasPower()) /obj/machinery/door/window/CheckExit(atom/movable/mover as mob|obj, turf/target) - if(istype(mover) && mover.checkpass(PASSGLASS)) + if(istype(mover) && (mover.pass_flags & PASSGLASS)) return 1 if(get_dir(loc, target) == dir) return !density diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 5e0d018554..e243494f2b 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -277,29 +277,29 @@ if(!exteriorAirlock || !interiorAirlock) if(!exteriorAirlock) if(interiorAirlock.density) - output = "Open Interior Airlock
" + output = "Open Interior Airlock
" else - output = "Close Interior Airlock
" + output = "Close Interior Airlock
" else if(exteriorAirlock.density) - output = "Open Exterior Airlock
" + output = "Open Exterior Airlock
" else - output = "Close Exterior Airlock
" + output = "Close Exterior Airlock
" else if(exteriorAirlock.density) if(interiorAirlock.density) - output = {"Open Exterior Airlock
- Open Interior Airlock
"} + output = {"Open Exterior Airlock
+ Open Interior Airlock
"} else - output = {"Cycle to Exterior Airlock
- Close Interior Airlock
"} + output = {"Cycle to Exterior Airlock
+ Close Interior Airlock
"} else if(interiorAirlock.density) - output = {"Close Exterior Airlock
- Cycle to Interior Airlock
"} + output = {"Close Exterior Airlock
+ Cycle to Interior Airlock
"} else - output = {"Close Exterior Airlock
- Close Interior Airlock
"} + output = {"Close Exterior Airlock
+ Close Interior Airlock
"} output = {"Access Control Console
diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index 59d58bc9a5..f34191370d 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -1,296 +1,296 @@ -//States for airlock_control -#define AIRLOCK_STATE_INOPEN -2 -#define AIRLOCK_STATE_PRESSURIZE -1 -#define AIRLOCK_STATE_CLOSED 0 -#define AIRLOCK_STATE_DEPRESSURIZE 1 -#define AIRLOCK_STATE_OUTOPEN 2 - -/datum/computer/file/embedded_program/airlock_controller - var/id_tag - var/exterior_door_tag - var/interior_door_tag - var/airpump_tag - var/sensor_tag - var/sanitize_external - - state = AIRLOCK_STATE_CLOSED - var/target_state = AIRLOCK_STATE_CLOSED - var/sensor_pressure = null - -/datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal, receive_method, receive_param) - var/receive_tag = signal.data["tag"] - if(!receive_tag) - return - - if(receive_tag==sensor_tag) - if(signal.data["pressure"]) - sensor_pressure = text2num(signal.data["pressure"]) - - else if(receive_tag==exterior_door_tag) - memory["exterior_status"] = signal.data["door_status"] - - else if(receive_tag==interior_door_tag) - memory["interior_status"] = signal.data["door_status"] - - else if(receive_tag==airpump_tag) - if(signal.data["power"]) - memory["pump_status"] = signal.data["direction"] - else - memory["pump_status"] = "off" - - else if(receive_tag==id_tag) - switch(signal.data["command"]) - if("cycle") - if(state < AIRLOCK_STATE_CLOSED) - target_state = AIRLOCK_STATE_OUTOPEN - else - target_state = AIRLOCK_STATE_INOPEN - -/datum/computer/file/embedded_program/airlock_controller/receive_user_command(command) - switch(command) - if("cycle_closed") - target_state = AIRLOCK_STATE_CLOSED - if("cycle_exterior") - target_state = AIRLOCK_STATE_OUTOPEN - if("cycle_interior") - target_state = AIRLOCK_STATE_INOPEN - if("abort") - target_state = AIRLOCK_STATE_CLOSED - -/datum/computer/file/embedded_program/airlock_controller/process() - var/process_again = 1 - while(process_again) - process_again = 0 - switch(state) - if(AIRLOCK_STATE_INOPEN) // state -2 - if(target_state > state) - if(memory["interior_status"] == "closed") - state = AIRLOCK_STATE_CLOSED - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - signal.data["command"] = "secure_close" - post_signal(signal) - else - if(memory["pump_status"] != "off") - var/datum/signal/signal = new - signal.data = list( - "tag" = airpump_tag, - "power" = 0, - "sigtype"="command" - ) - post_signal(signal) - - if(AIRLOCK_STATE_PRESSURIZE) - if(target_state < state) - if(sensor_pressure >= ONE_ATMOSPHERE*0.95) - if(memory["interior_status"] == "open") - state = AIRLOCK_STATE_INOPEN - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - signal.data["command"] = "secure_open" - post_signal(signal) - else - var/datum/signal/signal = new - signal.data = list( - "tag" = airpump_tag, - "sigtype"="command" - ) - if(memory["pump_status"] == "siphon") - signal.data["stabalize"] = 1 - else if(memory["pump_status"] != "release") - signal.data["power"] = 1 - post_signal(signal) - else if(target_state > state) - state = AIRLOCK_STATE_CLOSED - process_again = 1 - - if(AIRLOCK_STATE_CLOSED) - if(target_state > state) - if(memory["interior_status"] == "closed") - state = AIRLOCK_STATE_DEPRESSURIZE - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - signal.data["command"] = "secure_close" - post_signal(signal) - else if(target_state < state) - if(memory["exterior_status"] == "closed") - state = AIRLOCK_STATE_PRESSURIZE - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - signal.data["command"] = "secure_close" - post_signal(signal) - - else - if(memory["pump_status"] != "off") - var/datum/signal/signal = new - signal.data = list( - "tag" = airpump_tag, - "power" = 0, - "sigtype"="command" - ) - post_signal(signal) - - if(AIRLOCK_STATE_DEPRESSURIZE) - var/target_pressure = ONE_ATMOSPHERE*0.05 - if(sanitize_external) - target_pressure = ONE_ATMOSPHERE*0.01 - - if(sensor_pressure <= target_pressure) - if(target_state > state) - if(memory["exterior_status"] == "open") - state = AIRLOCK_STATE_OUTOPEN - else - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - signal.data["command"] = "secure_open" - post_signal(signal) - else if(target_state < state) - state = AIRLOCK_STATE_CLOSED - process_again = 1 - else if((target_state < state) && !sanitize_external) - state = AIRLOCK_STATE_CLOSED - process_again = 1 - else - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.data = list( - "tag" = airpump_tag, - "sigtype"="command" - ) - if(memory["pump_status"] == "release") - signal.data["purge"] = 1 - else if(memory["pump_status"] != "siphon") - signal.data["power"] = 1 - post_signal(signal) - - if(AIRLOCK_STATE_OUTOPEN) //state 2 - if(target_state < state) - if(memory["exterior_status"] == "closed") - if(sanitize_external) - state = AIRLOCK_STATE_DEPRESSURIZE - process_again = 1 - else - state = AIRLOCK_STATE_CLOSED - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - signal.data["command"] = "secure_close" - post_signal(signal) - else - if(memory["pump_status"] != "off") - var/datum/signal/signal = new - signal.data = list( - "tag" = airpump_tag, - "power" = 0, - "sigtype"="command" - ) - post_signal(signal) - - memory["sensor_pressure"] = sensor_pressure - memory["processing"] = state != target_state - //sensor_pressure = null //not sure if we can comment this out. Uncomment in case of problems -rastaf0 - - return 1 - - -/obj/machinery/embedded_controller/radio/airlock_controller - icon = 'icons/obj/airlock_machines.dmi' - icon_state = "airlock_control_standby" - - name = "airlock console" - density = FALSE - - frequency = 1449 - power_channel = ENVIRON - - // Setup parameters only - var/id_tag - var/exterior_door_tag - var/interior_door_tag - var/airpump_tag - var/sensor_tag - var/sanitize_external - -/obj/machinery/embedded_controller/radio/airlock_controller/Initialize(mapload) - . = ..() - if(!mapload) - return - - var/datum/computer/file/embedded_program/airlock_controller/new_prog = new - - new_prog.id_tag = id_tag - new_prog.exterior_door_tag = exterior_door_tag - new_prog.interior_door_tag = interior_door_tag - new_prog.airpump_tag = airpump_tag - new_prog.sensor_tag = sensor_tag - new_prog.sanitize_external = sanitize_external - - new_prog.master = src - program = new_prog - -/obj/machinery/embedded_controller/radio/airlock_controller/update_icon() - if(on && program) - if(program.memory["processing"]) - icon_state = "airlock_control_process" - else - icon_state = "airlock_control_standby" - else - icon_state = "airlock_control_off" - - -/obj/machinery/embedded_controller/radio/airlock_controller/return_text() - var/state_options = null - - var/state = 0 - var/sensor_pressure = "----" - var/exterior_status = "----" - var/interior_status = "----" - var/pump_status = "----" - var/current_status = "Inactive
" - if(program) - state = program.state - sensor_pressure = program.memory["sensor_pressure"] ? program.memory["sensor_pressure"] : "----" - exterior_status = program.memory["exterior_status"] ? program.memory["exterior_status"] : "----" - interior_status = program.memory["interior_status"] ? program.memory["interior_status"] : "----" - pump_status = program.memory["pump_status"] ? program.memory["pump_status"] : "----" - - switch(state) - if(AIRLOCK_STATE_INOPEN) - state_options = {"Close Interior Airlock
-Cycle to Exterior Airlock
"} - current_status = "Interior Airlock Open
Chamber Pressurized" - if(AIRLOCK_STATE_PRESSURIZE) - state_options = "Abort Cycling
" - current_status = "Cycling to Interior Airlock
Chamber Pressurizing" - if(AIRLOCK_STATE_CLOSED) - state_options = {"Open Interior Airlock
-Open Exterior Airlock
"} - if(AIRLOCK_STATE_DEPRESSURIZE) - state_options = "Abort Cycling
" - current_status = "Cycling to Exterior Airlock
Chamber Depressurizing" - if(AIRLOCK_STATE_OUTOPEN) - state_options = {"Cycle to Interior Airlock
-Close Exterior Airlock
"} - current_status = "Exterior Airlock Open
Chamber Depressurized" - - var/output = {"
Airlock Status
-
-
-
-
-
-
-
-
-[state_options]"}
-
- return output
+//States for airlock_control
+#define AIRLOCK_STATE_INOPEN -2
+#define AIRLOCK_STATE_PRESSURIZE -1
+#define AIRLOCK_STATE_CLOSED 0
+#define AIRLOCK_STATE_DEPRESSURIZE 1
+#define AIRLOCK_STATE_OUTOPEN 2
+
+/datum/computer/file/embedded_program/airlock_controller
+ var/id_tag
+ var/exterior_door_tag
+ var/interior_door_tag
+ var/airpump_tag
+ var/sensor_tag
+ var/sanitize_external
+
+ state = AIRLOCK_STATE_CLOSED
+ var/target_state = AIRLOCK_STATE_CLOSED
+ var/sensor_pressure = null
+
+/datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal, receive_method, receive_param)
+ var/receive_tag = signal.data["tag"]
+ if(!receive_tag)
+ return
+
+ if(receive_tag==sensor_tag)
+ if(signal.data["pressure"])
+ sensor_pressure = text2num(signal.data["pressure"])
+
+ else if(receive_tag==exterior_door_tag)
+ memory["exterior_status"] = signal.data["door_status"]
+
+ else if(receive_tag==interior_door_tag)
+ memory["interior_status"] = signal.data["door_status"]
+
+ else if(receive_tag==airpump_tag)
+ if(signal.data["power"])
+ memory["pump_status"] = signal.data["direction"]
+ else
+ memory["pump_status"] = "off"
+
+ else if(receive_tag==id_tag)
+ switch(signal.data["command"])
+ if("cycle")
+ if(state < AIRLOCK_STATE_CLOSED)
+ target_state = AIRLOCK_STATE_OUTOPEN
+ else
+ target_state = AIRLOCK_STATE_INOPEN
+
+/datum/computer/file/embedded_program/airlock_controller/receive_user_command(command)
+ switch(command)
+ if("cycle_closed")
+ target_state = AIRLOCK_STATE_CLOSED
+ if("cycle_exterior")
+ target_state = AIRLOCK_STATE_OUTOPEN
+ if("cycle_interior")
+ target_state = AIRLOCK_STATE_INOPEN
+ if("abort")
+ target_state = AIRLOCK_STATE_CLOSED
+
+/datum/computer/file/embedded_program/airlock_controller/process()
+ var/process_again = 1
+ while(process_again)
+ process_again = 0
+ switch(state)
+ if(AIRLOCK_STATE_INOPEN) // state -2
+ if(target_state > state)
+ if(memory["interior_status"] == "closed")
+ state = AIRLOCK_STATE_CLOSED
+ process_again = 1
+ else
+ var/datum/signal/signal = new
+ signal.data["tag"] = interior_door_tag
+ signal.data["command"] = "secure_close"
+ post_signal(signal)
+ else
+ if(memory["pump_status"] != "off")
+ var/datum/signal/signal = new
+ signal.data = list(
+ "tag" = airpump_tag,
+ "power" = 0,
+ "sigtype"="command"
+ )
+ post_signal(signal)
+
+ if(AIRLOCK_STATE_PRESSURIZE)
+ if(target_state < state)
+ if(sensor_pressure >= ONE_ATMOSPHERE*0.95)
+ if(memory["interior_status"] == "open")
+ state = AIRLOCK_STATE_INOPEN
+ process_again = 1
+ else
+ var/datum/signal/signal = new
+ signal.data["tag"] = interior_door_tag
+ signal.data["command"] = "secure_open"
+ post_signal(signal)
+ else
+ var/datum/signal/signal = new
+ signal.data = list(
+ "tag" = airpump_tag,
+ "sigtype"="command"
+ )
+ if(memory["pump_status"] == "siphon")
+ signal.data["stabalize"] = 1
+ else if(memory["pump_status"] != "release")
+ signal.data["power"] = 1
+ post_signal(signal)
+ else if(target_state > state)
+ state = AIRLOCK_STATE_CLOSED
+ process_again = 1
+
+ if(AIRLOCK_STATE_CLOSED)
+ if(target_state > state)
+ if(memory["interior_status"] == "closed")
+ state = AIRLOCK_STATE_DEPRESSURIZE
+ process_again = 1
+ else
+ var/datum/signal/signal = new
+ signal.data["tag"] = interior_door_tag
+ signal.data["command"] = "secure_close"
+ post_signal(signal)
+ else if(target_state < state)
+ if(memory["exterior_status"] == "closed")
+ state = AIRLOCK_STATE_PRESSURIZE
+ process_again = 1
+ else
+ var/datum/signal/signal = new
+ signal.data["tag"] = exterior_door_tag
+ signal.data["command"] = "secure_close"
+ post_signal(signal)
+
+ else
+ if(memory["pump_status"] != "off")
+ var/datum/signal/signal = new
+ signal.data = list(
+ "tag" = airpump_tag,
+ "power" = 0,
+ "sigtype"="command"
+ )
+ post_signal(signal)
+
+ if(AIRLOCK_STATE_DEPRESSURIZE)
+ var/target_pressure = ONE_ATMOSPHERE*0.05
+ if(sanitize_external)
+ target_pressure = ONE_ATMOSPHERE*0.01
+
+ if(sensor_pressure <= target_pressure)
+ if(target_state > state)
+ if(memory["exterior_status"] == "open")
+ state = AIRLOCK_STATE_OUTOPEN
+ else
+ var/datum/signal/signal = new
+ signal.data["tag"] = exterior_door_tag
+ signal.data["command"] = "secure_open"
+ post_signal(signal)
+ else if(target_state < state)
+ state = AIRLOCK_STATE_CLOSED
+ process_again = 1
+ else if((target_state < state) && !sanitize_external)
+ state = AIRLOCK_STATE_CLOSED
+ process_again = 1
+ else
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.data = list(
+ "tag" = airpump_tag,
+ "sigtype"="command"
+ )
+ if(memory["pump_status"] == "release")
+ signal.data["purge"] = 1
+ else if(memory["pump_status"] != "siphon")
+ signal.data["power"] = 1
+ post_signal(signal)
+
+ if(AIRLOCK_STATE_OUTOPEN) //state 2
+ if(target_state < state)
+ if(memory["exterior_status"] == "closed")
+ if(sanitize_external)
+ state = AIRLOCK_STATE_DEPRESSURIZE
+ process_again = 1
+ else
+ state = AIRLOCK_STATE_CLOSED
+ process_again = 1
+ else
+ var/datum/signal/signal = new
+ signal.data["tag"] = exterior_door_tag
+ signal.data["command"] = "secure_close"
+ post_signal(signal)
+ else
+ if(memory["pump_status"] != "off")
+ var/datum/signal/signal = new
+ signal.data = list(
+ "tag" = airpump_tag,
+ "power" = 0,
+ "sigtype"="command"
+ )
+ post_signal(signal)
+
+ memory["sensor_pressure"] = sensor_pressure
+ memory["processing"] = state != target_state
+ //sensor_pressure = null //not sure if we can comment this out. Uncomment in case of problems -rastaf0
+
+ return 1
+
+
+/obj/machinery/embedded_controller/radio/airlock_controller
+ icon = 'icons/obj/airlock_machines.dmi'
+ icon_state = "airlock_control_standby"
+
+ name = "airlock console"
+ density = FALSE
+
+ frequency = 1449
+ power_channel = ENVIRON
+
+ // Setup parameters only
+ var/id_tag
+ var/exterior_door_tag
+ var/interior_door_tag
+ var/airpump_tag
+ var/sensor_tag
+ var/sanitize_external
+
+/obj/machinery/embedded_controller/radio/airlock_controller/Initialize(mapload)
+ . = ..()
+ if(!mapload)
+ return
+
+ var/datum/computer/file/embedded_program/airlock_controller/new_prog = new
+
+ new_prog.id_tag = id_tag
+ new_prog.exterior_door_tag = exterior_door_tag
+ new_prog.interior_door_tag = interior_door_tag
+ new_prog.airpump_tag = airpump_tag
+ new_prog.sensor_tag = sensor_tag
+ new_prog.sanitize_external = sanitize_external
+
+ new_prog.master = src
+ program = new_prog
+
+/obj/machinery/embedded_controller/radio/airlock_controller/update_icon()
+ if(on && program)
+ if(program.memory["processing"])
+ icon_state = "airlock_control_process"
+ else
+ icon_state = "airlock_control_standby"
+ else
+ icon_state = "airlock_control_off"
+
+
+/obj/machinery/embedded_controller/radio/airlock_controller/return_text()
+ var/state_options = null
+
+ var/state = 0
+ var/sensor_pressure = "----"
+ var/exterior_status = "----"
+ var/interior_status = "----"
+ var/pump_status = "----"
+ var/current_status = "InactiveCurrent Status:
[current_status]
\> Chamber Pressure:
[sensor_pressure] kPa
\> Control Pump:
[pump_status]
\> Interior Door:
[interior_status]
\> Exterior Door:
[exterior_status]
" + if(program) + state = program.state + sensor_pressure = program.memory["sensor_pressure"] ? program.memory["sensor_pressure"] : "----" + exterior_status = program.memory["exterior_status"] ? program.memory["exterior_status"] : "----" + interior_status = program.memory["interior_status"] ? program.memory["interior_status"] : "----" + pump_status = program.memory["pump_status"] ? program.memory["pump_status"] : "----" + + switch(state) + if(AIRLOCK_STATE_INOPEN) + state_options = {"Close Interior Airlock
+Cycle to Exterior Airlock
"} + current_status = "Interior Airlock Open
Chamber Pressurized" + if(AIRLOCK_STATE_PRESSURIZE) + state_options = "Abort Cycling
" + current_status = "Cycling to Interior Airlock
Chamber Pressurizing" + if(AIRLOCK_STATE_CLOSED) + state_options = {"Open Interior Airlock
+Open Exterior Airlock
"} + if(AIRLOCK_STATE_DEPRESSURIZE) + state_options = "Abort Cycling
" + current_status = "Cycling to Exterior Airlock
Chamber Depressurizing" + if(AIRLOCK_STATE_OUTOPEN) + state_options = {"Cycle to Interior Airlock
+Close Exterior Airlock
"} + current_status = "Exterior Airlock Open
Chamber Depressurized" + + var/output = {"
Airlock Status
+
+
+
+
+
+
+
+
+[state_options]"}
+
+ return output
diff --git a/code/game/machinery/embedded_controller/simple_vent_controller.dm b/code/game/machinery/embedded_controller/simple_vent_controller.dm
index 063e81354c..af945c7ccb 100644
--- a/code/game/machinery/embedded_controller/simple_vent_controller.dm
+++ b/code/game/machinery/embedded_controller/simple_vent_controller.dm
@@ -1,79 +1,79 @@
-/datum/computer/file/embedded_program/simple_vent_controller
-
- var/airpump_tag
-
-/datum/computer/file/embedded_program/simple_vent_controller/receive_user_command(command)
- switch(command)
- if("vent_inactive")
- var/datum/signal/signal = new
- signal.data = list(
- "tag" = airpump_tag,
- "sigtype"="command"
- )
- signal.data["power"] = 0
- post_signal(signal)
-
- if("vent_pump")
- var/datum/signal/signal = new
- signal.data = list(
- "tag" = airpump_tag,
- "sigtype"="command"
- )
- signal.data["stabalize"] = 1
- signal.data["power"] = 1
- post_signal(signal)
-
- if("vent_clear")
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.data = list(
- "tag" = airpump_tag,
- "sigtype"="command"
- )
- signal.data["purge"] = 1
- signal.data["power"] = 1
- post_signal(signal)
-
-/datum/computer/file/embedded_program/simple_vent_controller/process()
- return 0
-
-
-/obj/machinery/embedded_controller/radio/simple_vent_controller
- icon = 'icons/obj/airlock_machines.dmi'
- icon_state = "airlock_control_standby"
-
- name = "vent controller"
+/datum/computer/file/embedded_program/simple_vent_controller
+
+ var/airpump_tag
+
+/datum/computer/file/embedded_program/simple_vent_controller/receive_user_command(command)
+ switch(command)
+ if("vent_inactive")
+ var/datum/signal/signal = new
+ signal.data = list(
+ "tag" = airpump_tag,
+ "sigtype"="command"
+ )
+ signal.data["power"] = 0
+ post_signal(signal)
+
+ if("vent_pump")
+ var/datum/signal/signal = new
+ signal.data = list(
+ "tag" = airpump_tag,
+ "sigtype"="command"
+ )
+ signal.data["stabalize"] = 1
+ signal.data["power"] = 1
+ post_signal(signal)
+
+ if("vent_clear")
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.data = list(
+ "tag" = airpump_tag,
+ "sigtype"="command"
+ )
+ signal.data["purge"] = 1
+ signal.data["power"] = 1
+ post_signal(signal)
+
+/datum/computer/file/embedded_program/simple_vent_controller/process()
+ return 0
+
+
+/obj/machinery/embedded_controller/radio/simple_vent_controller
+ icon = 'icons/obj/airlock_machines.dmi'
+ icon_state = "airlock_control_standby"
+
+ name = "vent controller"
density = FALSE
-
- frequency = 1229
- power_channel = ENVIRON
-
- // Setup parameters only
- var/airpump_tag
-
-/obj/machinery/embedded_controller/radio/simple_vent_controller/Initialize(mapload)
+
+ frequency = 1229
+ power_channel = ENVIRON
+
+ // Setup parameters only
+ var/airpump_tag
+
+/obj/machinery/embedded_controller/radio/simple_vent_controller/Initialize(mapload)
. = ..()
- if(!mapload)
- return
- var/datum/computer/file/embedded_program/simple_vent_controller/new_prog = new
-
- new_prog.airpump_tag = airpump_tag
- new_prog.master = src
- program = new_prog
-
-/obj/machinery/embedded_controller/radio/simple_vent_controller/update_icon()
- if(on && program)
- icon_state = "airlock_control_standby"
- else
- icon_state = "airlock_control_off"
-
-
-/obj/machinery/embedded_controller/radio/simple_vent_controller/return_text()
- var/state_options = null
- state_options = {"Deactivate VentCurrent Status:
[current_status]
\> Chamber Pressure:
[sensor_pressure] kPa
\> Control Pump:
[pump_status]
\> Interior Door:
[interior_status]
\> Exterior Door:
[exterior_status]
-Activate Vent / Pump
-Activate Vent / Clear
"} - var/output = {"Vent Control Console
-[state_options]
"} - - return output + if(!mapload) + return + var/datum/computer/file/embedded_program/simple_vent_controller/new_prog = new + + new_prog.airpump_tag = airpump_tag + new_prog.master = src + program = new_prog + +/obj/machinery/embedded_controller/radio/simple_vent_controller/update_icon() + if(on && program) + icon_state = "airlock_control_standby" + else + icon_state = "airlock_control_off" + + +/obj/machinery/embedded_controller/radio/simple_vent_controller/return_text() + var/state_options = null + state_options = {"Deactivate Vent
+Activate Vent / Pump
+Activate Vent / Clear
"} + var/output = {"Vent Control Console
+[state_options]
"} + + return output diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm new file mode 100644 index 0000000000..b521f404ce --- /dev/null +++ b/code/game/machinery/exonet_node.dm @@ -0,0 +1,106 @@ +/obj/machinery/exonet_node + name = "exonet node" + icon = 'icons/obj/stationobjs.dmi' + icon_state = "exonet_node" + idle_power_usage = 25 + var/on = TRUE + var/toggle = TRUE + density = TRUE + anchored = TRUE + circuit = /obj/item/circuitboard/machine/exonet_node + max_integrity = 300 + integrity_failure = 100 + armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70) + desc = "This machine is exonet node." + var/list/logs = list() // Gets written to by exonet's send_message() function. + var/opened = FALSE + +/obj/machinery/exonet_node/Initialize() + . = ..() + SScircuit.all_exonet_nodes += src + +/obj/machinery/exonet_node/Destroy() + SScircuit.all_exonet_nodes -= src + return ..() + +/obj/machinery/exonet_node/proc/is_operating() + return on && !stat + +// Proc: update_icon() +// Parameters: None +// Description: Self explanatory. +/obj/machinery/exonet_node/update_icon() + icon_state = "[initial(icon_state)][on? "" : "_off"]" + +// Proc: update_power() +// Parameters: None +// Description: Sets the device on/off and adjusts power draw based on stat and toggle variables. +/obj/machinery/exonet_node/proc/update_power() + on = is_operational() && toggle + use_power = on + update_icon() + +// Proc: emp_act() +// Parameters: 1 (severity - how strong the EMP is, with lower numbers being stronger) +// Description: Shuts off the machine for awhile if an EMP hits it. Ion anomalies also call this to turn it off. +/obj/machinery/exonet_node/emp_act(severity) + if(!(stat & EMPED)) + stat |= EMPED + var/duration = (300 * 10)/severity + addtimer(CALLBACK(src, /obj/machinery/exonet_node/proc/unemp_act), rand(duration - 20, duration + 20)) + update_icon() + ..() + +/obj/machinery/exonet_node/proc/unemp_act(severity) + stat &= ~EMPED + +// Proc: attackby() +// Parameters: 2 (I - the item being whacked against the machine, user - the person doing the whacking) +// Description: Handles deconstruction. +/obj/machinery/exonet_node/attackby(obj/item/I, mob/user) + if(istype(I, /obj/item/screwdriver)) + default_deconstruction_screwdriver(user, I) + else if(istype(I, /obj/item/crowbar)) + default_deconstruction_crowbar(user, I) + else + return ..() + +// Proc: attack_ai() +// Parameters: 1 (user - the AI clicking on the machine) +// Description: Redirects to attack_hand() +/obj/machinery/exonet_node/attack_ai(mob/user) + ui_interact(user) + + +/obj/machinery/exonet_node/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, var/force_open = 1,datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "exonet_node", name, 600, 300, master_ui, state) + ui.open() + +/obj/machinery/exonet_node/ui_data(mob/user) + var/list/data = list() + data["toggle"] = toggle + data["logs"] = logs + return data + +/obj/machinery/exonet_node/ui_act(action, params) + if(..()) + return + switch(action) + if("toggle_power") + toggle = !toggle + update_power() + if(!toggle) + investigate_log("has been turned off by [key_name(usr)].", INVESTIGATE_EXONET) + . = TRUE + update_icon() + add_fingerprint(usr) + +// Proc: get_exonet_node() +// Parameters: None +// Description: Helper proc to get a reference to an Exonet node. + +/obj/machinery/exonet_node/proc/write_log(var/origin_address, var/target_address, var/data_type, var/content) + var/msg = "[time2text(world.time, "hh:mm:ss")] | FROM [origin_address] TO [target_address] | TYPE: [data_type] | CONTENT: [content]" + logs.Add(msg) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 83d51bae0c..39df6f409e 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -1,3 +1,5 @@ +#define FIREALARM_COOLDOWN 67 // Chosen fairly arbitrarily, it is the length of the audio in FireAlarm.ogg. The actual track length is 7 seconds 8ms but but the audio stops at 6s 700ms + /obj/item/electronics/firealarm name = "fire alarm electronics" desc = "A fire alarm circuit. Can handle heat levels up to 40 degrees celsius." @@ -25,7 +27,8 @@ var/detecting = 1 var/buildstage = 2 // 2 = complete, 1 = no wires, 0 = circuit gone resistance_flags = FIRE_PROOF - + var/last_alarm = 0 + var/area/myarea = null /obj/machinery/firealarm/New(loc, dir, building) ..() @@ -37,6 +40,12 @@ pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24) pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0 update_icon() + myarea = get_area(src) + LAZYADD(myarea.firealarms, src) + +/obj/machinery/firealarm/Destroy() + LAZYREMOVE(myarea.firealarms, src) + return ..() /obj/machinery/firealarm/power_change() ..() @@ -87,29 +96,24 @@ playsound(src, "sparks", 50, 1) /obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume) - if(!emagged && detecting && !stat && (temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT)) + if((temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT) && (last_alarm+FIREALARM_COOLDOWN < world.time) && !emagged && detecting && !stat) alarm() ..() /obj/machinery/firealarm/proc/alarm() - if(!is_operational()) + if(!is_operational() && (last_alarm+FIREALARM_COOLDOWN < world.time)) return + last_alarm = world.time var/area/A = get_area(src) A.firealert(src) playsound(src.loc, 'goon/sound/machinery/FireAlarm.ogg', 75) -/obj/machinery/firealarm/proc/alarm_in(time) - addtimer(CALLBACK(src, .proc/alarm), time) - /obj/machinery/firealarm/proc/reset() if(!is_operational()) return var/area/A = get_area(src) A.firereset(src) -/obj/machinery/firealarm/proc/reset_in(time) - addtimer(CALLBACK(src, .proc/reset), time) - /obj/machinery/firealarm/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) @@ -248,8 +252,14 @@ if(prob(33)) alarm() +/obj/machinery/firealarm/singularity_pull(S, current_size) + if (current_size >= STAGE_FIVE) // If the singulo is strong enough to pull anchored objects, the fire alarm experiences integrity failure + deconstruct() + ..() + /obj/machinery/firealarm/obj_break(damage_flag) if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1) && buildstage != 0) //can't break the electronics if there isn't any inside. + LAZYREMOVE(myarea.firealarms, src) stat |= BROKEN update_icon() diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index 3b4503c3c8..7de077c016 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -67,7 +67,7 @@ var/mob/thismob = i var/list/mob_info = list() mob_info["name"] = thismob.real_name - mob_info["mob"] = "\ref[thismob]" + mob_info["mob"] = "[REF(thismob)]" mobs += list(mob_info) data["mobs"] = mobs diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index f7a4138348..afc463a60e 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -120,8 +120,8 @@ Possible to do for anyone motivated enough: if(temp) dat = temp else - dat = "Request an AI's presence.
" - dat += "Call another holopad.
" + dat = "Request an AI's presence.
" + dat += "Call another holopad.
" if(LAZYLEN(holo_calls)) dat += "=====================================================
" @@ -131,7 +131,7 @@ Possible to do for anyone motivated enough: for(var/I in holo_calls) var/datum/holocall/HC = I if(HC.connected_holopad != src) - dat += "Answer call from [get_area(HC.calling_holopad)].
" + dat += "Answer call from [get_area(HC.calling_holopad)].
" one_unanswered_call = TRUE else one_answered_call = TRUE @@ -142,7 +142,7 @@ Possible to do for anyone motivated enough: for(var/I in holo_calls) var/datum/holocall/HC = I if(HC.connected_holopad == src) - dat += "Disconnect call from [HC.user].
" + dat += "Disconnect call from [HC.user].
" var/datum/browser/popup = new(user, "holopad", name, 300, 130) @@ -166,22 +166,22 @@ Possible to do for anyone motivated enough: if(last_request + 200 < world.time) last_request = world.time temp = "You requested an AI's presence.
" - temp += "Main Menu" + temp += "Main Menu" var/area/area = get_area(src) for(var/mob/living/silicon/ai/AI in GLOB.silicon_mobs) if(!AI.client) continue - to_chat(AI, "Your presence is requested at \the [area].") + to_chat(AI, "Your presence is requested at \the [area].") else temp = "A request for AI presence was already sent recently.
" - temp += "Main Menu" + temp += "Main Menu" else if(href_list["Holocall"]) if(outgoing_call) return temp = "You must stand on the holopad to make a call!
" - temp += "Main Menu" + temp += "Main Menu" if(usr.loc == loc) var/list/callnames = list() for(var/I in holopads) @@ -196,7 +196,7 @@ Possible to do for anyone motivated enough: if(usr.loc == loc) temp = "Dialing...
" - temp += "Main Menu" + temp += "Main Menu" new /datum/holocall(usr, src, callnames[result]) else if(href_list["connectcall"]) diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index b37be1c4c2..f31a2d2436 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -160,7 +160,7 @@ /obj/machinery/limbgrower/proc/main_win(mob/user) var/dat = "
Limb Grower Menu:
" - dat += "Chemical Storage" + dat += "Chemical Storage" dat += materials_printout() dat += "
| [C] | " + dat += "[C] | " dat += "|
| [dpt] | " - dat += "Normal High" + dat += " | Normal High" if(hackState) - dat += "EXTREME" + dat += "EXTREME" dat += " | " dat += "
<< Back
" + dat += "
<< Back
" if(2) //req. supplies dat += "Which department do you need supplies from?
" @@ -160,13 +160,13 @@ GLOBAL_LIST_EMPTY(allConsoles) if (dpt != department) dat += "
<< Back
" + dat += "
<< Back
" if(3) //relay information dat += "Which department would you like to send information to?
" @@ -175,21 +175,21 @@ GLOBAL_LIST_EMPTY(allConsoles) if (dpt != department) dat += "
<< Back
" + dat += "
<< Back
" if(6) //sent successfully dat += "Message sent.
" - dat += "Continue
" + dat += "Continue
" if(7) //unsuccessful; not sent dat += "An error occurred.
" - dat += "Continue
" + dat += "Continue
" if(8) //view messages for (var/obj/machinery/requests_console/Console in GLOB.allConsoles) @@ -203,7 +203,7 @@ GLOBAL_LIST_EMPTY(allConsoles) for(var/msg in messages) // This puts more recent messages at the *top*, where they belong. messageComposite = "
[msg]
" + messageComposite
dat += messageComposite
- dat += "<< Back to Main Menu
" + dat += "
<< Back to Main Menu
" if(9) //authentication before sending dat += "Message Authentication
" @@ -211,8 +211,8 @@ GLOBAL_LIST_EMPTY(allConsoles) dat += "
You may authenticate your message now by scanning your ID or your stamp
" dat += "Validated by: [msgVerified ? msgVerified : "Not Validated"]
" dat += "Stamped by: [msgStamped ? msgStamped : "Not Stamped"]
" - dat += "Send Message
" - dat += "
<< Discard Message
" + dat += "Send Message
" + dat += "
<< Discard Message
" if(10) //send announcement dat += "
Station-wide Announcement
" @@ -221,12 +221,12 @@ GLOBAL_LIST_EMPTY(allConsoles) else dat += "Swipe your card to authenticate yourself
" dat += "Message: [message ? message : "No Message"]
" - dat += "[message ? "Edit" : "Write"] Message
" + dat += "[message ? "Edit" : "Write"] Message
" if ((announceAuth || IsAdminGhost(user)) && message) - dat += "Announce Message
" + dat += "Announce Message
" else dat += "Announce Message
" - dat += "
<< Back
" + dat += "
<< Back
" else //main menu screen = 0 @@ -237,25 +237,25 @@ GLOBAL_LIST_EMPTY(allConsoles) dat += "
There are new PRIORITY messages
" if (newmessagepriority == 3) dat += "
There are new EXTREME PRIORITY messages
" - dat += "View Messages
" + dat += "View Messages
" - dat += "Request Assistance
" - dat += "Request Supplies
" - dat += "Relay Anonymous Information
" + dat += "Request Assistance
" + dat += "Request Supplies
" + dat += "Relay Anonymous Information
" if(!emergency) - dat += "Emergency: Security
" - dat += "Emergency: Engineering
" - dat += "Emergency: Medical
" + dat += "Emergency: Security
" + dat += "Emergency: Engineering
" + dat += "Emergency: Medical
" else dat += "[emergency] has been dispatched to this location.
" if(announcementConsole) - dat += "Send Station-wide Announcement
" + dat += "Send Station-wide Announcement
" if (silent) - dat += "Speaker OFF" + dat += "Speaker OFF" else - dat += "Speaker ON" + dat += "Speaker ON" var/datum/browser/popup = new(user, "req_console", "[department] Requests Console", 450, 440) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) @@ -454,7 +454,7 @@ GLOBAL_LIST_EMPTY(allConsoles) var/linkedsender if(istype(source, /obj/machinery/requests_console)) var/obj/machinery/requests_console/sender = source - linkedsender = "[sender.department]" + linkedsender = "[sender.department]" else capitalize(source) linkedsender = source diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 20fd729304..606f64c7f3 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -58,13 +58,13 @@ Please wait until completion...
dat = {" Metal Amount: [min(150000, src.metal_amount)] cm3 (MAX: 150,000)
-Left Arm (25,000 cc metal.)
-Right Arm (25,000 cc metal.)
-Left Leg (25,000 cc metal.)
-Right Leg (25,000 cc metal).
-Chest (50,000 cc metal).
-Head (50,000 cc metal).
-Robot Frame (75,000 cc metal).
+Left Arm (25,000 cc metal.)
+Right Arm (25,000 cc metal.)
+Left Leg (25,000 cc metal.)
+Right Leg (25,000 cc metal).
+Chest (50,000 cc metal).
+Head (50,000 cc metal).
+Robot Frame (75,000 cc metal).
"} user << browse("
[plays] players have tried their luck today, and [jackpots] have won a jackpot!
- Play!
+ Play!
[reeltext]
- Refund balance
"} + Refund balance
"} var/datum/browser/popup = new(user, "slotmachine", "Slot Machine") popup.set_content(dat) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 79d000a6ec..f8f980a1ee 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -1,133 +1,133 @@ -//////////////////////////////////////// -//Singularity beacon -//////////////////////////////////////// -/obj/machinery/power/singularity_beacon - name = "ominous beacon" - desc = "This looks suspicious..." - icon = 'icons/obj/singularity.dmi' - icon_state = "beacon" - - anchored = FALSE - density = TRUE - layer = BELOW_MOB_LAYER //so people can't hide it and it's REALLY OBVIOUS - stat = 0 - verb_say = "states" - var/cooldown = 0 - - var/active = 0 - var/icontype = "beacon" - - -/obj/machinery/power/singularity_beacon/proc/Activate(mob/user = null) - if(surplus() < 1500) - if(user) - to_chat(user, "The connected wire doesn't have enough current.") - return - for(var/obj/singularity/singulo in GLOB.singularities) - if(singulo.z == z) - singulo.target = src - icon_state = "[icontype]1" - active = 1 - if(user) - to_chat(user, "You activate the beacon.") - - -/obj/machinery/power/singularity_beacon/proc/Deactivate(mob/user = null) - for(var/obj/singularity/singulo in GLOB.singularities) - if(singulo.target == src) - singulo.target = null - icon_state = "[icontype]0" - active = 0 - if(user) - to_chat(user, "You deactivate the beacon.") - - -/obj/machinery/power/singularity_beacon/attack_ai(mob/user) - return - - -/obj/machinery/power/singularity_beacon/attack_hand(mob/user) - if(anchored) - return active ? Deactivate(user) : Activate(user) - else - to_chat(user, "You need to screw the beacon to the floor first!") - return - - -/obj/machinery/power/singularity_beacon/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/screwdriver)) - if(active) - to_chat(user, "You need to deactivate the beacon first!") - return - - if(anchored) - anchored = FALSE - to_chat(user, "You unscrew the beacon from the floor.") - disconnect_from_network() - return - else - if(!connect_to_network()) - to_chat(user, "This device must be placed over an exposed, powered cable node!") - return - anchored = TRUE - to_chat(user, "You screw the beacon to the floor and attach the cable.") - return - else - return ..() - -/obj/machinery/power/singularity_beacon/Destroy() - if(active) - Deactivate() - return ..() - -//stealth direct power usage -/obj/machinery/power/singularity_beacon/process() - if(!active) - return - - if(surplus() > 1500) - add_load(1500) - if(cooldown <= world.time) - cooldown = world.time + 100 - for(var/obj/singularity/singulo in GLOB.singularities) - if(singulo.z == z) - say("The [singulo] is now [get_dist(src,singulo)] standard lengths away to the [dir2text(get_dir(src,singulo))]") - else - Deactivate() - say("Insufficient charge detected - powering down") - - -/obj/machinery/power/singularity_beacon/syndicate - icontype = "beaconsynd" - icon_state = "beaconsynd0" - -// SINGULO BEACON SPAWNER -/obj/item/device/sbeacondrop - name = "suspicious beacon" - icon = 'icons/obj/radio.dmi' - icon_state = "beacon" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' - desc = "A label on it reads: Warning: Activating this device will send a special beacon to your location." - origin_tech = "bluespace=6;syndicate=5" - w_class = WEIGHT_CLASS_SMALL - var/droptype = /obj/machinery/power/singularity_beacon/syndicate - - -/obj/item/device/sbeacondrop/attack_self(mob/user) - if(user) - to_chat(user, "Locked In.") - new droptype( user.loc ) - playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) - qdel(src) - return - -/obj/item/device/sbeacondrop/bomb - desc = "A label on it reads: Warning: Activating this device will send a high-ordinance explosive to your location." - droptype = /obj/machinery/syndicatebomb - origin_tech = "bluespace=5;syndicate=5" - -/obj/item/device/sbeacondrop/powersink - desc = "A label on it reads: Warning: Activating this device will send a power draining device to your location." - droptype = /obj/item/device/powersink - origin_tech = "bluespace=4;syndicate=5" +//////////////////////////////////////// +//Singularity beacon +//////////////////////////////////////// +/obj/machinery/power/singularity_beacon + name = "ominous beacon" + desc = "This looks suspicious..." + icon = 'icons/obj/singularity.dmi' + icon_state = "beacon" + + anchored = FALSE + density = TRUE + layer = BELOW_MOB_LAYER //so people can't hide it and it's REALLY OBVIOUS + stat = 0 + verb_say = "states" + var/cooldown = 0 + + var/active = 0 + var/icontype = "beacon" + + +/obj/machinery/power/singularity_beacon/proc/Activate(mob/user = null) + if(surplus() < 1500) + if(user) + to_chat(user, "The connected wire doesn't have enough current.") + return + for(var/obj/singularity/singulo in GLOB.singularities) + if(singulo.z == z) + singulo.target = src + icon_state = "[icontype]1" + active = 1 + if(user) + to_chat(user, "You activate the beacon.") + + +/obj/machinery/power/singularity_beacon/proc/Deactivate(mob/user = null) + for(var/obj/singularity/singulo in GLOB.singularities) + if(singulo.target == src) + singulo.target = null + icon_state = "[icontype]0" + active = 0 + if(user) + to_chat(user, "You deactivate the beacon.") + + +/obj/machinery/power/singularity_beacon/attack_ai(mob/user) + return + + +/obj/machinery/power/singularity_beacon/attack_hand(mob/user) + if(anchored) + return active ? Deactivate(user) : Activate(user) + else + to_chat(user, "You need to screw the beacon to the floor first!") + return + + +/obj/machinery/power/singularity_beacon/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/screwdriver)) + if(active) + to_chat(user, "You need to deactivate the beacon first!") + return + + if(anchored) + anchored = FALSE + to_chat(user, "You unscrew the beacon from the floor.") + disconnect_from_network() + return + else + if(!connect_to_network()) + to_chat(user, "This device must be placed over an exposed, powered cable node!") + return + anchored = TRUE + to_chat(user, "You screw the beacon to the floor and attach the cable.") + return + else + return ..() + +/obj/machinery/power/singularity_beacon/Destroy() + if(active) + Deactivate() + return ..() + +//stealth direct power usage +/obj/machinery/power/singularity_beacon/process() + if(!active) + return + + if(surplus() > 1500) + add_load(1500) + if(cooldown <= world.time) + cooldown = world.time + 80 + for(var/obj/singularity/singulo in GLOB.singularities) + if(singulo.z == z) + say("[singulo] is now [get_dist(src,singulo)] standard lengths away to the [dir2text(get_dir(src,singulo))]") + else + Deactivate() + say("Insufficient charge detected - powering down") + + +/obj/machinery/power/singularity_beacon/syndicate + icontype = "beaconsynd" + icon_state = "beaconsynd0" + +// SINGULO BEACON SPAWNER +/obj/item/device/sbeacondrop + name = "suspicious beacon" + icon = 'icons/obj/radio.dmi' + icon_state = "beacon" + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + desc = "A label on it reads: Warning: Activating this device will send a special beacon to your location." + origin_tech = "bluespace=6;syndicate=5" + w_class = WEIGHT_CLASS_SMALL + var/droptype = /obj/machinery/power/singularity_beacon/syndicate + + +/obj/item/device/sbeacondrop/attack_self(mob/user) + if(user) + to_chat(user, "Locked In.") + new droptype( user.loc ) + playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) + qdel(src) + return + +/obj/item/device/sbeacondrop/bomb + desc = "A label on it reads: Warning: Activating this device will send a high-ordinance explosive to your location." + droptype = /obj/machinery/syndicatebomb + origin_tech = "bluespace=5;syndicate=5" + +/obj/item/device/sbeacondrop/powersink + desc = "A label on it reads: Warning: Activating this device will send a power draining device to your location." + droptype = /obj/item/device/powersink + origin_tech = "bluespace=4;syndicate=5" diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 0718548b03..bdd34e8d23 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -140,7 +140,7 @@ if(open_panel && wires.is_all_cut()) if(payload) to_chat(user, "You carefully pry out [payload].") - payload.loc = user.loc + payload.forceMove(drop_location()) payload = null else to_chat(user, "There isn't anything in here to remove!") @@ -206,14 +206,14 @@ var/new_timer = input(user, "Please set the timer.", "Timer", "[timer_set]") as num if(in_range(src, user) && isliving(user)) //No running off and setting bombs from across the station timer_set = Clamp(new_timer, minimum_timer, maximum_timer) - src.loc.visible_message("[icon2html(src, viewers(src))] timer set for [timer_set] seconds.") + loc.visible_message("[icon2html(src, viewers(src))] timer set for [timer_set] seconds.") if(alert(user,"Would you like to start the countdown now?",,"Yes","No") == "Yes" && in_range(src, user) && isliving(user)) if(defused || active) if(defused) - src.loc.visible_message("[icon2html(src, viewers(src))] Device error: User intervention required.") + visible_message("[icon2html(src, viewers(src))] Device error: User intervention required.") return else - src.loc.visible_message("[icon2html(src, viewers(loc))] [timer_set] seconds until detonation, please clear the area.") + visible_message("[icon2html(src, viewers(loc))] [timer_set] seconds until detonation, please clear the area.") activate() update_icon() add_fingerprint(user) @@ -223,7 +223,7 @@ if(payload && !istype(payload, /obj/item/bombcore/training)) message_admins("[ADMIN_LOOKUPFLW(user)] has primed a [name] ([payload]) for detonation at [A.name] [ADMIN_JMP(bombturf)].") log_game("[key_name(user)] has primed a [name] ([payload]) for detonation at [A.name][COORD(bombturf)]") - payload.adminlog = "The [src.name] that [key_name(user)] had primed detonated!" + payload.adminlog = "The [name] that [key_name(user)] had primed detonated!" ///Bomb Subtypes/// @@ -359,7 +359,7 @@ var/amt_summon = 1 /obj/item/bombcore/badmin/summon/detonate() - var/obj/machinery/syndicatebomb/B = src.loc + var/obj/machinery/syndicatebomb/B = loc spawn_and_random_walk(summon_path, src, amt_summon, walk_chance=50, admin_spawn=TRUE) qdel(B) qdel(src) @@ -369,7 +369,7 @@ amt_summon = 100 /obj/item/bombcore/badmin/summon/clown/defuse() - playsound(src.loc, 'sound/misc/sadtrombone.ogg', 50) + playsound(src, 'sound/misc/sadtrombone.ogg', 50) ..() /obj/item/bombcore/large @@ -454,7 +454,7 @@ if(istype(I, /obj/item/crowbar) && beakers.len > 0) playsound(loc, I.usesound, 50, 1) for (var/obj/item/B in beakers) - B.loc = get_turf(src) + B.forceMove(drop_location()) beakers -= B return else if(istype(I, /obj/item/reagent_containers/glass/beaker) || istype(I, /obj/item/reagent_containers/glass/bottle)) @@ -485,9 +485,9 @@ for(var/obj/item/slime_extract/S in LG.beakers) // And slime cores. if(beakers.len < max_beakers) beakers += S - S.loc = src + S.forceMove(src) else - S.loc = get_turf(src) + S.forceMove(drop_location()) if(istype(G, /obj/item/grenade/chem_grenade/cryo)) spread_range -= 1 // Reduced range, but increased density. @@ -502,9 +502,9 @@ for(var/obj/item/reagent_containers/glass/B in G) if(beakers.len < max_beakers) beakers += B - B.loc = src + B.forceMove(src) else - B.loc = get_turf(src) + B.forceMove(drop_location()) qdel(G) diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 590c8d03a5..93f9d2b03a 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -30,23 +30,23 @@ if(0) dat += "
[temp]
" - dat += "
Current Network: [network]
" + dat += "
Current Network: [network]
" if(servers.len) dat += "
Detected Telecommunication Servers:
- "
for(var/obj/machinery/telecomms/T in servers)
- dat += "
- \ref[T] [T.name] ([T.id]) " + dat += "
- [REF(T)] [T.name] ([T.id]) " dat += "
\[Flush Buffer\]" + dat += "
\[Flush Buffer\]" else - dat += "
No servers detected. Scan for servers: \[Scan\]" + dat += "
No servers detected. Scan for servers: \[Scan\]" // --- Viewing Server --- if(1) dat += "
[temp]
" - dat += "
Current Network: [network]" dat += "
Selected Server: [SelectedServer.id]" @@ -65,7 +65,7 @@ // If the log is a speech file if(C.input_type == "Speech File") - dat += "
" + dat += "
" // -- Determine race of orator -- @@ -128,7 +128,7 @@ else if(C.input_type == "Execution Error") - dat += "
" + dat += "
" dat += "Output: \"[C.parameters["message"]]\"
" dat += "
" diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm index cb3ae78e72..c5c53888fc 100644 --- a/code/game/machinery/telecomms/computers/telemonitor.dm +++ b/code/game/machinery/telecomms/computers/telemonitor.dm @@ -32,28 +32,28 @@ if(0) dat += "
[temp]
" - dat += "
Current Network: [network]
" + dat += "
Current Network: [network]
" if(machinelist.len) dat += "
Detected Network Entities:
- "
for(var/obj/machinery/telecomms/T in machinelist)
- dat += "
- \ref[T] [T.name] ([T.id]) " + dat += "
- [REF(T)] [T.name] ([T.id]) " dat += "
\[Flush Buffer\]" + dat += "
\[Flush Buffer\]" else - dat += "\[Probe Network\]" + dat += "\[Probe Network\]" // --- Viewing Machine --- if(1) dat += "
[temp]
" - dat += "
Current Network: [network]
" dat += "Selected Network Entity: [SelectedMachine.name] ([SelectedMachine.id])
" dat += "Linked Entities:
- "
for(var/obj/machinery/telecomms/T in SelectedMachine.links)
if(!T.hide)
- dat += "
- \ref[T.id] [T.name] ([T.id]) " + dat += "
- [REF(T.id)] [T.name] ([T.id]) " dat += "
[name] Access
[temp]
" - dat += "
Power Status: [toggled ? "On" : "Off"]" + dat += "
Power Status: [toggled ? "On" : "Off"]" if(on && toggled) if(id != "" && id) - dat += "
Identification String: [id]" + dat += "
Identification String: [id]" else - dat += "
Identification String: NULL" - dat += "
Network: [network]" + dat += "
Identification String: NULL" + dat += "
Network: [network]" dat += "
Prefabrication: [autolinkers.len ? "TRUE" : "FALSE"]" if(hide) dat += "
Shadow Link: ACTIVE" @@ -73,7 +73,7 @@ i++ if(T.hide && !hide) continue - dat += "
Filtering Frequencies: " @@ -83,21 +83,21 @@ for(var/x in freq_listening) i++ if(i < length(freq_listening)) - dat += "[format_frequency(x)] GHz\[X\]; " + dat += "[format_frequency(x)] GHz\[X\]; " else - dat += "[format_frequency(x)] GHz\[X\]" + dat += "[format_frequency(x)] GHz\[X\]" else dat += "NONE" - dat += "
\[Add Filter\]" + dat += "
\[Add Filter\]" dat += "
" if(P) var/obj/machinery/telecomms/T = P.buffer if(istype(T)) - dat += "
MULTITOOL BUFFER: [T] ([T.id]) \[Link\] \[Flush\]" + dat += "
MULTITOOL BUFFER: [T] ([T.id]) \[Link\] \[Flush\]" else - dat += "
MULTITOOL BUFFER: \[Add Machine\]" + dat += "
MULTITOOL BUFFER: \[Add Machine\]" dat += "" temp = "" @@ -151,8 +151,8 @@ /obj/machinery/telecomms/relay/Options_Menu() var/dat = "" - dat += "
Broadcasting: [broadcasting ? "YES" : "NO"]" - dat += "
Receiving: [receiving ? "YES" : "NO"]" + dat += "
Broadcasting: [broadcasting ? "YES" : "NO"]" + dat += "
Receiving: [receiving ? "YES" : "NO"]" return dat /obj/machinery/telecomms/relay/Options_Topic(href, href_list) @@ -167,7 +167,7 @@ // BUS /obj/machinery/telecomms/bus/Options_Menu() - var/dat = "
Change Signal Frequency: [change_frequency ? "YES ([change_frequency])" : "NO"]" + var/dat = "
Change Signal Frequency: [change_frequency ? "YES ([change_frequency])" : "NO"]" return dat /obj/machinery/telecomms/bus/Options_Topic(href, href_list) @@ -254,7 +254,7 @@ if(text2num(href_list["unlink"]) <= length(links)) var/obj/machinery/telecomms/T = links[text2num(href_list["unlink"])] if(T) - temp = "-% Removed \ref[T] [T.name] from linked entities. %-" + temp = "-% Removed [REF(T)] [T.name] from linked entities. %-" // Remove link entries from both T and src. @@ -276,7 +276,7 @@ if(!(T in links)) links += T - temp = "-% Successfully linked with \ref[T] [T.name] %-" + temp = "-% Successfully linked with [REF(T)] [T.name] %-" else temp = "-% Unable to acquire buffer %-" @@ -284,7 +284,7 @@ if(href_list["buffer"]) P.buffer = src - temp = "-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-" + temp = "-% Successfully stored [REF(P.buffer)] [P.buffer.name] in buffer %-" if(href_list["flush"]) diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm index ffe99c243c..4aadeed4f5 100644 --- a/code/game/machinery/telecomms/machines/relay.dm +++ b/code/game/machinery/telecomms/machines/relay.dm @@ -71,7 +71,8 @@ /obj/machinery/telecomms/relay/preset/reebe name = "hierophant relay" - desc = "A stolen telecommunications relay that ingeniously combines bluespace technology with the Hierophant network to send and receive messages to and from Reebe." + desc = "An arcane telecommunications relay that ingeniously combines bluespace technology with the Hierophant network to send and receive messages to and from Reebe." id = "Hierophant Relay" + icon = 'icons/obj/clockwork_objects.dmi' hide = TRUE autolinkers = list("h_relay") diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index be13cfdcff..868c9ee728 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -35,8 +35,8 @@ /obj/machinery/teleport/hub/proc/link_power_station() if(power_station) return - for(dir in list(NORTH,EAST,SOUTH,WEST)) - power_station = locate(/obj/machinery/teleport/station, get_step(src, dir)) + for(var/direction in GLOB.cardinals) + power_station = locate(/obj/machinery/teleport/station, get_step(src, direction)) if(power_station) break return power_station @@ -127,13 +127,13 @@ efficiency = E - 1 /obj/machinery/teleport/station/proc/link_console_and_hub() - for(dir in list(NORTH,EAST,SOUTH,WEST)) - teleporter_hub = locate(/obj/machinery/teleport/hub, get_step(src, dir)) + for(var/direction in GLOB.cardinals) + teleporter_hub = locate(/obj/machinery/teleport/hub, get_step(src, direction)) if(teleporter_hub) teleporter_hub.link_power_station() break - for(dir in list(NORTH,EAST,SOUTH,WEST)) - teleporter_console = locate(/obj/machinery/computer/teleporter, get_step(src, dir)) + for(var/direction in GLOB.cardinals) + teleporter_console = locate(/obj/machinery/computer/teleporter, get_step(src, direction)) if(teleporter_console) teleporter_console.link_power_station() break diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 2510c19c05..1705a14c40 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -259,7 +259,7 @@ cut_overlays() if(panel_open) add_overlay("[initial(icon_state)]-panel") - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) updateUsrDialog() else to_chat(user, "You must first secure [src].") @@ -373,7 +373,7 @@ for (var/datum/data/vending_product/R in display_records) dat += "
" dat += "
":null] - [internal_damage&MECHA_INT_TEMP_CONTROL?"CLOWN SUPPORT SYSTEM MALFUNCTION
":null] - [internal_damage&MECHA_INT_TANK_BREACH?"GAS TANK HONK
":null] - [internal_damage&MECHA_INT_CONTROL_LOST?"HONK-A-DOODLE - Recalibrate
":null] - IntegriHONK: [integrity]%
- PowerHONK charge: [isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]
- Air source: [use_internal_tank?"Internal Airtank":"Environment"]
- AirHONK pressure: [tank_pressure]kPa
- AirHONK temperature: [tank_temperature]°K|[tank_temperature - T0C]°C
- HONK pressure: [cabin_pressure>WARNING_HIGH_PRESSURE ? "[cabin_pressure]": cabin_pressure]kPa
- HONK temperature: [return_temperature()]°K|[return_temperature() - T0C]°C
- Lights: [lights?"on":"off"]
- [dna_lock?"DNA-locked:
[dna_lock] \[Reset\]
":null] - "} - return output - -/obj/mecha/combat/honker/get_stats_html() - var/output = {" -
- [src.get_stats_part()]
-
-
- [src.get_equipment_list()]
-
- -
- [src.get_commands()]
-
-
-
- "}
- return output
-
-/obj/mecha/combat/honker/get_commands()
- var/output = {"
-
- "}
- output += ..()
- return output
-
-
-/obj/mecha/combat/honker/get_equipment_list()
- if(!equipment.len)
- return
- var/output = "Honk-ON-Systems:Sounds of HONK:
-
- Sad Trombone
-
- "
- for(var/obj/item/mecha_parts/mecha_equipment/MT in equipment)
- output += "
"
- return output
-
-
-
-/obj/mecha/combat/honker/mechstep(direction)
- var/result = step(src,direction)
- if(result)
- if(!squeak)
- playsound(src, "clownstep", 70, 1)
- squeak = 1
- else
- squeak = 0
- return result
-
-/obj/mecha/combat/honker/Topic(href, href_list)
- ..()
- if (href_list["play_sound"])
- switch(href_list["play_sound"])
- if("sadtrombone")
- playsound(src, 'sound/misc/sadtrombone.ogg', 50)
- return
-
-/proc/rand_hex_color()
- var/list/colors = list("0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f")
- var/color=""
- for (var/i=0;i<6;i++)
- color = color+pick(colors)
- return color
-
-
+ wreckage = /obj/structure/mecha_wreckage/honker
+ add_req_access = 0
+ max_equip = 3
+ var/squeak = 0
+
+/*
+/obj/mecha/combat/honker/New()
+ ..()
+
+ weapons += new /datum/mecha_weapon/honker(src)
+ weapons += new /datum/mecha_weapon/missile_rack/banana_mortar(src)
+ weapons += new /datum/mecha_weapon/missile_rack/mousetrap_mortar(src)
+ selected_weapon = weapons[1]
+ return
+*/
+
+/obj/mecha/combat/honker/get_stats_part()
+ var/integrity = obj_integrity/max_integrity*100
+ var/cell_charge = get_charge()
+ var/datum/gas_mixture/int_tank_air = internal_tank.return_air()
+ var/tank_pressure = internal_tank ? round(int_tank_air.return_pressure(),0.01) : "None"
+ var/tank_temperature = internal_tank ? int_tank_air.temperature : "Unknown"
+ var/cabin_pressure = round(return_pressure(),0.01)
+ var/output = {"[report_internal_damage()]
+ [integrity<30?"DAMAGE LEVEL CRITICAL[MT.get_equip_info()]
"
- output += "":null] + [internal_damage&MECHA_INT_TEMP_CONTROL?"CLOWN SUPPORT SYSTEM MALFUNCTION
":null] + [internal_damage&MECHA_INT_TANK_BREACH?"GAS TANK HONK
":null] + [internal_damage&MECHA_INT_CONTROL_LOST?"HONK-A-DOODLE - Recalibrate
":null] + IntegriHONK: [integrity]%
+ PowerHONK charge: [isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]
+ Air source: [use_internal_tank?"Internal Airtank":"Environment"]
+ AirHONK pressure: [tank_pressure]kPa
+ AirHONK temperature: [tank_temperature]°K|[tank_temperature - T0C]°C
+ HONK pressure: [cabin_pressure>WARNING_HIGH_PRESSURE ? "[cabin_pressure]": cabin_pressure]kPa
+ HONK temperature: [return_temperature()]°K|[return_temperature() - T0C]°C
+ Lights: [lights?"on":"off"]
+ [dna_lock?"DNA-locked:
[dna_lock] \[Reset\]
":null] + "} + return output + +/obj/mecha/combat/honker/get_stats_html() + var/output = {" +
+ [src.get_stats_part()]
+
+
+ [src.get_equipment_list()]
+
+ +
+ [src.get_commands()]
+
+
+
+ "}
+ return output
+
+/obj/mecha/combat/honker/get_commands()
+ var/output = {"
+
+ "}
+ output += ..()
+ return output
+
+
+/obj/mecha/combat/honker/get_equipment_list()
+ if(!equipment.len)
+ return
+ var/output = "Honk-ON-Systems:Sounds of HONK:
+
+ Sad Trombone
+
+ "
+ for(var/obj/item/mecha_parts/mecha_equipment/MT in equipment)
+ output += "
"
+ return output
+
+
+
+/obj/mecha/combat/honker/mechstep(direction)
+ var/result = step(src,direction)
+ if(result)
+ if(!squeak)
+ playsound(src, "clownstep", 70, 1)
+ squeak = 1
+ else
+ squeak = 0
+ return result
+
+/obj/mecha/combat/honker/Topic(href, href_list)
+ ..()
+ if (href_list["play_sound"])
+ switch(href_list["play_sound"])
+ if("sadtrombone")
+ playsound(src, 'sound/misc/sadtrombone.ogg', 50)
+ return
+
+/proc/rand_hex_color()
+ var/list/colors = list("0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f")
+ var/color=""
+ for (var/i=0;i<6;i++)
+ color = color+pick(colors)
+ return color
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 48d98aa70f..627858bea6 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -25,7 +25,7 @@
/obj/item/mecha_parts/mecha_equipment/proc/update_equip_info()
if(chassis)
- send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",get_equip_info())
+ send_byjax(chassis.occupant,"exosuit.browser","[REF(src)]",get_equip_info())
return 1
return
@@ -52,7 +52,7 @@
if(chassis.selected == src)
txt += "[src.name]"
else if(selectable)
- txt += "[src.name]"
+ txt += "[src.name]"
else
txt += "[src.name]"
@@ -132,7 +132,7 @@
/obj/item/mecha_parts/mecha_equipment/proc/set_ready_state(state)
equip_ready = state
if(chassis)
- send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
+ send_byjax(chassis.occupant,"exosuit.browser","[REF(src)]",src.get_equip_info())
return
/obj/item/mecha_parts/mecha_equipment/proc/occupant_message(message)
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 0b99d811b3..cc0f935628 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -104,21 +104,21 @@
if(output)
var/temp = ""
if(patient)
- temp = "[MT.get_equip_info()]
"
+ output += "\[Occupant: [patient] ([patient.stat > 1 ? "*DECEASED*" : "Health: [patient.health]%"])\]
View stats|Eject" + temp = "
\[Occupant: [patient] ([patient.stat > 1 ? "*DECEASED*" : "Health: [patient.health]%"])\]
View stats|Eject" return "[output] [temp]" return /obj/item/mecha_parts/mecha_equipment/medical/sleeper/Topic(href,href_list) ..() - var/datum/topic_input/filter = new /datum/topic_input(href,href_list) - if(filter.get("eject")) + var/datum/topic_input/afilter = new /datum/topic_input(href,href_list) + if(afilter.get("eject")) go_out() - if(filter.get("view_stats")) + if(afilter.get("view_stats")) chassis.occupant << browse(get_patient_stats(),"window=msleeper") onclose(chassis.occupant, "msleeper") return - if(filter.get("inject")) - inject_reagent(filter.getType("inject", /datum/reagent),filter.getObj("source")) + if(afilter.get("inject")) + inject_reagent(afilter.getType("inject", /datum/reagent),afilter.getObj("source")) return /obj/item/mecha_parts/mecha_equipment/medical/sleeper/proc/get_patient_stats() @@ -184,7 +184,7 @@ if(SG && SG.reagents && islist(SG.reagents.reagent_list)) for(var/datum/reagent/R in SG.reagents.reagent_list) if(R.volume > 0) - output += "Inject [R.name]
" + output += "Inject [R.name]
" return output @@ -287,7 +287,7 @@ /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/get_equip_info() var/output = ..() if(output) - return "[output] \[[mode? "Analyze" : "Launch"]\]
\[Syringes: [syringes.len]/[max_syringes] | Reagents: [reagents.total_volume]/[reagents.maximum_volume]\]
Reagents list" + return "[output] \[[mode? "Analyze" : "Launch"]\]
\[Syringes: [syringes.len]/[max_syringes] | Reagents: [reagents.total_volume]/[reagents.maximum_volume]\]
Reagents list" return /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/action(atom/movable/target) @@ -358,19 +358,19 @@ /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/Topic(href,href_list) ..() - var/datum/topic_input/filter = new (href,href_list) - if(filter.get("toggle_mode")) + var/datum/topic_input/afilter = new (href,href_list) + if(afilter.get("toggle_mode")) mode = !mode update_equip_info() return - if(filter.get("select_reagents")) + if(afilter.get("select_reagents")) processed_reagents.len = 0 var/m = 0 var/message for(var/i=1 to known_reagents.len) if(m>=synth_speed) break - var/reagent = filter.get("reagent_[i]") + var/reagent = afilter.get("reagent_[i]") if(reagent && (reagent in known_reagents)) message = "[m ? ", " : null][known_reagents[reagent]]" processed_reagents += reagent @@ -382,14 +382,14 @@ occupant_message("Reagent processing started.") log_message("Reagent processing started.") return - if(filter.get("show_reagents")) + if(afilter.get("show_reagents")) chassis.occupant << browse(get_reagents_page(),"window=msyringegun") - if(filter.get("purge_reagent")) - var/reagent = filter.get("purge_reagent") + if(afilter.get("purge_reagent")) + var/reagent = afilter.get("purge_reagent") if(reagent) reagents.del_reagent(reagent) return - if(filter.get("purge_all")) + if(afilter.get("purge_all")) reagents.clear_reagents() return return @@ -426,7 +426,7 @@ var/r_list = get_reagents_list() var/inputs if(r_list) - inputs += "" + inputs += "" inputs += "" inputs += "" var/output = {"
" return output @@ -206,7 +206,7 @@ if(!check_resources(D)) say("Not enough resources. Queue processing stopped.") temp = {"Not enough resources to build next part.
- Try again | Return"} + Try again | Return"} return 0 remove_from_queue(1) build_part(D) @@ -225,12 +225,12 @@ var/obj/part = D.build_path output += "
" //check if the tech coefficients have changed - temp += "Return" + temp += "Return" updateUsrDialog() say("Successfully synchronized with R&D server.") return - temp = "Unable to connect to local R&D Database.
Please check your connections and try again.
Return" + temp = "Unable to connect to local R&D Database.
Please check your connections and try again.
Return" updateUsrDialog() return @@ -289,12 +289,12 @@ switch(screen) if("main") left_part = output_available_resources()+"
" - left_part += "Sync with R&D servers
" + left_part += "Sync with R&D servers
" for(var/part_set in part_sets) - left_part += "[part_set] - \[Add all parts to queue\]
" + left_part += "[part_set] - \[Add all parts to queue\]
" if("parts") left_part += output_parts_list(part_set) - left_part += "
Return" + left_part += "
Return" dat = {"
[initial(part.name)] description:
[initial(part.desc)]- Return + Return "} break diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index ad0e428f14..2f98b2cc4c 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -647,7 +647,7 @@ to_chat(user, "[B.get_mecha_info()]") break //Nothing like a big, red link to make the player feel powerful! - to_chat(user, "ASSUME DIRECT CONTROL?
") + to_chat(user, "ASSUME DIRECT CONTROL?
") else examine(user) if(occupant) @@ -661,7 +661,7 @@ if(!can_control_mech) to_chat(user, "You cannot control exosuits without AI control beacons installed.") return - to_chat(user, "Take control of exosuit?
") + to_chat(user, "Take control of exosuit?
") /obj/mecha/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) if(!..()) diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 431768500e..63dd798a34 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -23,15 +23,15 @@ var/answer = TR.get_mecha_info() if(answer) dat += {"
[answer]
- Send message
- Show exosuit log | (EMP pulse)
"} + Send message
+ Show exosuit log | (EMP pulse)
"} if(screen==1) dat += "
Log contents
" - dat += "Return" + dat += "Return
" dat += "[stored_data]" - dat += "(Refresh)
" + dat += "(Refresh)
" dat += "" user << browse(dat, "window=computer;size=400x500") @@ -41,19 +41,19 @@ /obj/machinery/computer/mecha/Topic(href, href_list) if(..()) return - var/datum/topic_input/filter = new /datum/topic_input(href,href_list) + var/datum/topic_input/afilter = new /datum/topic_input(href,href_list) if(href_list["send_message"]) - var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("send_message") + var/obj/item/mecha_parts/mecha_tracking/MT = afilter.getObj("send_message") var/message = stripped_input(usr,"Input message","Transmit message") var/obj/mecha/M = MT.in_mecha() if(trim(message) && M) M.occupant_message(message) return if(href_list["shock"]) - var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("shock") + var/obj/item/mecha_parts/mecha_tracking/MT = afilter.getObj("shock") MT.shock() if(href_list["get_log"]) - var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("get_log") + var/obj/item/mecha_parts/mecha_tracking/MT = afilter.getObj("get_log") stored_data = MT.get_mecha_log() screen = 1 if(href_list["return"]) diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index 27256d8b0b..54b44f89f9 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -22,7 +22,7 @@ [js_dropdowns] function SSticker() { setInterval(function(){ - window.location='byond://?src=\ref[src]&update_content=1'; + window.location='byond://?src=[REF(src)]&update_content=1'; }, 1000); } @@ -55,7 +55,7 @@ "[MECHA_INT_FIRE]" = "INTERNAL FIRE", "[MECHA_INT_TEMP_CONTROL]" = "LIFE SUPPORT SYSTEM MALFUNCTION", "[MECHA_INT_TANK_BREACH]" = "GAS TANK BREACH", - "[MECHA_INT_CONTROL_LOST]" = "COORDINATION SYSTEM CALIBRATION FAILURE - Recalibrate", + "[MECHA_INT_CONTROL_LOST]" = "COORDINATION SYSTEM CALIBRATION FAILURE - Recalibrate", "[MECHA_INT_SHORT_CIRCUIT]" = "SHORT CIRCUIT" ) for(var/tflag in dam_reports) @@ -84,7 +84,7 @@ Airtank temperature: [tank_temperature]°K|[tank_temperature - T0C]°C
Cabin pressure: [cabin_pressure>WARNING_HIGH_PRESSURE ? "[cabin_pressure]": cabin_pressure]kPa
Cabin temperature: [return_temperature()]°K|[return_temperature() - T0C]°C
- [dna_lock?"DNA-locked:
[dna_lock] \[Reset\]
":""]
+ [dna_lock?"DNA-locked:
[dna_lock] \[Reset\]
":""]
[thrusters_action.owner ? "Thrusters: [thrusters_active ? "Enabled" : "Disabled"]
" : ""] [defense_action.owner ? "Defence Mode: [defence_mode ? "Enabled" : "Disabled"]
" : ""] [overload_action.owner ? "Leg Actuators Overload: [leg_overload_mode ? "Enabled" : "Disabled"]
" : ""] @@ -100,25 +100,25 @@
Electronics
Radio settings:
- Microphone: [radio.broadcasting?"Engaged":"Disengaged"]
- Speaker: [radio.listening?"Engaged":"Disengaged"]
+ Microphone: [radio.broadcasting?"Engaged":"Disengaged"]
+ Speaker: [radio.listening?"Engaged":"Disengaged"]
Frequency: - - - - + - + - [format_frequency(radio.frequency)] - + - +
+ + + +
- Microphone: [radio.broadcasting?"Engaged":"Disengaged"]
- Speaker: [radio.listening?"Engaged":"Disengaged"]
+ Microphone: [radio.broadcasting?"Engaged":"Disengaged"]
+ Speaker: [radio.listening?"Engaged":"Disengaged"]
Frequency: - - - - + - + - [format_frequency(radio.frequency)] - + - +
+ + + +
Permissions & Logging
- [add_req_access?"L":"Unl"]ock ID upload panel
- [maint_access?"Forbid":"Permit"] maintenance protocols
- [internal_tank.connected_port?"Disconnect from":"Connect to"] gas port
- DNA-lock
- View internal log
- Change exosuit name
+ [add_req_access?"L":"Unl"]ock ID upload panel
+ [maint_access?"Forbid":"Permit"] maintenance protocols
+ [internal_tank.connected_port?"Disconnect from":"Connect to"] gas port
+ DNA-lock
+ View internal log
+ Change exosuit name
- [maint_access?"Forbid":"Permit"] maintenance protocols
- [internal_tank.connected_port?"Disconnect from":"Connect to"] gas port
- DNA-lock
- View internal log
- Change exosuit name
+ [add_req_access?"L":"Unl"]ock ID upload panel
+ [maint_access?"Forbid":"Permit"] maintenance protocols
+ [internal_tank.connected_port?"Disconnect from":"Connect to"] gas port
+ DNA-lock
+ View internal log
+ Change exosuit name
"}
for(var/X in equipment)
var/obj/item/mecha_parts/mecha_equipment/W = X
- . += "[W.name] Detach
" + . += "[W.name] Detach
" . += "Available equipment slots: [max_equip-equipment.len]" . += "
"
@@ -143,7 +143,7 @@
return
. = "Equipment:" + . += "[W.name] Detach
" . += "Available equipment slots: [max_equip-equipment.len]" . += "
"
for(var/obj/item/mecha_parts/mecha_equipment/MT in equipment)
- . += "
"
@@ -171,7 +171,7 @@
[MT.get_equip_info()]
"
+ . += "[MT.get_equip_info()]
"
. += "Following keycodes are present in this system:
"} for(var/a in operation_req_access) - . += "[get_access_desc(a)] - Delete" + . += "[get_access_desc(a)] - Delete
" . += "
Following keycodes were detected on portable device:
" for(var/a in id_card.access) if(a in operation_req_access) @@ -179,8 +179,8 @@ var/a_name = get_access_desc(a) if(!a_name) continue //there's some strange access without a name - . += "[a_name] - Add" - . += "
Finish " + . += "[a_name] - Add
" + . += "
Finish " . += "(Warning! The ID upload panel will be locked. It can be unlocked only through Exosuit Interface.)" . += "