A tear in reality reveals a coursing river of lava... something recently teleported here from the Lavaland Mines!" @@ -967,6 +967,11 @@ structure_check() searches for nearby cultist structures required for the invoca cultist_name = "Summon [SSticker.cultdat ? SSticker.cultdat.entity_name : "your god"]" cultist_desc = "tears apart dimensional barriers, calling forth [SSticker.cultdat ? SSticker.cultdat.entity_title3 : "your god"]." + +/obj/effect/rune/narsie/update_icon_state() + icon_state = used ? "rune_large_distorted" : initial(icon_state) + + /obj/effect/rune/narsie/check_icon() return @@ -993,7 +998,7 @@ structure_check() searches for nearby cultist structures required for the invoca ..() SEND_SOUND(world, 'sound/effects/narsie_summon.ogg') to_chat(world, "The veil... is... TORN!!!--") - icon_state = "rune_large_distorted" + update_icon(UPDATE_ICON_STATE) var/turf/T = get_turf(src) sleep(40) new /obj/singularity/narsie/large(T) //Causes Nar'Sie to spawn even if the rune has been removed diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 6309e81654e..50e1527e2b8 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -112,8 +112,8 @@ /** * Called by the gameticker. */ -/datum/game_mode/process() - return FALSE +/datum/game_mode/process(wait) + return PROCESS_KILL /** @@ -312,6 +312,44 @@ return candidates +/** + * Works like get_players_for_role, but for alive mobs. + */ +/datum/game_mode/proc/get_alive_players_for_role(role, list/preferred_species) + var/list/players = list() + var/list/candidates = list() + + // Assemble a list of active players without jobbans and role enabled + for(var/mob/living/player in GLOB.alive_mob_list) + if(!player.client || !player.has_valid_preferences() \ + || jobban_isbanned(player, "Syndicate") || jobban_isbanned(player, role) \ + || !player_old_enough_antag(player.client, role) || player.client.skip_antag \ + || !(role in player.client.prefs.be_special)) + continue + + players += player + + // Shuffle the players list so that it becomes ping-independent. + players = shuffle(players) + + // Get a list of all the people who want to be the antagonist for this round, except those with incompatible species + for(var/mob/living/player in players) + if(length(protected_species) && (player.client.prefs.species in protected_species)) + continue + if(length(restricted_jobs) && (player.mind.assigned_role in restricted_jobs)) + continue + if(player.mind.has_antag_datum(/datum/antagonist) || player.mind.offstation_role || player.mind.special_role) + continue + + player_draft_log += "[player.key] had [role] enabled, so we are drafting them." + candidates += player.mind + if(length(preferred_species)) + var/prefered_species_mod = preferred_species[player.client.prefs.species] + if(isnum(prefered_species_mod)) + for (var/i in 1 to prefered_species_mod) //prefered mod + candidates += player.mind + + return candidates /datum/game_mode/proc/latespawn(mob/player) @@ -324,6 +362,15 @@ if(player.client && player.ready) .++ +/datum/game_mode/proc/num_station_players() + . = 0 + for(var/mob/living/carbon/human/player in GLOB.player_list) + if(!player) + continue + + if(player.client && player.mind && !player.mind.offstation_role && !player.mind.special_role) + .++ + /datum/game_mode/proc/num_players_started() . = 0 diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index 896d17f0462..b642c35c58a 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -101,9 +101,9 @@ GLOBAL_LIST_EMPTY(cortical_stacks) //Stacks for 'leave nobody behind' objective. vox.s_tone = rand(1, 6) vox.languages = list() // Removing language from chargen. vox.flavor_text = "" - vox.add_language("Vox-pidgin") - vox.add_language("Galactic Common") - vox.add_language("Tradeband") + vox.add_language(LANGUAGE_VOX) + vox.add_language(LANGUAGE_GALACTIC_COMMON) + vox.add_language(LANGUAGE_TRADER) head_organ.h_style = "Short Vox Quills" head_organ.f_style = "Shaved" vox.change_hair_color(97, 79, 25) //Same as the species default colour. diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 246fcfc500d..53a03dfe0f7 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -265,7 +265,7 @@ name = "doomsday device" icon_state = "nuclearbomb_base" desc = "A weapon which disintegrates all organic life in a large area." - anchored = 1 + anchored = TRUE density = 1 atom_say_verb = "blares" speed_process = TRUE // Disgusting fix. Please remove once #12952 is merged @@ -421,10 +421,10 @@ uses = 1 /datum/action/innate/ai/break_fire_alarms/Activate() - for(var/obj/machinery/firealarm/F in GLOB.machines) - if(!is_station_level(F.z)) + for(var/obj/machinery/firealarm/alarm as anything in GLOB.firealarms) + if(!is_station_level(alarm.z)) continue - F.emagged = TRUE + alarm.emagged = TRUE to_chat(owner, "All thermal sensors on the station have been disabled. Fire alerts will no longer be recognized.") owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, FALSE, use_reverb = FALSE) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 0293f158e98..9058f184417 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -90,7 +90,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops icon = 'icons/obj/meteor.dmi' icon_state = "small" density = 1 - anchored = 1 + anchored = TRUE var/hits = 4 var/hitpwr = 2 //Level of ex_act to be called on hit. var/dest diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 4951975a8d6..96e07f42e11 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -35,17 +35,25 @@ if(ismob(loc)) to_chat(loc, "Your vest is now [flags & NODROP ? "locked" : "unlocked"].") + +/obj/item/clothing/suit/armor/abductor/vest/update_icon_state() + switch(mode) + if(VEST_STEALTH) + icon_state = "vest_stealth" + if(VEST_COMBAT) + icon_state = "vest_combat" + + /obj/item/clothing/suit/armor/abductor/vest/proc/flip_mode() switch(mode) if(VEST_STEALTH) mode = VEST_COMBAT DeactivateStealth() armor = combat_armor - icon_state = "vest_combat" if(VEST_COMBAT)// TO STEALTH mode = VEST_STEALTH armor = stealth_armor - icon_state = "vest_stealth" + update_icon(UPDATE_ICON_STATE) if(ishuman(loc)) var/mob/living/carbon/human/H = loc H.update_inv_wear_suit() @@ -158,6 +166,15 @@ var/mob/living/marked = null var/obj/machinery/abductor/console/console + +/obj/item/abductor/gizmo/update_icon_state() + switch(mode) + if(GIZMO_SCAN) + icon_state = "gizmo_scan" + if(GIZMO_MARK) + icon_state = "gizmo_mark" + + /obj/item/abductor/gizmo/attack_self(mob/user) if(!ScientistCheck(user)) return @@ -167,10 +184,9 @@ if(mode == GIZMO_SCAN) mode = GIZMO_MARK - icon_state = "gizmo_mark" else mode = GIZMO_SCAN - icon_state = "gizmo_scan" + update_icon(UPDATE_ICON_STATE) to_chat(user, "You switch the device to [mode==GIZMO_SCAN? "SCAN": "MARK"] MODE") /obj/item/abductor/gizmo/attack(mob/living/M, mob/user) @@ -283,16 +299,24 @@ item_state = "silencer" var/mode = MIND_DEVICE_MESSAGE + +/obj/item/abductor/mind_device/update_icon_state() + switch(mode) + if(MIND_DEVICE_MESSAGE) + icon_state = "mind_device_message" + if(MIND_DEVICE_CONTROL) + icon_state = "mind_device_control" + + /obj/item/abductor/mind_device/attack_self(mob/user) if(!ScientistCheck(user)) return if(mode == MIND_DEVICE_MESSAGE) mode = MIND_DEVICE_CONTROL - icon_state = "mind_device_control" else mode = MIND_DEVICE_MESSAGE - icon_state = "mind_device_message" + update_icon(UPDATE_ICON_STATE) to_chat(user, "You switch the device to [mode == MIND_DEVICE_MESSAGE ? "TRANSMISSION" : "COMMAND"] MODE") /obj/item/abductor/mind_device/afterattack(atom/target, mob/living/user, flag, params) @@ -385,7 +409,7 @@
Congratulations! You are now trained for invasive xenobiology research!"} -/obj/item/paper/abductor/update_icon() +/obj/item/paper/abductor/update_icon_state() return /obj/item/paper/abductor/AltClick() @@ -424,12 +448,12 @@ Congratulations! You are now trained for invasive xenobiology research!"} txt = "probing" to_chat(usr, "You switch the baton to [txt] mode.") - update_icon() + update_icon(UPDATE_ICON_STATE) for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() -/obj/item/abductor_baton/update_icon() +/obj/item/abductor_baton/update_icon_state() switch(mode) if(BATON_STUN) icon_state = "wonderprodStun" @@ -727,6 +751,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} buildstackamount = 1 framestackamount = 1 canSmoothWith = null + can_be_flipped = FALSE frame = /obj/structure/table_frame/abductor /obj/machinery/optable/abductor @@ -764,9 +789,8 @@ Congratulations! You are now trained for invasive xenobiology research!"} ignore_flags = TRUE var/base_icon = "alien_mender_brute" -/obj/item/reagent_containers/applicator/abductor/update_icon() +/obj/item/reagent_containers/applicator/abductor/update_icon_state() var/reag_pct = round((reagents.total_volume / volume) * 100) - switch(reag_pct) if(51 to 100) icon_state = "[base_icon]_full[applying ? "_active" : ""]" diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index 008b584ef96..9b070793273 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -19,7 +19,7 @@ var/mind_control_duration = 1800 var/active_mind_control = FALSE -/obj/item/organ/internal/heart/gland/update_icon() +/obj/item/organ/internal/heart/gland/update_icon_state() return /obj/item/organ/internal/heart/gland/proc/ownerCheck() @@ -129,7 +129,7 @@ /obj/item/organ/internal/heart/gland/slime/insert(mob/living/carbon/M, special = ORGAN_MANIPULATION_DEFAULT) ..() owner.faction |= "slime" - owner.add_language("Bubblish") + owner.add_language(LANGUAGE_SLIME) /obj/item/organ/internal/heart/gland/slime/activate() to_chat(owner, "You feel nauseous!") diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index 9fa839246ce..9d714a0aaff 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -17,7 +17,13 @@ eject_abductee() return ..() -/obj/machinery/abductor/experiment/MouseDrop_T(mob/living/carbon/human/target, mob/user) + +/obj/machinery/abductor/experiment/update_icon_state() + icon_state = "experiment[occupant ? "" : "-open"]" + + + +/obj/machinery/abductor/experiment/MouseDrop_T(mob/living/carbon/human/target, mob/user, params) if(stat) return if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !ishuman(target)) @@ -26,18 +32,19 @@ return if(occupant) to_chat(user, "[src] is already occupied.") - return //occupied + return TRUE //occupied if(target.buckled) return if(target.has_buckled_mobs()) //mob attached to us to_chat(user, "[target] will not fit into [src] because [target.p_they()] [target.p_have()] a slime latched onto [target.p_their()] head.") - return + return TRUE visible_message("[user] puts [target] into the [src].") target.forceMove(src) occupant = target - icon_state = "experiment" + update_icon(UPDATE_ICON_STATE) add_fingerprint(user) + return TRUE /obj/machinery/abductor/experiment/attack_hand(mob/user) if(..()) @@ -195,7 +202,7 @@ var/mob/living/carbon/human/H = grabbed.affecting H.forceMove(src) occupant = H - icon_state = "experiment" + update_icon(UPDATE_ICON_STATE) add_fingerprint(user) qdel(G) return @@ -218,4 +225,4 @@ return occupant.forceMove(get_turf(src)) occupant = null - icon_state = "experiment-open" + update_icon(UPDATE_ICON_STATE) diff --git a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm index f618ff658c2..ddb547be8bb 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm @@ -3,7 +3,7 @@ desc = "Use this to transport to and from human habitat" icon = 'icons/obj/abductor.dmi' icon_state = "alien-pad-idle" - anchored = 1 + anchored = TRUE var/turf/teleport_target /obj/machinery/abductor/pad/proc/Warp(mob/living/target) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index 5c666279e2a..d42c937ac03 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -2,11 +2,12 @@ name = "host brain" real_name = "host brain" tts_seed = "Gman" + var/host_resisting = FALSE /mob/living/captive_brain/say(message) if(client) if(client.prefs.muted & MUTE_IC) - to_chat(src, "You cannot speak in IC (muted).") + to_chat(src, span_warning("Вы не можете говорить в IC (muted).")) return if(client.handle_spam_prevention(message,MUTE_IC)) return @@ -19,8 +20,8 @@ if(stat == DEAD) return say_dead(message) var/mob/living/simple_animal/borer/B = loc - to_chat(src, "You whisper silently, \"[message]\"") - to_chat(B.host, "The captive mind of [src] whispers, \"[message]\"") + to_chat(src, "Вы тихо шепчете, \"[message]\"") + to_chat(B.host, "Пленённый разум [src] шепчет, \"[message]\"") for(var/mob/M in GLOB.mob_list) if(M.mind && isobserver(M)) @@ -37,20 +38,25 @@ /mob/living/captive_brain/resist() var/mob/living/simple_animal/borer/B = loc - to_chat(src, "You begin doggedly resisting the parasite's control (this will take approximately sixty seconds).") - to_chat(B.host, "You feel the captive mind of [src] begin to resist your control.") + if(host_resisting) + to_chat(src, span_notice("Вы уже пытаетесь вернуть своё тело!")) + return + host_resisting = TRUE + to_chat(src, span_userdanger("Вы начинаете упорно сопротивляться контролю паразита (это займёт примерно минуту).")) + to_chat(B.host, span_userdanger("Вы чувствуете, как пленённый разум [src] начинает сопротивляться.")) var/delay = (rand(350,450) + B.host.getBrainLoss()) - addtimer(CALLBACK(src, PROC_REF(return_control), B), delay) - + do_mob(src, B.host, delay, only_use_extra_checks = TRUE) + return_control(B) + host_resisting = FALSE /mob/living/captive_brain/proc/return_control(mob/living/simple_animal/borer/B) if(!B || !B.controlling) return B.host.adjustBrainLoss(rand(5,10)) - to_chat(src, "With an immense exertion of will, you regain control of your body!") - to_chat(B.host, "You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you.") + to_chat(src, span_userdanger("Огромным усилием воли вы вновь обретаете контроль над своим телом!")) + to_chat(B.host, span_userdanger("Вы чувствуете, как мозг носителя уходит из под вашего контроля. Вы успеваете разорвать связь прежде, чем сильные нейронные импульсы смогут навредить вам.")) B.detach() @@ -61,9 +67,9 @@ speak_emote = list("chirrups") emote_hear = list("chirrups") tts_seed = "Gman_e2" - response_help = "pokes" + response_help = "pokes" response_disarm = "prods the" - response_harm = "stomps on the" + response_harm = "stomps on the" icon_state = "brainslug" icon_living = "brainslug" icon_dead = "brainslug_dead" @@ -89,8 +95,6 @@ "Septenary", "Octonary", "Novenary", "Decenary", "Undenary", "Duodenary", ) var/talk_inside_host = FALSE // So that borers don't accidentally give themselves away on a botched message - var/used_dominate - var/attempting_to_dominate = FALSE // To prevent people from spam opening the Dominate Victim input var/chemicals = 10 // Chemicals used for reproduction and chemical injection. var/max_chems = 250 var/mob/living/carbon/human/host // Human host for the brain worm. @@ -102,7 +106,6 @@ var/leaving = FALSE var/hiding = FALSE var/datum/action/innate/borer/talk_to_host/talk_to_host_action = new - var/datum/action/innate/borer/infest_host/infest_host_action = new var/datum/action/innate/borer/toggle_hide/toggle_hide_action = new var/datum/action/innate/borer/talk_to_borer/talk_to_borer_action = new var/datum/action/innate/borer/talk_to_brain/talk_to_brain_action = new @@ -111,25 +114,24 @@ var/datum/action/innate/borer/leave_body/leave_body_action = new var/datum/action/innate/borer/make_chems/make_chems_action = new var/datum/action/innate/borer/make_larvae/make_larvae_action = new - var/datum/action/innate/borer/freeze_victim/freeze_victim_action = new var/datum/action/innate/borer/torment/torment_action = new /mob/living/simple_animal/borer/New(atom/newloc, var/gen=1) ..(newloc) remove_from_all_data_huds() generation = gen - add_language("Cortical Link") - notify_ghosts("A cortical borer has been created in [get_area(src)]!", enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK) + add_language(LANGUAGE_HIVE_BORER) + notify_ghosts("Мозговой червь появился в [get_area(src)]!", enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK) real_name = "Cortical Borer [rand(1000,9999)]" truename = "[borer_names[min(generation, borer_names.len)]] [rand(1000,9999)]" GrantBorerActions() /mob/living/simple_animal/borer/attack_ghost(mob/user) if(cannotPossess(user)) - to_chat(user, "Upon using the antagHUD you forfeited the ability to join the round.") + to_chat(user, span_boldnotice("Upon using the antagHUD you forfeited the ability to join the round.")) return if(jobban_isbanned(user, "Syndicate")) - to_chat(user, "You are banned from antagonists!") + to_chat(user, span_warning("You are banned from antagonists!")) return if(key) return @@ -155,42 +157,40 @@ /mob/living/simple_animal/borer/say(message, verb = "says", sanitize = TRUE, ignore_speech_problems = FALSE, ignore_atmospherics = FALSE, ignore_languages = FALSE) var/list/message_pieces = parse_languages(message) for(var/datum/multilingual_say_piece/S in message_pieces) - if(!istype(S.speaking, /datum/language/corticalborer) && loc == host && !talk_inside_host) - to_chat(src, span_warning("You've disabled audible speech while inside a host! Re-enable it under the borer tab, or stick to borer communications.")) + if(S.speaking != GLOB.all_languages[LANGUAGE_HIVE_BORER] && loc == host && !talk_inside_host) + Communicate(message) return return ..() -/mob/living/simple_animal/borer/verb/Communicate() - set category = "Borer" - set name = "Converse with Host" - set desc = "Send a silent message to your host." - +/mob/living/simple_animal/borer/proc/Communicate(var/sended_message) if(!host) - to_chat(src, "You do not have a host to communicate with!") + to_chat(src, "У вас нет носителя!") return if(stat) - to_chat(src, "You cannot do that in your current state.") + to_chat(src, "Сейчас вы не в состоянии этого сделать.") return if(host.stat == DEAD) - to_chat(src, "Мозг носителя не способен воспринимать вас сейчас!") + to_chat(src, span_warning("Мозг носителя не способен воспринимать вас сейчас!")) return - var/input = stripped_input(src, "Please enter a message to tell your host.", "Borer", "") - if(!input) + if(!sended_message) //If we use "say", it won't ask us to write the message twice. + sended_message = stripped_input(src, "Введите сообщение для носителя.", "Borer", "") + + if(!sended_message) return if(src && !QDELETED(src) && !QDELETED(host)) var/say_string = (docile) ? "slurs" :"states" if(host) - to_chat(host, "[truename] [say_string]: [input]") - add_say_logs(src, input, host, "BORER") + to_chat(host, "[truename] [say_string]: [sended_message]") + add_say_logs(src, sended_message, host, "BORER") for(var/M in GLOB.dead_mob_list) if(isobserver(M)) - to_chat(M, "Borer Communication from [truename] ([ghost_follow_link(src, ghost=M)]): [input]") - to_chat(src, "[truename] [say_string]: [input]") + to_chat(M, "Borer Communication from [truename] ([ghost_follow_link(src, ghost=M)]): [sended_message]") + to_chat(src, "[truename] [say_string]: [sended_message]") host.verbs += /mob/living/proc/borer_comm talk_to_borer_action.Grant(host) @@ -201,10 +201,10 @@ if(talk_inside_host) talk_inside_host = FALSE - to_chat(src, "You will no longer talk audibly while inside a host.") + to_chat(src, span_notice("Теперь вы будете говорить в сознание носителя.")) else talk_inside_host = TRUE - to_chat(src, "You will now be able to audibly speak from inside of a host.") + to_chat(src, span_notice("Теперь вы сможете говорить, находясь внутри носителя.")) /mob/living/proc/borer_comm() set name = "Converse with Borer" @@ -218,7 +218,7 @@ if(!B) return - var/input = stripped_input(src, "Please enter a message to tell the borer.", "Message", "") + var/input = stripped_input(src, "Введите сообщение для мозгового червя.", "Сообщение", "") if(!input) return @@ -236,14 +236,14 @@ set desc = "Communicate mentally with the trapped mind of your host." if(src.stat == DEAD) - to_chat(src, "Мозг жертвы не способен воспринимать вас в этом состоянии!") + to_chat(src, span_warning("Мозг жертвы не способен воспринимать вас в этом состоянии!")) return var/mob/living/simple_animal/borer/B = has_brain_worms() if(!B || !B.host_brain) return var/mob/living/captive_brain/CB = B.host_brain - var/input = stripped_input(src, "Please enter a message to tell the trapped mind.", "Message", "") + var/input = stripped_input(src, "Введите сообщение для пленённого разума.", "Сообщение", "") if(!input) return @@ -264,18 +264,20 @@ if(!stat && host.stat != DEAD) if(host.reagents.has_reagent("sugar")) + if(!docile) + if(controlling) - to_chat(host, "You feel the soporific flow of sugar in your host's blood, lulling you into docility.") + to_chat(host, span_notice("Вы чувствуете усыпляющий поток сахара в крови вашего носителя, убаюкивающий вас до бессилия..")) else - to_chat(src, "You feel the soporific flow of sugar in your host's blood, lulling you into docility.") + to_chat(src, span_notice("Вы чувствуете усыпляющий поток сахара в крови вашего носителя, убаюкивающий вас до бессилия..")) docile = TRUE else if(docile) if(controlling) - to_chat(host, "You shake off your lethargy as the sugar leaves your host's blood.") + to_chat(host, span_notice("Вы приходите в себя, когда сахар покидает кровь вашего носителя.")) else - to_chat(src, "You shake off your lethargy as the sugar leaves your host's blood.") + to_chat(src, span_notice("Вы приходите в себя, когда сахар покидает кровь вашего носителя.")) docile = FALSE if(chemicals < max_chems) @@ -283,7 +285,7 @@ if(controlling) if(docile) - to_chat(host, "You are feeling far too docile to continue controlling your host...") + to_chat(host, span_notice("Вы слишком обессилели для того, чтобы продолжать контролировать тело носителя...")) host.release_control() return @@ -301,96 +303,68 @@ /mob/living/simple_animal/borer/UnarmedAttack(mob/living/carbon/human/M) if(istype(M)) - to_chat(src, span_notice("You analyze [M]'s vitals.")) + to_chat(src, span_notice("Вы анализируете жизненные показатели [M].")) healthscan(src, M, 1, TRUE) +/obj/effect/proc_holder/spell/borer_infest + name = "Infest" + desc = "Infest a suitable humanoid host." + base_cooldown = 0 + clothes_req = FALSE + action_icon_state = "infest" + action_background_icon_state = "bg_alien" + selection_activated_message = span_notice("Вы приготовились заразить жертву. Left-click чтобы применить способность!") + selection_deactivated_message = span_notice("Вы прекратили свои попытки заразить жертву.") + need_active_overlay = TRUE + human_req = FALSE + var/infesting = FALSE + +/obj/effect/proc_holder/spell/borer_infest/create_new_targeting() + var/datum/spell_targeting/click/T = new() + T.range = 1 + T.click_radius = -1 + return T + +/obj/effect/proc_holder/spell/borer_infest/can_cast(mob/living/user, charge_check = TRUE, show_message = FALSE) + + if (is_ventcrawling(user) || !src || user.stat || infesting) + return FALSE + . = ..() -/mob/living/simple_animal/borer/verb/infest() - set category = "Borer" - set name = "Infest" - set desc = "Infest a suitable humanoid host." - - if(host) - to_chat(src, "You are already within a host.") - return - - if(stat) - to_chat(src, "You cannot infest a target in your current state.") - return - - var/list/choices = list() - for(var/mob/living/carbon/human/H in view(1,src)) - var/obj/item/organ/external/head/head = H.get_organ(BODY_ZONE_HEAD) - if(head.is_robotic()) - continue - if(H.stat != DEAD && Adjacent(H) && !H.has_brain_worms()) - choices += H - - var/mob/living/carbon/human/M = tgui_input_list(src,"Who do you wish to infest?", "Infest", choices) - - if(!M || !src) - return - - if(!Adjacent(M)) - return - - if(M.has_brain_worms()) - to_chat(src, "You cannot infest someone who is already infested!") - return - - if(incapacitated()) - return - - to_chat(src, "You slither up [M] and begin probing at [M.p_their()] ear canal...") - - if(!do_after(src, 50, target = M)) - to_chat(src, "As [M] moves away, you are dislodged and fall to the ground.") - return - - if(!M || !src) - return +/obj/effect/proc_holder/spell/borer_infest/valid_target(mob/living/carbon/human/target, user) + return istype(target) && target.stat != DEAD - if(stat) - to_chat(src, "You cannot infest a target in your current state.") - return +/obj/effect/proc_holder/spell/borer_infest/cast(list/targets, mob/living/simple_animal/borer/user) + var/mob/living/carbon/human/target = targets[1] - if(M.stat == DEAD) - to_chat(src, "That is not an appropriate target.") + if(!target) return - if(M in view(1, src)) - to_chat(src, "You wiggle into [M]'s ear.") - /* - if(!M.stat) - to_chat(M, "Something disgusting and slimy wiggles into your ear!") - */ // Let's see how stealthborers work out - - perform_infestation(M) + infesting = TRUE + to_chat(user, "Вы подползаете к [target] и начинаете искать [genderize_ru(target.gender,"его","её","его","их" )] слуховой проход...") - return - else - to_chat(src, "They are no longer in range!") - return - -/mob/living/simple_animal/borer/proc/perform_infestation(mob/living/carbon/M) - if(!M) + if(!do_mob(user, target, 5 SECONDS)) + to_chat(user, "Как только [target] отходит, вы срываетесь и падаете на пол.") + infesting = FALSE return - if(M.has_brain_worms()) - to_chat(src, "[M] is already infested!") + if(target.has_brain_worms()) + to_chat(user, span_warning("[target] уже заражён!")) + infesting = FALSE return - host = M - add_attack_logs(src, host, "Infested as borer") - M.borer = src - forceMove(M) - - host.status_flags |= PASSEMOTES + infesting = FALSE + user.host = target + add_attack_logs(user, user.host, "Infested as borer") + target.borer = user + user.forceMove(target) + user.host.status_flags |= PASSEMOTES - RemoveBorerActions() - GrantInfestActions() + user.RemoveBorerActions() + user.RemoveBorerSpells() + user.GrantInfestActions() - to_chat(src, span_boldnotice("You can analyze your host health by using Left-click.")) + to_chat(user, span_boldnotice("Вы можете анализировать здоровье носителя при помощи Left-click.")) /mob/living/simple_animal/borer/verb/secrete_chemicals() set category = "Borer" @@ -398,14 +372,15 @@ set desc = "Push some chemicals into your host's bloodstream." if(!host) - to_chat(src, "You are not inside a host body.") + to_chat(src, "Вы не находитесь в теле носителя.") return if(stat) - to_chat(src, "You cannot secrete chemicals in your current state.") + to_chat(src, "Вы не можете производить химикаты в вашем нынешнем состоянии.") + return if(docile) - to_chat(src, " You are feeling far too docile to do that.") + to_chat(src, "Вы слишком обессилели для этого.") return var/content = "" @@ -451,10 +426,10 @@ return var/datum/reagent/R = GLOB.chemical_reagents_list[C.chemname] if(chemicals < C.chemuse) - to_chat(src, "You need [C.chemuse] chemicals stored to secrete [R.name]!") + to_chat(src, span_boldnotice("Вам нужно [C.chemuse] химикатов для выделения [R.name]!")) return - to_chat(src, "You squirt a measure of [R.name] from your reservoirs into [host]'s bloodstream.") + to_chat(src, span_userdanger("Вы впрыскиваете [R.name] из своих резервуаров в кровь [host].")) host.reagents.add_reagent(C.chemname, C.quantity) chemicals -= C.chemuse add_attack_logs(src, host, "injected [R.name]") @@ -470,7 +445,7 @@ set desc = "Become invisible to the common eye." if(host) - to_chat(usr, "You cannot do this while you're inside a host.") + to_chat(usr, span_warning("Вы не можете сделать этого, находясь внутри носителя.")) return if(stat != CONSCIOUS) @@ -478,123 +453,100 @@ if(!hiding) layer = TURF_LAYER+0.2 - to_chat(src, "You are now hiding.") + to_chat(src, span_notice("Вы прячетесь.")) hiding = TRUE else layer = MOB_LAYER - to_chat(src, "You stop hiding.") + to_chat(src, span_notice("Вы перестали прятаться.")) hiding = FALSE -/mob/living/simple_animal/borer/verb/dominate_victim() - set category = "Borer" - set name = "Dominate Victim" - set desc = "Freeze the limbs of a potential host with supernatural fear." - - if(world.time - used_dominate < 150) - to_chat(src, "You cannot use that ability again so soon.") - return - - if(host) - to_chat(src, "You cannot do that from within a host body.") - return - - if(stat) - to_chat(src, "You cannot do that in your current state.") - return - - if(attempting_to_dominate) - to_chat(src, "You're already targeting someone!") - return - - var/list/choices = list() - for(var/mob/living/carbon/C in view(3,src)) - if(C.stat != DEAD) - choices += C - - if(world.time - used_dominate < 300) - to_chat(src, "You cannot use that ability again so soon.") - return - - attempting_to_dominate = TRUE - - var/mob/living/carbon/M = tgui_input_list(src,"Who do you wish to dominate?", "Dominate", choices) - - if(!M) - attempting_to_dominate = FALSE - return +/obj/effect/proc_holder/spell/borer_dominate + name = "Dominate Victim" + desc = "Freeze the limbs of a potential host with supernatural fear." + base_cooldown = 30 SECONDS + clothes_req = FALSE + action_icon_state = "genetic_cryo" + action_background_icon_state = "bg_alien" + selection_activated_message = span_notice("Вы приготовились поразить жертву. Left-click чтобы применить способность!") + selection_deactivated_message = span_notice("Вы решили дать своей жертве шанс. Пока что.") + need_active_overlay = TRUE + human_req = FALSE + +/obj/effect/proc_holder/spell/borer_dominate/create_new_targeting() + var/datum/spell_targeting/click/T = new() + T.range = 3 + T.click_radius = -1 + return T + +/obj/effect/proc_holder/spell/borer_dominate/can_cast(mob/living/user, charge_check = TRUE, show_message = FALSE) + + if (is_ventcrawling(user) || !src || user.stat) + return FALSE + . = ..() - if(!src) //different statement to avoid a runtime since if the source is deleted then attempting_to_dominate would also be deleted - return +/obj/effect/proc_holder/spell/borer_dominate/valid_target(mob/living/carbon/human/target, user) + return istype(target) && target.stat != DEAD - if(M.has_brain_worms()) - to_chat(src, "You cannot dominate someone who is already infested!") - attempting_to_dominate = FALSE - return +/obj/effect/proc_holder/spell/borer_dominate/cast(list/targets, mob/living/simple_animal/borer/user) + var/mob/living/carbon/human/target = targets[1] - if(incapacitated()) - attempting_to_dominate = FALSE + if(target.has_brain_worms()) + to_chat(user, span_warning("Вы не можете позволить себе сделать это с тем, кто уже заражён..")) return - if(get_dist(src, M) > 7) //to avoid people remotely doing from across the map etc, 7 is the default view range - to_chat(src, "You're too far away!") - attempting_to_dominate = FALSE - return - - to_chat(src, "You focus your psychic lance on [M] and freeze [M.p_their()] limbs with a wave of terrible dread.") - to_chat(M, "You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing.") - M.Weaken(6 SECONDS) - - used_dominate = world.time - attempting_to_dominate = FALSE + to_chat(user, span_warning("Вы пронзили разум [target] пси-потоком, парализуя [genderize_ru(target.gender,"его","её","его","их" )] конечности волной первородного ужаса!")) + to_chat(target, span_warning("Вы чувствуете, как на вас наваливается жуткое чувство страха, леденящее конечности и заставляющее сердце бешено колотиться.")) + target.Weaken(6 SECONDS) /mob/living/simple_animal/borer/verb/release_host() set category = "Borer" set name = "Release Host" set desc = "Slither out of your host." + if(!host) - to_chat(src, "You are not inside a host body.") + to_chat(src, "Вы не находитесь в теле носителя.") return if(stat) - to_chat(src, "You cannot leave your host in your current state.") + to_chat(src, "Вы не можете покинуть носителя в вашем текущем состоянии.") return if(docile) - to_chat(src, "You are feeling far too docile to do that.") + to_chat(src, span_notice("Вы слишком обессилели для этого.")) return if(!host || !src) return - if(leaving) - leaving = FALSE - to_chat(src, "You decide against leaving your host.") - return - - to_chat(src, "You begin disconnecting from [host]'s synapses and prodding at [host.p_their()] internal ear canal.") - - leaving = TRUE - - addtimer(CALLBACK(src, PROC_REF(let_go)), 200) + leaving = !leaving + let_go() + leaving = FALSE /mob/living/simple_animal/borer/proc/let_go() - if(!host || !src || QDELETED(host) || QDELETED(src)) - return - if(!leaving) - return - if(controlling) + if(!host || !src || QDELETED(host) || QDELETED(src) || controlling) return if(stat) - to_chat(src, "You cannot release a target in your current state.") + to_chat(src, "Вы не можете освободить цель в вашем текущем состоянии.") return + if(leaving) + to_chat(src, "Вы начинаете отсоединяться от синапсов носителя и пробираться наружу через его слуховой проход.") + else + to_chat(src, span_danger("Вы решили остаться в носителе.")) - to_chat(src, "You wiggle out of [host]'s ear and plop to the ground.") + // If we cast the spell a second time, it will be canceled + if(!do_mob(src, host, 20 SECONDS, only_use_extra_checks = TRUE, extra_checks = list(CALLBACK(src, PROC_REF(borer_leaving), src)))) + return - leaving = FALSE + to_chat(src, "Вы выкручиваетесь из уха носителя и падаете на пол.") leave_host() +/mob/living/simple_animal/borer/proc/borer_leaving() //Returning "TRUE" breaks the loop, "FALSE" - continue + if(!leaving || docile || bonding) + return TRUE + return FALSE + /mob/living/simple_animal/borer/proc/leave_host() if(!host) @@ -602,6 +554,7 @@ if(controlling) detach() GrantBorerActions() + GrantBorerSpells() RemoveInfestActions() forceMove(get_turf(host)) machine = null @@ -623,47 +576,54 @@ set desc = "Fully connect to the brain of your host." if(!host) - to_chat(src, "You are not inside a host body.") + to_chat(src, "Вы не находитесь в теле носителя.") return if(host.stat == DEAD) - to_chat(src, "This host is in no condition to be controlled.") + to_chat(src, "Носитель не может быть взят под контроль в его текущем состоянии.") return if(stat) - to_chat(src, "You cannot do that in your current state.") + to_chat(src, "Вы не можете сделать этого в вашем нынешнем состоянии.") return if(docile) - to_chat(src, "You are feeling far too docile to do that.") + to_chat(src, span_notice("Вы слишком обессилели для этого.")) return - if(bonding) - bonding = FALSE - to_chat(src, "You stop attempting to take control of your host.") + if(QDELETED(src) || QDELETED(host)) return - to_chat(src, "You begin delicately adjusting your connection to the host brain...") + bonding = !bonding - if(QDELETED(src) || QDELETED(host)) + if(bonding) + to_chat(src, "Вы начинаете деликатно настраивать связь с мозгом носителя...") + else + to_chat(src, span_danger("Вы прекращаете свои попытки взять носителя под полный контроль.")) + + var/delay = 300+(host.getBrainLoss()*5) + + // If we cast the spell a second time, it will be canceled + if(!do_mob(src, host, delay, only_use_extra_checks = TRUE, extra_checks = list(CALLBACK(src, PROC_REF(borer_assuming), src)))) + bonding = FALSE return - bonding = TRUE + assume_control() + bonding = FALSE - var/delay = 300+(host.getBrainLoss()*5) - addtimer(CALLBACK(src, PROC_REF(assume_control)), delay) +/mob/living/simple_animal/borer/proc/borer_assuming() //Returning "TRUE" breaks the loop, "FALSE" - continue + if(!bonding || docile || leaving) + return TRUE + return FALSE /mob/living/simple_animal/borer/proc/assume_control() + if(!host || !src || controlling) return - if(!bonding) - return - if(docile) - to_chat(src,"You are feeling far too docile to do that.") - return + else - to_chat(src, "You plunge your probosci deep into the cortex of the host brain, interfacing directly with [host.p_their()] nervous system.") - to_chat(host, "You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours.") + to_chat(src, span_userdanger("Вы погружаете свои хоботки глубоко в кору головного мозга носителя, напрямую взаимодействуя с его нервной системой.")) + to_chat(host, span_userdanger("Вы чувствуете странное смещение за глазами, прежде чем постороннее сознание вытесняет ваше.")) var/borer_key = src.key add_attack_logs(src, host, "Assumed control of (borer)") // host -> brain @@ -699,7 +659,6 @@ if(!host.lastKnownIP) host.lastKnownIP = s2h_ip - bonding = FALSE controlling = TRUE host.verbs += /mob/living/carbon/proc/release_control @@ -727,8 +686,8 @@ return if(B.host_brain) - to_chat(src, "You send a punishing spike of psychic agony lancing into your host's brain.") - to_chat(B.host_brain, "Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!") + to_chat(src, span_danger("Вы посылаете карающий всплеск психической агонии в мозг своего носителя.")) + to_chat(B.host_brain, span_danger("Ужасная, жгучая агония пронзает вас насквозь, вырывая беззвучный крик из глубин вашего запертого разума!")) //Brain slug proc for voluntary removal of control. /mob/living/carbon/proc/release_control() @@ -740,7 +699,7 @@ var/mob/living/simple_animal/borer/B = has_brain_worms() if(B && B.host_brain) - to_chat(src, "You withdraw your probosci, releasing control of [B.host_brain]") + to_chat(src, span_danger("Вы убираете свои хоботки, освобождая [B.host_brain].")) B.detach() @@ -769,15 +728,15 @@ return if(B.chemicals >= 100) - to_chat(src, "Your host twitches and quivers as you rapidly excrete several larvae from your sluglike body.") - visible_message("[src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!") + to_chat(src, span_danger("Ваш хозяин дёргается и вздрагивает, когда вы быстро выводите личинку из своего слизнеподобного тела.")) + visible_message(span_danger("[src] яростно блюёт, изрыгая рвотные массы вместе с извивающимся, похожим на слизня существом!")) B.chemicals -= 100 var/turf/T = get_turf(src) T.add_vomit_floor() new /mob/living/simple_animal/borer(T, B.generation + 1) else - to_chat(src, "You need 100 chemicals to reproduce!") + to_chat(src, "Вам требуется 100 химикатов для размножения!") return /mob/living/simple_animal/borer/proc/detach() @@ -786,7 +745,6 @@ return controlling = FALSE - reset_perspective(null) machine = null @@ -848,11 +806,13 @@ candidate.mob = src ckey = candidate.ckey var/list/messages = list() - messages.Add("You are a cortical borer!") - messages.Add("You are a brain slug that worms its way into the head of its victim. Use stealth, persuasion and your powers of mind control to keep you, your host and your eventual spawn safe and warm.") - messages.Add("Sugar nullifies your abilities, avoid it at all costs!") - messages.Add("You can speak to your fellow borers by prefixing your messages with ':bo'. Check out your Borer tab to see your abilities.") + messages.Add(span_notice("Вы - Мозговой Червь!")) + messages.Add("Забирайтесь в голову своей жертвы, используйте скрытность, убеждение и свои способности к управлению разумом, чтобы сохранить себя, своё потомство и своего носителя в безопасности и тепле.") + messages.Add("Сахар сводит на нет ваши способности, избегайте его любой ценой!") + messages.Add("Вы можете разговаривать со своими коллегами-борерами, используя ':bo'.") to_chat(src, chat_box_purple(messages.Join("
"))) + GrantBorerSpells() + hide_borer() /proc/create_borer_mind(key) var/datum/mind/M = new /datum/mind(key) @@ -861,14 +821,19 @@ return M /mob/living/simple_animal/borer/proc/GrantBorerActions() - infest_host_action.Grant(src) toggle_hide_action.Grant(src) - freeze_victim_action.Grant(src) + /mob/living/simple_animal/borer/proc/RemoveBorerActions() - infest_host_action.Remove(src) toggle_hide_action.Remove(src) - freeze_victim_action.Remove(src) + +/mob/living/simple_animal/borer/proc/GrantBorerSpells() + mind?.AddSpell(new /obj/effect/proc_holder/spell/borer_infest) + mind?.AddSpell(new /obj/effect/proc_holder/spell/borer_dominate) + +/mob/living/simple_animal/borer/proc/RemoveBorerSpells() + mind?.RemoveSpell(/obj/effect/proc_holder/spell/borer_infest) + mind?.RemoveSpell(/obj/effect/proc_holder/spell/borer_dominate) /mob/living/simple_animal/borer/proc/GrantInfestActions() talk_to_host_action.Grant(src) @@ -906,15 +871,6 @@ var/mob/living/simple_animal/borer/B = owner B.Communicate() -/datum/action/innate/borer/infest_host - name = "Infest" - desc = "Infest a suitable humanoid host." - button_icon_state = "infest" - -/datum/action/innate/borer/infest_host/Activate() - var/mob/living/simple_animal/borer/B = owner - B.infest() - /datum/action/innate/borer/toggle_hide name = "Toggle Hide" desc = "Become invisible to the common eye. Toggled on or off." @@ -977,8 +933,7 @@ /datum/action/innate/borer/make_chems name = "Secrete Chemicals" desc = "Push some chemicals into your host's bloodstream." - icon_icon = 'icons/obj/chemical.dmi' - button_icon_state = "minidispenser" + button_icon_state = "fleshmend" /datum/action/innate/borer/make_chems/Activate() var/mob/living/simple_animal/borer/B = owner @@ -994,15 +949,6 @@ B.host = owner B.host.spawn_larvae() -/datum/action/innate/borer/freeze_victim - name = "Dominate Victim" - desc = "Freeze the limbs of a potential host with supernatural fear." - button_icon_state = "genetic_cryo" - -/datum/action/innate/borer/freeze_victim/Activate() - var/mob/living/simple_animal/borer/B = owner - B.dominate_victim() - /datum/action/innate/borer/torment name = "Torment Host" desc = "Punish your host with agony." diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 45196f0632e..0b97571fa65 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -116,7 +116,7 @@ /mob/living/simple_animal/hostile/swarmer/New() ..() - add_language("Swarmer", 1) + add_language(LANGUAGE_HIVE_SWARMER, 1) verbs -= /mob/living/verb/pulled for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) diag_hud.add_to_hud(src) @@ -646,7 +646,7 @@ max_integrity = 10 density = FALSE -/obj/structure/swarmer/trap/Crossed(var/atom/movable/AM, oldloc) +/obj/structure/swarmer/trap/Crossed(atom/movable/AM, oldloc) if(isliving(AM)) var/mob/living/L = AM if(!istype(L, /mob/living/simple_animal/hostile/swarmer)) diff --git a/code/game/gamemodes/miniantags/demons/demon.dm b/code/game/gamemodes/miniantags/demons/demon.dm index 180f31325a5..17d191847db 100644 --- a/code/game/gamemodes/miniantags/demons/demon.dm +++ b/code/game/gamemodes/miniantags/demons/demon.dm @@ -96,7 +96,7 @@ origin_tech = "combat=5;biotech=7" -/obj/item/organ/internal/heart/demon/update_icon() +/obj/item/organ/internal/heart/demon/update_icon_state() return //always beating visually diff --git a/code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm b/code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm index 62590d81389..5742dd6768f 100644 --- a/code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm +++ b/code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm @@ -27,6 +27,7 @@ crawl.phased = TRUE RegisterSignal(loc, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/mob/living/simple_animal/demon/shadow, check_darkness)) RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(check_darkness)) + add_overlay(emissive_appearance(icon, "shadow_demon_eye_glow_overlay")) /mob/living/simple_animal/demon/shadow/Life(seconds, times_fired) @@ -183,7 +184,7 @@ fireball_type = /obj/item/projectile/magic/shadow_hand -/obj/effect/proc_holder/spell/fireball/shadow_grapple/update_icon() +/obj/effect/proc_holder/spell/fireball/shadow_grapple/update_icon_state() return diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm index 019162d024e..d24b032b99a 100644 --- a/code/game/gamemodes/miniantags/guardian/guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/guardian.dm @@ -430,7 +430,7 @@ /obj/item/paper/guardian name = "Справочник по голопаразитам" - icon_state = "paper" + icon_state = "paper_words" info = {"Cписок видов голопаразитов
@@ -453,7 +453,7 @@ Защитник: При нарушении дальности связи хозяин призывается к нему, а не наоборот. Имеет два режима: низкая атака с высокой защитой, и режим ультра-защиты, практически полностью нивелирующий входящий и исходящий урон. В режиме ультра-защиты способен пережить даже взрыв бомбы, лишь слегка ранив хозяина. Может ставить силовые барьеры, через которые могут пройти только вы и ваш подопечный.
"} -/obj/item/paper/guardian/update_icon() +/obj/item/paper/guardian/update_icon_state() return diff --git a/code/game/gamemodes/miniantags/guardian/types/bomb_components/guardian_mine.dm b/code/game/gamemodes/miniantags/guardian/types/bomb_components/guardian_mine.dm index 0abfe850e58..26dea446d90 100644 --- a/code/game/gamemodes/miniantags/guardian/types/bomb_components/guardian_mine.dm +++ b/code/game/gamemodes/miniantags/guardian/types/bomb_components/guardian_mine.dm @@ -1,7 +1,7 @@ /** * Guardian's mines. Can be attached to anything to do explosive stuff on a victim. */ -#define MINE_LIFE_TIME 60 SECONDS +#define MINE_LIFE_TIME (60 SECONDS) ///Datum specialized for guardian(holoparasite)-bomber. /datum/component/guardian_mine diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index 45604bd52e9..2eda2e1f448 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -74,7 +74,7 @@ unstun_time = 0 notransform = 0 to_chat(src, "You can move again!") - update_spooky_icon() + update_icon(UPDATE_ICON_STATE) /mob/living/simple_animal/revenant/ex_act(severity) return 1 //Immune to the effects of explosions. @@ -217,7 +217,7 @@ invisibility = 0 playsound(src, 'sound/effects/screech.ogg', 100, 1) visible_message("[src] lets out a waning screech as violet mist swirls around its dissolving body!") - icon_state = "revenant_draining" + update_icon(UPDATE_ICON_STATE) for(var/i = alpha, i > 0, i -= 10) sleep(0.1) alpha = i @@ -285,7 +285,7 @@ else to_chat(src, "You have been revealed!") unreveal_time = unreveal_time + time - update_spooky_icon() + update_icon(UPDATE_ICON_STATE) /mob/living/simple_animal/revenant/proc/stun(time) if(!src) @@ -299,9 +299,9 @@ else to_chat(src, "You cannot move!") unstun_time = unstun_time + time - update_spooky_icon() + update_icon(UPDATE_ICON_STATE) -/mob/living/simple_animal/revenant/proc/update_spooky_icon() +/mob/living/simple_animal/revenant/update_icon_state() if(revealed) if(notransform) if(draining) diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm index e4cbb83c190..f455d085dbe 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm @@ -74,7 +74,6 @@ to_chat(src, "You begin siphoning essence from [target]'s soul.") if(target.stat != DEAD) to_chat(target, "You feel a horribly unpleasant draining sensation as your grip on life weakens...") - icon_state = "revenant_draining" reveal(27) stun(27) target.visible_message("[target] suddenly rises slightly into the air, [target.p_their()] skin turning an ashy gray.") @@ -252,7 +251,7 @@ sleep(2 SECONDS) if(!L.on) //wait, wait, don't shock me return - flick("[L.base_state]2", L) + flick("[L.base_icon_state]2", L) for(var/mob/living/M in view(shock_range, L)) if(M == user) continue diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index bb69b9dfbe3..52f177e536c 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -27,6 +27,10 @@ var/obj/item/disk/nuclear/the_disk = null var/obj/machinery/nuclearbomb/the_bomb = null var/obj/machinery/nuclearbomb/syndicate/the_s_bomb = null // used by syndicate pinpointers. + var/atom/target = null + var/turf/target_turf = null + var/turf/source_turf = null + var/prev_dist var/cur_index = 1 // Which index the current mode is var/mode = MODE_OFF // On which mode the pointer is at var/modes = list(MODE_DISK, MODE_NUKE) // Which modes are there @@ -39,39 +43,55 @@ var/icon_medium = "pinonmedium" var/icon_far = "pinonfar" -/obj/item/pinpointer/New() - ..() + +/obj/item/pinpointer/Initialize(mapload) + . = ..() GLOB.pinpointer_list += src + /obj/item/pinpointer/Destroy() STOP_PROCESSING(SSfastprocess, src) GLOB.pinpointer_list -= src mode = MODE_OFF the_disk = null + the_bomb = null + the_s_bomb = null + target = null + target_turf = null + source_turf = null return ..() + /obj/item/pinpointer/process() - if(mode == MODE_DISK) - workdisk() - else if(mode == MODE_NUKE) - workbomb() + switch(mode) + if(MODE_DISK) + workdisk() + if(MODE_NUKE) + workbomb() + /obj/item/pinpointer/attack_self(mob/user) cycle(user) -/obj/item/pinpointer/proc/cycle(mob/user) + +/obj/item/pinpointer/proc/cycle(mob/user, silent = FALSE) if(cur_index > length(modes)) mode = MODE_OFF - to_chat(user, "Вы отключили [src.name].") + prev_dist = null + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSfastprocess, src) - icon_state = icon_off cur_index = 1 + if(!silent) + to_chat(user, span_notice("You turn off [name].")) return if(cur_index == 1) START_PROCESSING(SSfastprocess, src) mode = modes[cur_index++] - activate_mode(mode, user) - to_chat(user, "[get_mode_text(mode)]") + if(!target) + update_icon(UPDATE_ICON_STATE) // we need to update icon only without target, since processing will do it for us + if(!silent) + to_chat(user, span_notice("[get_mode_text(mode)]")) + /obj/item/pinpointer/proc/get_mode_text(mode) switch(mode) @@ -93,166 +113,204 @@ return "High energy scanner active." -/obj/item/pinpointer/proc/activate_mode(mode, mob/user) //for crew pinpointer - return - /obj/item/pinpointer/proc/scandisk() if(!the_disk) - the_disk = locate() + the_disk = locate() in GLOB.poi_list + /obj/item/pinpointer/proc/scanbomb() - if(!syndicate) - if(!the_bomb) - the_bomb = locate() - else - if(!the_s_bomb) - the_s_bomb = locate() + if(syndicate && !the_s_bomb) + the_s_bomb = locate() in GLOB.poi_list + return + if(!syndicate && !the_bomb) + the_bomb = locate() in GLOB.poi_list + + +/obj/item/pinpointer/update_icon_state() + if(mode == MODE_OFF) + icon_state = icon_off + return -/obj/item/pinpointer/proc/pinpoint_at(atom/target) if(!target) icon_state = icon_null return - var/turf/T = get_turf(target) - var/turf/L = get_turf(src) + switch(prev_dist) + if(-1) + icon_state = icon_direct + if(1 to 8) + icon_state = icon_close + if(9 to 16) + icon_state = icon_medium + if(16 to INFINITY) + icon_state = icon_far + + +/obj/item/pinpointer/proc/pinpoint_at(atom/pin_target) + if(!pin_target) + nullify_targets() + return + + target = pin_target + if(!target_turf) + target_turf = get_turf(pin_target) + if(!source_turf) + source_turf = get_turf(src) + + if(!(target_turf && source_turf) || (target_turf.z != source_turf.z)) + nullify_targets() + return + + dir = get_dir(source_turf, target_turf) + var/new_dist = get_dist(source_turf, target_turf) + if(new_dist != prev_dist) + prev_dist = new_dist + update_icon(UPDATE_ICON_STATE) + + target_turf = null + source_turf = null + + +/obj/item/pinpointer/proc/nullify_targets(stop_icon_update = FALSE) + var/should_update = target + target = null + target_turf = null + source_turf = null + prev_dist = null + if(!stop_icon_update && should_update) + update_icon(UPDATE_ICON_STATE) - if(!(T && L) || (T.z != L.z)) - icon_state = icon_null - else - dir = get_dir(L, T) - switch(get_dist(L, T)) - if(-1) - icon_state = icon_direct - if(1 to 8) - icon_state = icon_close - if(9 to 16) - icon_state = icon_medium - if(16 to INFINITY) - icon_state = icon_far /obj/item/pinpointer/proc/workdisk() scandisk() pinpoint_at(the_disk) + /obj/item/pinpointer/proc/workbomb() - if(!syndicate) - scanbomb() - pinpoint_at(the_bomb) - else - scanbomb() - pinpoint_at(the_s_bomb) + scanbomb() + pinpoint_at(syndicate ? the_s_bomb : the_bomb) + /obj/item/pinpointer/examine(mob/user) . = ..() if(shows_nuke_timer) - for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines) + for(var/obj/machinery/nuclearbomb/bomb in GLOB.poi_list) if(bomb.timing) - . += "Extreme danger. Arming signal detected. Time remaining: [bomb.timeleft]" + . += span_warning("Extreme danger. Arming signal detected. Time remaining: [bomb.timeleft]") /obj/item/pinpointer/advpinpointer name = "advanced pinpointer" desc = "A larger version of the normal pinpointer, this unit features a helpful quantum entanglement detection system to locate various objects that do not broadcast a locator signal." modes = list(MODE_ADV) var/modelocked = FALSE // If true, user cannot change mode. - var/turf/location = null - var/obj/target = null - var/setting = 0 + var/setting = NONE + + +/obj/item/pinpointer/advpinpointer/examine(mob/user) + . = ..() + if(Adjacent(user)) + . += span_info("You can Alt-Click to choose tracking target.") + /obj/item/pinpointer/advpinpointer/process() switch(setting) if(SETTING_DISK) workdisk() - if(SETTING_LOCATION) - pinpoint_at(location) - if(SETTING_OBJECT) + if(SETTING_LOCATION, SETTING_OBJECT) pinpoint_at(target) -/obj/item/pinpointer/advpinpointer/workdisk() //since mode works diffrently for advpinpointer - scandisk() - pinpoint_at(the_disk) /obj/item/pinpointer/advpinpointer/AltClick(mob/user) - . = ..() - toggle_mode(user) + if(Adjacent(user)) + toggle_mode(user) + return + ..() + -/obj/item/pinpointer/advpinpointer/verb/toggle_mode(mob/user) +/obj/item/pinpointer/advpinpointer/verb/toggle_mode_verb() set category = "Object" set name = "Toggle Pinpointer Mode" set src in usr - if(user.stat || user.restrained()) + toggle_mode(usr) + + +/obj/item/pinpointer/advpinpointer/proc/toggle_mode(mob/user) + if(!iscarbon(user) || user.incapacitated()) return if(modelocked) - to_chat(user, "[src] is locked. It can only track one specific target.") + to_chat(user, span_warning("[src] is locked. It can only track one specific target.")) return - mode = MODE_OFF - icon_state = icon_off - target = null - location = null - switch(alert("Please select the mode you want to put the pinpointer in.", "Pinpointer Mode Select", "Location", "Disk Recovery", "Other Signature")) if("Location") setting = SETTING_LOCATION - var/locationx = input(user, "Введите X координату для поиска.", "Локация?" , "") as num - if(!locationx || !(user in view(1,src))) + var/locationx = input(user, "Enter X coordinate to search.", "Location X Define" , "") as null|num + if(isnull(locationx) || !(user in view(1,src))) return - var/locationy = input(user, "Введите Y координату для поиска.", "Локация?" , "") as num - if(!locationy || !(user in view(1,src))) + var/locationy = input(user, "Enter Y coordinate to search.", "Location Y Define" , "") as null|num + if(isnull(locationy) || !(user in view(1,src))) return - var/turf/Z = get_turf(src) - - location = locate(locationx,locationy,Z.z) - - to_chat(user, "Вы переключили пинпоинтер для обнаружения [locationx],[locationy]") - - - return attack_self(user) + source_turf = get_turf(src) + locationx = clamp(locationx, 1, 255) + locationy = clamp(locationy, 1, 255) + target = locate(locationx, locationy, source_turf.z) + to_chat(user, span_notice("You point the pinpointer to coordinates: [locationx], [locationy].")) if("Disk Recovery") setting = SETTING_DISK - return attack_self(user) + to_chat(user, span_notice("You point the pinpointer to Nuclear Authentication Disk.")) if("Other Signature") setting = SETTING_OBJECT switch(alert("Search for item signature or DNA fragment?" , "Signature Mode Select" , "Item" , "DNA")) if("Item") - var/list/item_names[0] - var/list/item_paths[0] - for(var/objective in GLOB.potential_theft_objectives) - var/datum/theft_objective/T = objective - var/name = initial(T.name) + var/list/item_names = list() + var/list/item_paths = list() + for(var/datum/theft_objective/objective as anything in GLOB.potential_theft_objectives) + var/name = initial(objective.name) item_names += name - item_paths[name] = initial(T.typepath) - var/targetitem = tgui_input_list(user, "Select item to search for.", "Select Item", item_names) + item_paths[name] = initial(objective.typepath) + var/targetitem = tgui_input_list(user, "Select item to serach for.", "Item Mode Select", item_names) if(!targetitem) return + target = null var/list/target_candidates = get_all_of_type(item_paths[targetitem], subtypes = TRUE) for(var/obj/item/candidate in target_candidates) if(!is_admin_level((get_turf(candidate)).z)) target = candidate + to_chat(user, span_notice("You point the pinpointer to [target].")) break if(!target) - to_chat(user, "Failed to locate [targetitem]!") - return - to_chat(user, "Вы переключили пинпоинтер для обнаружения [targetitem].") + nullify_targets(stop_icon_update = TRUE) + to_chat(user, span_warning("Could not find [targetitem] signature!")) + if("DNA") - var/DNAstring = input("Input DNA string to search for." , "Please Enter String." , "") + var/DNAstring = input("Input DNA string to search for." , "Please Enter String" , "") if(!DNAstring) return - for(var/mob/living/carbon/C in GLOB.mob_list) - if(!C.dna) + + target = null + for(var/mob/living/carbon/human/check as anything in GLOB.human_list) + if(!check.dna) continue - if(C.dna.unique_enzymes == DNAstring) - target = C + if(check.dna.unique_enzymes == DNAstring) + target = check + to_chat(user, span_notice("You point the pinpointer to [check.real_name].")) break - return attack_self(user) + if(!target) + nullify_targets(stop_icon_update = TRUE) + to_chat(user, span_warning("Failed to detect humanoid with DNA: [DNAstring]!")) + + if(mode == MODE_OFF) + cycle(user, silent = TRUE) + /////////////////////// //nuke op pinpointers// @@ -263,6 +321,7 @@ syndicate = TRUE modes = list(MODE_DISK, MODE_NUKE) + /obj/item/pinpointer/nukeop/process() switch(mode) if(MODE_DISK) @@ -272,42 +331,40 @@ if(MODE_SHIP) worklocation() + /obj/item/pinpointer/nukeop/workdisk() if(GLOB.bomb_set) //If the bomb is set, lead to the shuttle mode = MODE_SHIP //Ensures worklocation() continues to work modes = list(MODE_SHIP) - playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) //Plays a beep - visible_message("Shuttle Locator mode actived.") //Lets the mob holding it know that the mode has changed + playsound(loc, 'sound/machines/twobeep.ogg', 50, TRUE) //Plays a beep + visible_message(span_notice("Shuttle Locator mode actived.")) //Lets the mob holding it know that the mode has changed return //Get outta here scandisk() pinpoint_at(the_disk) + /obj/item/pinpointer/nukeop/workbomb() if(GLOB.bomb_set) //If the bomb is set, lead to the shuttle mode = MODE_SHIP //Ensures worklocation() continues to work modes = list(MODE_SHIP) - playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) //Plays a beep - visible_message("Shuttle Locator mode actived.") //Lets the mob holding it know that the mode has changed + playsound(loc, 'sound/machines/twobeep.ogg', 50, TRUE) //Plays a beep + visible_message(span_notice("Shuttle Locator mode actived.")) //Lets the mob holding it know that the mode has changed return //Get outta here scanbomb() pinpoint_at(the_s_bomb) + /obj/item/pinpointer/nukeop/proc/worklocation() if(!GLOB.bomb_set) mode = MODE_DISK modes = list(MODE_DISK, MODE_NUKE) - playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) - visible_message("Authentication Disk Locator mode actived.") + playsound(loc, 'sound/machines/twobeep.ogg', 50, TRUE) + visible_message(span_notice("Authentication Disk Locator mode actived.")) return if(!home) home = SSshuttle.getShuttle("syndicate") - if(!home) - icon_state = icon_null - return - if(loc.z != home.z) //If you are on a different z-level from the shuttle - icon_state = icon_null - else - pinpoint_at(home) + pinpoint_at(home) + /obj/item/pinpointer/operative name = "operative pinpointer" @@ -319,71 +376,80 @@ icon_close = "pinonclose_contractor" icon_medium = "pinonmedium_contractor" icon_far = "pinonfar_contractor" - var/mob/living/carbon/nearest_op = null modes = list(MODE_OPERATIVE) + /obj/item/pinpointer/operative/process() if(mode == MODE_OPERATIVE) - workop() - else - icon_state = icon_off + scan_for_ops() + pinpoint_at(target) + /obj/item/pinpointer/operative/proc/scan_for_ops() - if(mode == MODE_OPERATIVE) - nearest_op = null //Resets nearest_op every time it scans - var/closest_distance = 1000 - for(var/mob/living/carbon/M in GLOB.mob_list) - if(M.mind && (M.mind in SSticker.mode.syndicates)) - if(get_dist(M, get_turf(src)) < closest_distance) //Actually points toward the nearest op, instead of a random one like it used to - nearest_op = M - -/obj/item/pinpointer/operative/proc/workop() - if(mode == MODE_OPERATIVE) - scan_for_ops() - pinpoint_at(nearest_op, FALSE) - else - return FALSE + target = null // Resets nearest_op every time it scans + var/closest_distance = 1000 + source_turf = get_turf(src) + if(!source_turf) + return + var/mob/living/carbon/human/holder = get(loc, /mob/living/carbon/human) + for(var/mob/living/carbon/human/operative as anything in (GLOB.human_list - holder)) + if(operative.mind && (operative.mind in SSticker.mode.syndicates)) + target_turf = get_turf(operative) + if(!target_turf) + continue + var/new_dist = get_dist(source_turf, target_turf) + if(source_turf.z == target_turf.z && new_dist < closest_distance) //Actually points toward the nearest op, instead of a random one like it used to + target = operative + closest_distance = new_dist + /obj/item/pinpointer/operative/examine(mob/user) . = ..() - if(mode == MODE_OPERATIVE) - if(nearest_op) - . += "Nearest operative detected is [nearest_op.real_name]." - else - . += "No operatives detected within scanning range." + if(target) + var/mob/living/carbon/human/operative = target + . += span_notice("Nearest operative detected is [operative.real_name].") + else + . += span_notice("No operatives detected within scanning range.") + /obj/item/pinpointer/ninja name = "spider clan pinpointer" desc = "A pinpointer that leads to the first Spider Clan assassin detected." - var/mob/living/carbon/nearest_ninja = null modes = list(MODE_NINJA) + /obj/item/pinpointer/ninja/process() if(mode == MODE_NINJA) - workninja() - else - icon_state = icon_off + scan_for_ninja() + pinpoint_at(target) + /obj/item/pinpointer/ninja/proc/scan_for_ninja() - if(mode == MODE_NINJA) - nearest_ninja = null //Resets nearest_ninja every time it scans - var/closest_distance = 1000 - for(var/mob/living/carbon/potential_ninja in GLOB.mob_list) - if(isninja(potential_ninja)) - if(get_dist(potential_ninja, get_turf(src)) < closest_distance) - nearest_ninja = potential_ninja + target = null //Resets nearest_ninja every time it scans + var/closest_distance = 1000 + source_turf = get_turf(src) + if(!source_turf) + return + var/mob/living/carbon/human/holder = get(loc, /mob/living/carbon/human) + for(var/mob/living/carbon/human/potential_ninja as anything in (GLOB.human_list - holder)) + if(isninja(potential_ninja)) + target_turf = get_turf(potential_ninja) + if(!target_turf) + continue + var/new_dist = get_dist(source_turf, target_turf) + if(source_turf.z == target_turf.z && new_dist < closest_distance) + target = potential_ninja + closest_distance = new_dist -/obj/item/pinpointer/ninja/proc/workninja() - scan_for_ninja() - pinpoint_at(nearest_ninja, FALSE) /obj/item/pinpointer/ninja/examine(mob/user) . = ..() - if(mode == MODE_NINJA) - if(nearest_ninja) - . += "Nearest ninja detected is [nearest_ninja.real_name]." - else - . += "No ninjas detected within scanning range." + if(target) + var/mob/living/carbon/human/ninja = target + . += span_notice("Nearest ninja detected is [ninja.real_name].") + else + . += span_notice("No ninjas detected within scanning range.") + /obj/item/pinpointer/crew name = "crew pinpointer" @@ -397,72 +463,108 @@ icon_medium = "pinonmedium_crew" icon_far = "pinonfar_crew" modes = list(MODE_CREW) - var/target = null //for targeting in processing - var/target_set = FALSE //have we set a target at any point? -/obj/item/pinpointer/crew/proc/trackable(mob/living/carbon/human/H) - if(H && istype(H.w_uniform, /obj/item/clothing/under)) - var/turf/here = get_turf(src) - var/obj/item/clothing/under/U = H.w_uniform + +/obj/item/pinpointer/crew/examine(mob/user) + . = ..() + if(Adjacent(user)) + . += span_info("You can Alt-Click to choose whom to track.") + + +/obj/item/pinpointer/crew/proc/is_trackable(mob/living/carbon/human/pin_target) + if(pin_target && istype(pin_target.w_uniform, /obj/item/clothing/under)) + source_turf = get_turf(src) + if(!source_turf) + return FALSE + var/obj/item/clothing/under/uniform = pin_target.w_uniform // Suit sensors must be on maximum. - if(!U.has_sensor || U.sensor_mode < 3) + if(!uniform.has_sensor || uniform.sensor_mode < 3) return FALSE - var/turf/there = get_turf(U) - return istype(there) && there.z == here.z + target_turf = get_turf(pin_target) + return target_turf && source_turf.z == target_turf.z return FALSE + /obj/item/pinpointer/crew/process() - if(mode == MODE_CREW && target_set) + if(mode == MODE_CREW) pinpoint_at(target) -/obj/item/pinpointer/crew/pinpoint_at(atom/target) - if(!target || !trackable(target)) - icon_state = icon_null + +/obj/item/pinpointer/crew/pinpoint_at(atom/pin_target) + if(!is_trackable(pin_target)) + nullify_targets() return + ..() + + +/obj/item/pinpointer/crew/AltClick(mob/user) + if(Adjacent(user)) + choose_signal(user) + return + ..() + + +/obj/item/pinpointer/crew/verb/choose_signal_verb() + set category = "Object" + set name = "Track Signals" + set src in usr + + choose_signal(usr) - ..(target) -/obj/item/pinpointer/crew/activate_mode(mode, mob/user) +/obj/item/pinpointer/crew/proc/choose_signal(mob/living/carbon/user) + if(!iscarbon(user) || user.incapacitated()) + return + var/list/name_counts = list() var/list/names = list() - for(var/thing in GLOB.human_list) - var/mob/living/carbon/human/H = thing - if(!trackable(H)) + for(var/mob/living/carbon/human/human as anything in GLOB.human_list) + if(!is_trackable(human)) continue - var/name = "Unknown" - if(H.wear_id) - var/obj/item/card/id/I = H.wear_id.GetID() - if(I) - name = I.registered_name - - while(name in name_counts) - name_counts[name]++ - name = text("[] ([])", name, name_counts[name]) - names[name] = H - name_counts[name] = 1 - - if(!names.len) - user.visible_message("[user]'s pinpointer fails to detect a signal.", "Your pinpointer fails to detect a signal.") + var/human_name = "Unknown" + if(human.wear_id) + var/obj/item/card/id/card = human.wear_id.GetID() + if(card) + human_name = card.registered_name + + while(human_name in name_counts) + name_counts[human_name]++ + human_name = "[human_name] ([name_counts[human_name]])" + names[human_name] = human + name_counts[human_name] = 1 + + if(!length(names)) + user.visible_message( + span_notice("[user]'s pinpointer fails to detect any signals."), + span_notice("Your pinpointer fails to detect any signals."), + ) return - var/A = tgui_input_list(user, "Person to track", "Pinpoint", names) - if(!src || !user || (user.get_active_hand() != src) || user.incapacitated() || !A) + var/choice = tgui_input_list(user, "Person to track", "Pinpoint", names) + if(!choice || !src || !user || (user.get_active_hand() != src) || user.incapacitated()) return - target = names[A] - target_set = TRUE - user.visible_message("[user] activates [user.p_their()] pinpointer.", "You activate your pinpointer.") + target = names[choice] + user.visible_message( + span_notice("[user] activates [user.p_their()] pinpointer."), + span_notice("You start tracking [choice]."), + ) + + if(mode == MODE_OFF) + cycle(user, silent = TRUE) + /obj/item/pinpointer/crew/centcom name = "centcom pinpointer" desc = "A handheld tracking device that tracks crew based on remote centcom sensors." -/obj/item/pinpointer/crew/centcom/trackable(mob/living/carbon/human/H) - var/turf/here = get_turf(src) - var/turf/there = get_turf(H) - return istype(there) && istype(here) && there.z == here.z + +/obj/item/pinpointer/crew/centcom/is_trackable(mob/living/carbon/human/pin_target) + source_turf = get_turf(src) + target_turf = get_turf(pin_target) + return source_turf && target_turf && source_turf.z == target_turf.z /////////////////////// @@ -480,73 +582,76 @@ icon_close = "pinonclose_crew" icon_medium = "pinonmedium_crew" icon_far = "pinonfar_crew" - var/turf/location = null - var/obj/target = null var/setting = NONE var/list/current_targets var/targets_index = 1 +/obj/item/pinpointer/thief/examine(mob/user) + . = ..() + if(Adjacent(user)) + . += span_info("Нажмите Alt-Click для выбора режима отслеживания.") + + /obj/item/pinpointer/thief/process() - switch(setting) - if(SETTING_LOCATION) - pinpoint_at(location) - if(SETTING_OBJECT) - pinpoint_at(target) + if(setting == SETTING_LOCATION || setting == SETTING_OBJECT) + pinpoint_at(target) -/obj/item/pinpointer/thief/cycle(mob/user) +/obj/item/pinpointer/thief/cycle(mob/user, silent = TRUE) . = ..() switch(setting) if(SETTING_LOCATION) - if(!location) - to_chat(user, "Определите координаты локации у пинпоинтера.") + if(!target) + to_chat(user, span_notice("Определите координаты локации у пинпоинтера.")) if(SETTING_OBJECT) if(!target) - to_chat(user, "Определите цель пинпоинтера.") + to_chat(user, span_notice("Определите цель пинпоинтера.")) else - to_chat(user, "Режим пинпоинтера не определен.") + to_chat(user, span_notice("Режим пинпоинтера не определен.")) /obj/item/pinpointer/thief/AltClick(mob/user) - . = ..() - toggle_mode(user) + if(Adjacent(user)) + toggle_mode(user) + return + ..() -/obj/item/pinpointer/thief/verb/toggle_mode(mob/user) +/obj/item/pinpointer/thief/verb/toggle_mode_verb() set category = "Object" set name = "Переключить Режим Пинпоинтера" set src in usr - if(user.stat || user.restrained()) - return + toggle_mode(usr) - mode = MODE_OFF - icon_state = icon_off - target = null - location = null + +/obj/item/pinpointer/thief/proc/toggle_mode(mob/user) + if(!iscarbon(user) || user.incapacitated()) + return switch(alert("Выберите режим пинпоинтера.", "Выбор режима пинпоинтера", "Локация", "Сигнатура Объекта", "Цели")) if("Локация") setting = SETTING_LOCATION - var/locationx = input(user, "Введите X координату для поиска.", "Локация?" , "") as num - if(!locationx || !(user in view(1,src))) + var/locationx = input(user, "Введите X координату для поиска.", "Локация?" , "") as null|num + if(isnull(locationx) || !(user in view(1,src))) return - var/locationy = input(user, "Введите Y координату для поиска.", "Локация?" , "") as num - if(!locationy || !(user in view(1,src))) + var/locationy = input(user, "Введите Y координату для поиска.", "Локация?" , "") as null|num + if(isnull(locationy) || !(user in view(1,src))) return - var/turf/Z = get_turf(src) - location = locate(locationx,locationy,Z.z) - to_chat(user, span_notice("Вы переключили пинпоинтер для обнаружения [locationx],[locationy]")) - return attack_self(user) + source_turf = get_turf(src) + locationx = clamp(locationx, 1, 255) + locationy = clamp(locationy, 1, 255) + target = locate(locationx, locationy, source_turf.z) + to_chat(user, span_notice("Вы переключили пинпоинтер на координаты: [locationx], [locationy].")) if("Сигнатура Объекта") setting = SETTING_OBJECT var/list/targets_list = list() - var/list/target_names[0] - var/list/target_paths[0] + var/list/target_names = list() + var/list/target_paths = list() var/input_ask = "Выберите сигнатуру" var/input_tittle = "Режим выбора" @@ -561,25 +666,22 @@ input_subtype = alert("Какой тип доступности предмета?" , "Определение Доступности Предмета" , "Сложнодоступен" , "Доступен" , "Коллекционный") switch(input_subtype) if("Сложнодоступен") - for(var/element in (GLOB.potential_theft_objectives_hard | GLOB.potential_theft_objectives)) - var/datum/theft_objective/theft = element - targets_list |= initial(theft.typepath) + for(var/datum/theft_objective/theft as anything in (GLOB.potential_theft_objectives_hard|GLOB.potential_theft_objectives)) + targets_list += initial(theft.typepath) if("Доступен") - for(var/element in GLOB.potential_theft_objectives_medium) - var/datum/theft_objective/theft = element - targets_list |= initial(theft.typepath) + for(var/datum/theft_objective/theft as anything in GLOB.potential_theft_objectives_medium) + targets_list += initial(theft.typepath) if("Коллекционный") - for(var/element in GLOB.potential_theft_objectives_collect) - var/datum/theft_objective/collect/theft = element + for(var/datum/theft_objective/collect/theft as anything in GLOB.potential_theft_objectives_collect) var/typepath_datum = initial(theft.typepath) if(typepath_datum) - targets_list |= typepath_datum + targets_list += typepath_datum continue var/subtype_datum = initial(theft.subtype) var/list/type_list = subtype_datum ? subtypesof(subtype_datum) : initial(theft.type_list) - targets_list |= type_list + targets_list += type_list if(!input_subtype) return @@ -589,20 +691,17 @@ return if("Структура") - for(var/element in GLOB.potential_theft_objectives_structure) - var/datum/theft_objective/structure/theft = element - targets_list |= initial(theft.typepath) + for(var/datum/theft_objective/structure/theft as anything in GLOB.potential_theft_objectives_structure) + targets_list += initial(theft.typepath) if("Питомец") - for(var/element in GLOB.potential_theft_objectives_animal) - var/datum/theft_objective/animal/theft = element - targets_list |= initial(theft.typepath) + for(var/datum/theft_objective/animal/theft as anything in GLOB.potential_theft_objectives_animal) + targets_list += initial(theft.typepath) - for(var/typepath in targets_list) - var/atom/temp_target = typepath - var/thief_name = initial(temp_target.name) - target_names |= thief_name - target_paths[thief_name] = temp_target + for(var/atom/theft_typepath as anything in targets_list) + var/theft_name = initial(theft_typepath.name) + target_names += theft_name + target_paths[theft_name] = theft_typepath var/choosen_target = tgui_input_list(user, "[input_ask], типа \"[input_type][input_subtype]\"", "[input_tittle]: [input_type][input_subtype]", target_names) if(!choosen_target) @@ -616,7 +715,6 @@ targets_index = 1 target = current_targets[targets_index] to_chat(user, span_notice("Вы переключили пинпоинтер для обнаружения [choosen_target]. Найдено целей: [length(current_targets)].")) - return attack_self(user) if("Цели") var/input_type = alert("Какую операцию стоит произвести?", "Выбор Операции", "Показать Цели", "Следующая Цель") @@ -626,8 +724,8 @@ var/list/all_objectives = user.mind.get_all_objectives() if(length(all_objectives) && user.mind.has_antag_datum(/datum/antagonist/thief)) var/list/targets_list = list() - var/list/target_names[0] - var/list/target_paths[0] + var/list/target_names = list() + var/list/target_paths = list() for(var/datum/objective/steal/objective in all_objectives) if(istype(objective, /datum/objective/steal/collect)) @@ -641,11 +739,10 @@ if(wanted_type) targets_list |= wanted_type - for(var/typepath in targets_list) - var/atom/temp_target = typepath - var/thief_name = initial(temp_target.name) - target_names |= thief_name - target_paths[thief_name] = temp_target + for(var/atom/theft_typepath as anything in targets_list) + var/theft_name = initial(theft_typepath.name) + target_names += theft_name + target_paths[theft_name] = theft_typepath var/choosen_target = tgui_input_list(user, "Выберите интересующую вас цель:", "Режим Выбора Цели", target_names) if(!choosen_target) @@ -662,8 +759,7 @@ else to_chat(user, span_warning("Не удалось обнаружить интересные цели для #REDACTED#! Если вы не член #REDACTED#, верните устройство владельцу или обратитесь по зашифрованному номеру на обратной стороне пинпоинтера.")) - - return attack_self(user) + return if("Следующая Цель") if(!length(current_targets)) @@ -682,6 +778,9 @@ target = current_targets[targets_index] + if(mode == MODE_OFF) + cycle(user, silent = TRUE) + /obj/item/pinpointer/tendril name = "ancient scanning unit" @@ -694,31 +793,29 @@ icon_medium = "pinonmedium_ancient" icon_far = "pinonfar_ancient" modes = list(MODE_TENDRIL) - var/obj/structure/spawner/lavaland/target -/obj/item/pinpointer/tendril/process() - if(mode == MODE_TENDRIL) - find_tendril() - pinpoint_at(target, FALSE) - else - icon_state = icon_off -/obj/item/pinpointer/tendril/proc/find_tendril() +/obj/item/pinpointer/tendril/process() if(mode == MODE_TENDRIL) scan_for_tendrils() pinpoint_at(target) - else - return FALSE + /obj/item/pinpointer/tendril/proc/scan_for_tendrils() - if(mode == MODE_TENDRIL) - target = null //Resets nearest_op every time it scans - var/closest_distance = 1000 - for(var/obj/structure/spawner/lavaland/T as anything in GLOB.tendrils) - var/temp_distance = get_dist(T, get_turf(src)) - if(temp_distance < closest_distance) - target = T - closest_distance = temp_distance + target = null //Resets nearest_op every time it scans + var/closest_distance = 1000 + source_turf = get_turf(src) + if(!source_turf) + return + for(var/obj/structure/spawner/lavaland/tendril as anything in GLOB.tendrils) + target_turf = get_turf(tendril) + if(!target_turf) + continue + var/new_dist = get_dist(source_turf, target_turf) + if(source_turf.z == target_turf.z && new_dist < closest_distance) + target = tendril + closest_distance = new_dist + /obj/item/pinpointer/tendril/examine(mob/user) . = ..() @@ -726,7 +823,6 @@ . += "Number of high energy signatures remaining: [length(GLOB.tendrils)]" - #undef MODE_OFF #undef MODE_DISK #undef MODE_NUKE @@ -740,3 +836,4 @@ #undef SETTING_DISK #undef SETTING_LOCATION #undef SETTING_OBJECT + diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 1067cedb557..0e6f72b8d96 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -484,6 +484,11 @@ GLOBAL_LIST_EMPTY(admin_objective_list) damage_explain = "токсинов" return damage_explain +/datum/objective/pain_hunter/check_completion() + if(start_of_completing && target && ishuman(target.current) && target.current.stat != DEAD) + return TRUE + else + return completed /datum/objective/protect //The opposite of killing a dude. name = "Protect" diff --git a/code/game/gamemodes/shadowling/ascendant_shadowling.dm b/code/game/gamemodes/shadowling/ascendant_shadowling.dm index c903a5ed1a3..0c0149bb622 100644 --- a/code/game/gamemodes/shadowling/ascendant_shadowling.dm +++ b/code/game/gamemodes/shadowling/ascendant_shadowling.dm @@ -33,14 +33,14 @@ faction = list("faithless") -/mob/living/simple_animal/ascendant_shadowling/New() - ..() +/mob/living/simple_animal/ascendant_shadowling/Initialize(mapload) + . = ..() if(prob(35)) icon_state = "NurnKal" icon_living = "NurnKal" - update_icons() + update_icon(UPDATE_OVERLAYS) -/mob/living/simple_animal/ascendant_shadowling/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/ascendant_shadowling/Process_Spacemove(movement_dir = 0) return 1 //copypasta from carp code /mob/living/simple_animal/ascendant_shadowling/ex_act(severity) @@ -49,11 +49,13 @@ /mob/living/simple_animal/ascendant_shadowling/singularity_act() return 0 //Well hi, fellow god! How are you today? -/mob/living/simple_animal/ascendant_shadowling/update_icons() - overlays.Cut() - overlays += mutable_appearance(icon = 'icons/mob/mob.dmi', icon_state = "shadowling_ascended_ms") -/mob/living/simple_animal/ascendant_shadowling/proc/announce(var/text, var/size = 4, var/new_sound = null) +/mob/living/simple_animal/ascendant_shadowling/update_overlays() + . = ..() + . += "shadowling_ascended_ms" + + +/mob/living/simple_animal/ascendant_shadowling/proc/announce(text, size = 4, new_sound = null) var/message = "\"[text]\"" for(var/mob/M in GLOB.player_list) if(!isnewplayer(M) && M.client) diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index f6c877338e7..398ee971a71 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -147,7 +147,7 @@ Made by Xhuis var/mob/living/carbon/human/S = shadow_mind.current shadow_mind.AddSpell(new /obj/effect/proc_holder/spell/shadowling_hatch(null)) spawn(0) - shadow_mind.current.add_language("Shadowling Hivemind") + shadow_mind.current.add_language(LANGUAGE_HIVE_SHADOWLING) update_shadow_icons_added(shadow_mind) if(shadow_mind.assigned_role == "Clown") to_chat(S, "Your alien nature has allowed you to overcome your clownishness.") @@ -161,7 +161,7 @@ Made by Xhuis new_thrall_mind.special_role = SPECIAL_ROLE_SHADOWLING_THRALL update_shadow_icons_added(new_thrall_mind) add_conversion_logs(new_thrall_mind.current, "Became a Shadow thrall") - new_thrall_mind.current.add_language("Shadowling Hivemind") + new_thrall_mind.current.add_language(LANGUAGE_HIVE_SHADOWLING) //If you add spells to thrall, be sure to remove them on dethrallize new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/shadowling_guise(null)) new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/shadowling_vision/thrall(null)) @@ -191,7 +191,7 @@ Made by Xhuis //If you add spells to thrall, be sure to remove them on dethrallize thrall_mind.RemoveSpell(/obj/effect/proc_holder/spell/shadowling_guise) thrall_mind.RemoveSpell(/obj/effect/proc_holder/spell/shadowling_vision/thrall) - thrall_mind.current.remove_language("Shadowling Hivemind") + thrall_mind.current.remove_language(LANGUAGE_HIVE_SHADOWLING) if(kill && ishuman(thrall_mind.current)) //If dethrallization surgery fails, kill the mob as well as dethralling them var/mob/living/carbon/human/H = thrall_mind.current H.visible_message("[H] jerks violently and falls still.", \ diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 8acf0b2d8fe..1f21b499f66 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -644,7 +644,7 @@ to_chat(user, "You sent the APC's power to the void while overloading all it's lights!") target_apc.cell?.charge = 0 //Sent to the shadow realm target_apc.chargemode = FALSE //Won't recharge either until an someone hits the button - target_apc.charging = FALSE + target_apc.charging = APC_NOT_CHARGING target_apc.null_charge() target_apc.update_icon() @@ -935,7 +935,7 @@ to_chat(target, "An agonizing spike of pain drives into your mind, and--") SSticker.mode.add_thrall(target.mind) target.mind.special_role = SPECIAL_ROLE_SHADOWLING_THRALL - target.add_language("Shadowling Hivemind") + target.add_language(LANGUAGE_HIVE_SHADOWLING) diff --git a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm index 38e95cd9904..5ba00f56936 100644 --- a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm @@ -282,7 +282,7 @@ GLOBAL_LIST_INIT(possibleShadowlingNames, list("U'ruan", "Y`shej", "Nex", "Hel-u undershirt = "None" socks = "None" faction |= "faithless" - add_language("Shadowling Hivemind") + add_language(LANGUAGE_HIVE_SHADOWLING) set_species(/datum/species/shadow/ling) equip_to_slot_or_del(new /obj/item/clothing/under/shadowling(src), slot_w_uniform) diff --git a/code/game/gamemodes/wizard/apprentice.dm b/code/game/gamemodes/wizard/apprentice.dm index b8b5867fade..5090f762be6 100644 --- a/code/game/gamemodes/wizard/apprentice.dm +++ b/code/game/gamemodes/wizard/apprentice.dm @@ -195,6 +195,7 @@ new /datum/magick_school.singulo, new /datum/magick_school.blood, new /datum/magick_school.necromantic, + new /datum/magick_school/lavaland, ) @@ -219,33 +220,8 @@ owner.mind.AddSpell(new /obj/effect/proc_holder/spell/forcewall(null)) owner.equip_or_collect(new /obj/item/gun/magic/staff/healing(owner), slot_r_hand) - //Нацепляем белый балахон - var/obj/item/clothing/suit/storage/mercy_hoodie/suit = new (owner) - suit.magical = TRUE - suit.name = "Роба целителя" - suit.desc = "Магическая роба прислужника-целителя, оберегающая от проказы." - suit.gas_transfer_coefficient = 0.01 - suit.permeability_coefficient = 0.01 - suit.body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - suit.armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 30, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 100, "acid" = 100) - suit.allowed = list(/obj/item/teleportation_scroll) - suit.flags_inv = HIDEJUMPSUIT - suit.strip_delay = 50 - suit.put_on_delay = 50 - suit.resistance_flags = FIRE_PROOF | ACID_PROOF - owner.equip_or_collect(suit, slot_wear_suit) - var/obj/item/clothing/head/mercy_hood/head = new (owner) - head.magical = TRUE - head.name = "Капюшон целителя" - head.desc = "Магический капюшон робы прислужника-целителя, оберегающий от проказы." - head.gas_transfer_coefficient = 0.01 - head.permeability_coefficient = 0.01 - head.armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 30, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 100, "acid" = 100) - head.resistance_flags = FIRE_PROOF | ACID_PROOF - head.strip_delay = 50 - head.put_on_delay = 50 - owner.equip_or_collect(head, slot_head) - + owner.equip_or_collect(new /obj/item/clothing/suit/wizrobe/healmage(owner), slot_wear_suit) + owner.equip_or_collect(new /obj/item/clothing/head/wizard/healmage(owner), slot_head) /datum/magick_school/motion name = "Школа Пространства" @@ -333,9 +309,8 @@ owner.mind.AddSpell(new /obj/effect/proc_holder/spell/sacred_flame(null)) ADD_TRAIT(owner, RESISTHOT, MAGIC_TRAIT) //sacred_flame из-за не совсем верной выдачи, без этого, не выдает защиту от огня. - //Стандартный костюм мага-воителя, который есть в башне волшебника и так. - owner.equip_or_collect(new /obj/item/clothing/suit/wizrobe/magusred(owner), slot_wear_suit) - owner.equip_or_collect(new /obj/item/clothing/head/wizard/magus(owner), slot_head) + owner.equip_or_collect(new /obj/item/clothing/suit/wizrobe/magusdefender(owner), slot_wear_suit) + owner.equip_or_collect(new /obj/item/clothing/head/wizard/magusdefender(owner), slot_head) /datum/magick_school/fire @@ -372,30 +347,8 @@ owner.mind.AddSpell(new /obj/effect/proc_holder/spell/touch/flesh_to_stone(null)) owner.equip_or_collect(new /obj/item/gun/magic/staff/animate(owner), slot_r_hand) - //Костюм настоящего художника-скульптора. - var/obj/item/clothing/suit/chef/classic/suit = new - suit.magical = TRUE - suit.name = "Фартук скульптора-волшебника" - suit.desc = "Классический фартук последователей школы ваяния, хорошо защищает от разлетающейся глины." - suit.gas_transfer_coefficient = 0.01 - suit.permeability_coefficient = 0.01 - suit.armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 30, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 100, "acid" = 100) - suit.strip_delay = 50 - suit.put_on_delay = 50 - suit.resistance_flags = FIRE_PROOF | ACID_PROOF - owner.equip_or_collect(suit, slot_wear_suit) - var/obj/item/clothing/head/beret/ce/head = new - head.magical = TRUE - head.name = "Берет скульптора-волшебника" - head.desc = "Классический берет последователей школы ваяния, позволяет выглядеть как настоящий художник." - head.gas_transfer_coefficient = 0.01 - head.permeability_coefficient = 0.01 - head.armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 30, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 100, "acid" = 100) - head.resistance_flags = FIRE_PROOF | ACID_PROOF - head.strip_delay = 50 - head.put_on_delay = 50 - owner.equip_or_collect(head, slot_head) - + owner.equip_or_collect(new /obj/item/clothing/suit/wizrobe/artmage(owner), slot_wear_suit) + owner.equip_or_collect(new /obj/item/clothing/head/wizard/artmage(owner), slot_head) /datum/magick_school/stand name = "Школа Хранителей" @@ -406,6 +359,8 @@ owner.mind.AddSpell(new /obj/effect/proc_holder/spell/forcewall/greater(null)) owner.equip_or_collect(new /obj/item/guardiancreator(owner), slot_r_hand) + owner.equip_or_collect(new /obj/item/clothing/suit/wizrobe/magusdefender(owner), slot_wear_suit) + owner.equip_or_collect(new /obj/item/clothing/head/wizard/magusdefender(owner), slot_head) /datum/magick_school/instability name = "Школа Неустойчивости" @@ -457,6 +412,9 @@ owner.equip_or_collect(new /obj/item/necromantic_stone(owner), slot_l_store) owner.equip_or_collect(new /obj/item/necromantic_stone(owner), slot_r_store) + owner.equip_or_collect(new /obj/item/clothing/suit/wizrobe/necromage(owner), slot_wear_suit) + owner.equip_or_collect(new /obj/item/clothing/head/wizard/necromage(owner), slot_head) + /datum/magick_school/vision name = "Школа Прозрения" @@ -474,9 +432,8 @@ owner.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE to_chat(owner, "The walls suddenly disappear.") - //Нацепляем простой фиолетовый балахон - owner.equip_or_collect(new /obj/item/clothing/suit/wizrobe/psypurple(owner), slot_wear_suit) - owner.equip_or_collect(new /obj/item/clothing/head/wizard/amp(owner), slot_head) + owner.equip_or_collect(new /obj/item/clothing/suit/wizrobe/visionmage(owner), slot_wear_suit) + owner.equip_or_collect(new /obj/item/clothing/head/wizard/visionmage(owner), slot_head) /datum/magick_school/singulo @@ -534,3 +491,20 @@ owner.equip_or_collect(new /obj/item/clothing/suit/wizrobe/magusred(owner), slot_wear_suit) owner.equip_or_collect(new /obj/item/clothing/head/wizard/magus(owner), slot_head) +/datum/magick_school/lavaland + name = "Школа Лаваленда" + id = "lavaland" + desc = "Школа, использующая традиции магии пеплоходцев." + +/datum/magick_school/lavaland/kit() + owner.faction += "mining" + owner.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe/conjure/legion_skulls) + owner.mind.AddSpell(new /obj/effect/proc_holder/spell/goliath_tentacles) + owner.mind.AddSpell(new /obj/effect/proc_holder/spell/goliath_dash) + owner.mind.AddSpell(new /obj/effect/proc_holder/spell/watchers_look) + owner.mind.AddSpell(new /obj/effect/proc_holder/spell/touch/healtouch) + + owner.equip_or_collect(new /obj/item/clothing/under/ash_walker(owner), slot_w_uniform) + owner.equip_or_collect(new /obj/item/clothing/gloves/color/black/goliath(owner), slot_gloves) + owner.equip_or_collect(new /obj/item/clothing/suit/hooded/goliath/wizard(owner), slot_wear_suit) + diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index a057c9e3385..de8beea2100 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -31,7 +31,7 @@ icon = 'icons/obj/biomass.dmi' icon_state = "rift" density = 1 - anchored = 1.0 + anchored = TRUE var/spawn_path = /mob/living/simple_animal/cow //defaulty cows to prevent unintentional narsies var/spawn_amt_left = 20 diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 9ee9635e241..cfd99857dfc 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -66,6 +66,29 @@ A.death() return ..() + +/obj/item/soulstone/update_name(updates = ALL) + . = ..() + var/mob/living/simple_animal/shade/shade = locate() in src + if(shade) + name = "soulstone: [shade.name]" + else + name = initial(name) + + +/obj/item/soulstone/update_icon_state() + if(purified) + icon_state = "purified_soulstone" + icon_state_full = "purified_soulstone2" + else + icon_state = initial(icon_state) + icon_state_full = initial(icon_state_full) + + var/mob/living/simple_animal/shade/shade = locate() in src + if(shade) + icon_state = icon_state_full + + //////////////////////////////Capturing//////////////////////////////////////////////////////// /obj/item/soulstone/attack(mob/living/carbon/human/M, mob/living/user) if(M == user) @@ -161,11 +184,9 @@ usability = TRUE purified = TRUE optional = TRUE - icon_state = "purified_soulstone" - icon_state_full = "purified_soulstone2" - for(var/mob/M in contents) + update_icon(UPDATE_ICON_STATE) + for(var/mob/M in src) if(M.mind) - icon_state = "purified_soulstone2" if(iscultist(M)) SSticker.mode.remove_cultist(M.mind, FALSE) to_chat(M, "An unfamiliar white light flashes through your mind, cleansing the taint of [SSticker.cultdat ? SSticker.cultdat.entity_title1 : "Nar'Sie"] \ @@ -173,10 +194,10 @@ to_chat(M, "Assist [user], your saviour, and get vengeance on those who enslaved you!") else to_chat(M, "Your soulstone has been exorcised, and you are now bound to obey [user]. ") - - for(var/mob/living/simple_animal/shade/EX in src) - EX.holy = TRUE - EX.icon_state = "shade_angelic" + if(istype(M, /mob/living/simple_animal/shade)) + var/mob/living/simple_animal/shade/shade = M + shade.holy = TRUE + shade.update_icon(UPDATE_ICON_STATE) user.visible_message("[user] purifies [src]!", "You purify [src]!") else if(istype(O, /obj/item/melee/cultblade/dagger) && iscultist(user)) @@ -187,16 +208,15 @@ usability = FALSE purified = FALSE optional = FALSE - icon_state = "soulstone" - icon_state_full = "soulstone2" - for(var/mob/M in contents) + update_icon(UPDATE_ICON_STATE) + for(var/mob/M in src) if(M.mind) - icon_state = "soulstone2" SSticker.mode.add_cultist(M.mind) to_chat(M, "Your shard has been cleansed of holy magic, and you are now bound to the cult's will. Obey them and assist in their goals.") - for(var/mob/living/simple_animal/shade/EX in src) - EX.holy = FALSE - EX.icon_state = SSticker.cultdat?.shade_icon_state + if(istype(M, /mob/living/simple_animal/shade)) + var/mob/living/simple_animal/shade/shade = M + shade.holy = FALSE + shade.update_icon(UPDATE_ICON_STATE) to_chat(user, "You have cleansed [src] of holy magic.") else ..() @@ -218,11 +238,7 @@ for(var/mob/living/simple_animal/shade/A in src) A.forceMove(get_turf(user)) A.cancel_camera() - if(purified) - icon_state = "purified_soulstone" - else - icon_state = "soulstone" - name = initial(name) + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) if(iscultist(A)) to_chat(A, "You have been released from your prison, but you are still bound to the cult's will. Help them succeed in their goals at all costs.") else @@ -264,14 +280,30 @@ desc = "A holy machine used by those who are pure in soul and mind. It is inactive." var/defiled = FALSE + +/obj/structure/constructshell/holy/update_icon_state() + icon_state = defiled ? "construct-cult" : initial(icon_state) + + +/obj/structure/constructshell/holy/update_name(updates = ALL) + . = ..() + name = defiled ? "empty shell" : initial(name) + + +/obj/structure/constructshell/holy/update_desc(updates = ALL) + . = ..() + if(!defiled) + desc = initial(desc) + return + desc = "A wicked machine used by those skilled in magical arts. It is inactive." + + /obj/structure/constructshell/holy/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/storage/bible) && !iscultist(user) && user.mind.isholy) if(!defiled) return - name = initial(name) - icon_state = initial(icon_state) - desc = initial(desc) defiled = FALSE + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) if(defiled) return ..() if(istype(I, /obj/item/soulstone)) @@ -285,10 +317,7 @@ if(istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user)) if(do_after(user, 4 SECONDS, target = src)) user.visible_message("[user] defile [src] with dark magic!!", "You sanctified [src]. Yes-yes. I need more acolytes!") - name = "empty shell" - icon_state = "construct-cult" - desc = "A wicked machine used by those skilled in magical arts. It is inactive." - defiled = TRUE + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) return return ..() @@ -337,10 +366,9 @@ to_chat(user, "Capture failed!: The soul stone is full! Use or free an existing soul to make room.") else T.forceMove(src) // Put the shade into the stone. - T.canmove = 0 + T.canmove = FALSE T.health = T.maxHealth - icon_state = icon_state_full - name = "soulstone : [T.name]" + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) to_chat(T, "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form") to_chat(user, "Capture successful! [T.name]'s has been recaptured and stored within the soul stone.") @@ -437,8 +465,7 @@ S.real_name = "Shade of [M.real_name]" S.key = M.key S.cancel_camera() - name = "soulstone: [S.name]" - icon_state = icon_state_full + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) log_game("[S.key] has become [S.name] with [purified ? "holy" : "corrupted"] essence.") if(user) S.faction |= "\ref[user]" //Add the master as a faction, allowing inter-mob cooperation diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index a6a116f4f56..a56e6d94a30 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -158,6 +158,30 @@ spell_type = /obj/effect/proc_holder/spell/infinite_guns category = "Offensive" +/datum/spellbook_entry/goliath_tentacles + name = "Summon Tentacles" + spell_type = /obj/effect/proc_holder/spell/goliath_tentacles + category = "Offensive" + cost = 1 + +/datum/spellbook_entry/legion_skulls + name = "Summon Skulls" + spell_type = /obj/effect/proc_holder/spell/aoe/conjure/legion_skulls + category = "Offensive" + cost = 1 + +/datum/spellbook_entry/goliath_dash + name = "Goliath Dash" + spell_type = /obj/effect/proc_holder/spell/goliath_dash + category = "Offensive" + cost = 1 + +/datum/spellbook_entry/watchers_look + name = "Watcher's Look" + spell_type = /obj/effect/proc_holder/spell/watchers_look + category = "Offensive" + cost = 1 + //Defensive /datum/spellbook_entry/disabletech name = "Disable Tech" @@ -293,6 +317,12 @@ spell_type = /obj/effect/proc_holder/spell/noclothes category = "Assistance" +/datum/spellbook_entry/healtouch + name = "Healing Touch" + spell_type = /obj/effect/proc_holder/spell/touch/healtouch + category = "Assistance" + cost = 1 + //Rituals /datum/spellbook_entry/summon name = "Summon Stuff" diff --git a/code/game/jobs/job/central.dm b/code/game/jobs/job/central.dm index d012c9f2df9..af56c0128ec 100644 --- a/code/game/jobs/job/central.dm +++ b/code/game/jobs/job/central.dm @@ -7,7 +7,7 @@ total_positions = 5 spawn_positions = 5 supervisors = "the admins" - selection_color = "#ffdddd" + selection_color = "#6865B3" access = list() minimal_access = list() admin_only = 1 @@ -70,7 +70,7 @@ total_positions = 5 spawn_positions = 5 supervisors = "the admins" - selection_color = "#ffdddd" + selection_color = "#6865B3" access = list() minimal_access = list() admin_only = 1 diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 6bf500f0bed..2e549ba702d 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -6,7 +6,7 @@ spawn_positions = -1 supervisors = "the head of personnel" department_head = list("Head of Personnel") - selection_color = "#dddddd" + selection_color = "#e6e6e6" access = list() //See /datum/job/assistant/get_access() minimal_access = list() //See /datum/job/assistant/get_access() alt_titles = list("Tourist","Businessman","Trader","Assistant") diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 20e760dbc3f..f677cdca309 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -7,7 +7,7 @@ is_engineering = 1 supervisors = "the captain" department_head = list("Captain") - selection_color = "#ffeeaa" + selection_color = "#ffba4c" req_admin_notify = 1 access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA, @@ -57,7 +57,7 @@ is_engineering = 1 supervisors = "the chief engineer" department_head = list("Chief Engineer") - selection_color = "#fff5cc" + selection_color = "#ffeaca" access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM) alt_titles = list("Maintenance Technician","Engine Technician","Electrician") @@ -93,7 +93,7 @@ total_positions = 5 spawn_positions = 3 department_head = list("Chief Engineer", "Station Engineer") - selection_color = "#fff5cc" + selection_color = "#ffeaca" alt_titles = list("Engineer Assistant", "Technical Assistant", "Engineer Student", "Technical Student", "Technical Trainee") exp_requirements = 180 exp_type = EXP_TYPE_CREW @@ -142,7 +142,7 @@ is_engineering = 1 supervisors = "the chief engineer" department_head = list("Chief Engineer") - selection_color = "#fff5cc" + selection_color = "#ffeaca" access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_MINERAL_STOREROOM, ACCESS_EMERGENCY_STORAGE) minimal_access = list(ACCESS_EVA, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EMERGENCY_STORAGE, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE) alt_titles = list("Atmospheric Technician") @@ -178,7 +178,7 @@ is_engineering = 1 supervisors = "the chief engineer" department_head = list("Chief Engineer") - selection_color = "#fff5cc" + selection_color = "#ffeaca" access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECHANIC, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MINERAL_STOREROOM, ACCESS_EMERGENCY_STORAGE) minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EMERGENCY_STORAGE, ACCESS_MECHANIC, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MINERAL_STOREROOM) exp_requirements = 900 diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 60cfa2f78b9..f0bbcfbf7c2 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -7,7 +7,7 @@ is_medical = 1 supervisors = "the captain" department_head = list("Captain") - selection_color = "#ffddf0" + selection_color = "#66c6ff" req_admin_notify = 1 access = list(ACCESS_EVA, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_HEADS, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, @@ -53,7 +53,7 @@ is_medical = 1 supervisors = "the chief medical officer" department_head = list("Chief Medical Officer") - selection_color = "#ffeef0" + selection_color = "#d1eeff" access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY) alt_titles = list("Surgeon","Nurse") @@ -87,7 +87,7 @@ total_positions = 5 spawn_positions = 3 department_head = list("Chief Medical Officer", "Medical Doctor") - selection_color = "#ffeef0" + selection_color = "#d1eeff" alt_titles = list("Student Medical Doctor", "Medical Assistant") exp_requirements = 180 exp_type = EXP_TYPE_CREW @@ -134,7 +134,7 @@ is_medical = 1 supervisors = "the chief medical officer" department_head = list("Chief Medical Officer") - selection_color = "#ffeef0" + selection_color = "#d1eeff" access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE) minimal_player_age = 3 @@ -197,7 +197,7 @@ is_medical = 1 supervisors = "the chief medical officer" department_head = list("Chief Medical Officer") - selection_color = "#ffeef0" + selection_color = "#d1eeff" access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY, ACCESS_MINERAL_STOREROOM) alt_titles = list("Pharmacist","Pharmacologist") @@ -233,7 +233,7 @@ is_medical = 1 supervisors = "the chief medical officer and the research director" department_head = list("Chief Medical Officer", "Research Director") - selection_color = "#ffeef0" + selection_color = "#d1eeff" access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_RESEARCH) minimal_player_age = 3 @@ -268,7 +268,7 @@ is_medical = 1 supervisors = "the chief medical officer" department_head = list("Chief Medical Officer") - selection_color = "#ffeef0" + selection_color = "#d1eeff" access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MINERAL_STOREROOM) alt_titles = list("Pathologist","Microbiologist") @@ -305,7 +305,7 @@ is_medical = 1 supervisors = "the chief medical officer" department_head = list("Chief Medical Officer") - selection_color = "#ffeef0" + selection_color = "#d1eeff" access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_PSYCHIATRIST) minimal_access = list(ACCESS_MEDICAL, ACCESS_PSYCHIATRIST) alt_titles = list("Psychologist","Therapist") @@ -345,7 +345,7 @@ is_medical = 1 supervisors = "the chief medical officer" department_head = list("Chief Medical Officer") - selection_color = "#ffeef0" + selection_color = "#d1eeff" access = list(ACCESS_PARAMEDIC, ACCESS_MEDICAL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MORGUE, ACCESS_SURGERY) minimal_access=list(ACCESS_PARAMEDIC, ACCESS_MEDICAL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MORGUE, ACCESS_SURGERY) minimal_player_age = 3 diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 8918f067801..0eeeb918cc9 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -7,7 +7,7 @@ is_science = 1 supervisors = "the captain" department_head = list("Captain") - selection_color = "#ffddff" + selection_color = "#aa66cc" req_admin_notify = 1 access = list(ACCESS_EVA, ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, @@ -59,7 +59,7 @@ is_science = 1 supervisors = "the research director" department_head = list("Research Director") - selection_color = "#ffeeff" + selection_color = "#e6d1f0" access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MINERAL_STOREROOM) alt_titles = list("Anomalist", "Plasma Researcher", "Xenobiologist", "Chemical Researcher") @@ -96,7 +96,7 @@ total_positions = 5 spawn_positions = 3 department_head = list("Research Director", "Scientist") - selection_color = "#ffeeff" + selection_color = "#e6d1f0" alt_titles = list("Scientist Assistant", "Scientist Pregraduate", "Scientist Graduate", "Scientist Postgraduate", "Student Robotist") exp_requirements = 180 exp_type = EXP_TYPE_CREW @@ -139,7 +139,7 @@ is_science = 1 supervisors = "the research director" department_head = list("Research Director") - selection_color = "#ffeeff" + selection_color = "#e6d1f0" access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM) //As a job that handles so many corpses, it makes sense for them to have morgue access. minimal_access = list(ACCESS_ROBOTICS, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM) //As a job that handles so many corpses, it makes sense for them to have morgue access. alt_titles = list("Biomechanical Engineer","Mechatronic Engineer") diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index ed9ea68d11b..6bd31a22500 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -7,7 +7,7 @@ is_security = 1 supervisors = "the captain" department_head = list("Captain") - selection_color = "#ffdddd" + selection_color = "#c25656" req_admin_notify = 1 access = list(ACCESS_EVA, ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, ACCESS_PILOT, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, @@ -65,7 +65,7 @@ is_security = 1 supervisors = "the head of security" department_head = list("Head of Security") - selection_color = "#ffeeee" + selection_color = "#edcdcd" access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS) minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS) alt_titles = list("Brig Sergeant") @@ -115,7 +115,7 @@ is_security = 1 supervisors = "the head of security" department_head = list("Head of Security") - selection_color = "#ffeeee" + selection_color = "#edcdcd" access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_WEAPONS) minimal_access = list(ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_WEAPONS) alt_titles = list("Forensic Technician") @@ -176,7 +176,7 @@ is_security = 1 supervisors = "the head of security" department_head = list("Head of Security") - selection_color = "#ffeeee" + selection_color = "#edcdcd" access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS) minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS) alt_titles = list("Security Trainer","Patrol Officer") @@ -241,7 +241,7 @@ is_security = 1 supervisors = "the head of security" department_head = list("Head of Security") - selection_color = "#ffeeee" + selection_color = "#edcdcd" access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS) minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS) alt_titles = list("Security Medic") @@ -278,7 +278,7 @@ is_security = 1 supervisors = "the head of security" department_head = list("Head of Security") - selection_color = "#ffeeee" + selection_color = "#edcdcd" access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_PILOT, ACCESS_EXTERNAL_AIRLOCKS) minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS, ACCESS_PILOT, ACCESS_EXTERNAL_AIRLOCKS) minimal_player_age = 7 diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm index d941ca23253..30d8178b925 100644 --- a/code/game/jobs/job/silicon.dm +++ b/code/game/jobs/job/silicon.dm @@ -4,7 +4,7 @@ department_flag = JOBCAT_ENGSEC total_positions = -1 // Not used for AI, see is_position_available below and modules/mob/living/silicon/ai/latejoin.dm spawn_positions = 1 - selection_color = "#ccffcc" + selection_color = "#4c82bf" supervisors = "your laws" department_head = list("Captain") req_admin_notify = 1 @@ -28,7 +28,7 @@ spawn_positions = 2 supervisors = "your laws and the AI" //Nodrak department_head = list("AI") - selection_color = "#ddffdd" + selection_color = "#cadaec" minimal_player_age = 21 exp_requirements = 300 exp_type = EXP_TYPE_CREW diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index 17e95e05456..f8cbc4828ee 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -7,7 +7,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca spawn_positions = 1 supervisors = "Nanotrasen officials" department_head = list("Nanotrasen Navy Officer") - selection_color = "#ccccff" + selection_color = "#6691ff" req_admin_notify = 1 is_command = 1 access = list() //See get_access() @@ -66,7 +66,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca spawn_positions = 1 supervisors = "the captain" department_head = list("Captain") - selection_color = "#ddddff" + selection_color = "#d1deff" req_admin_notify = 1 is_command = 1 minimal_player_age = 21 @@ -117,7 +117,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca spawn_positions = 1 supervisors = "the command staff" department_head = list("Captain") - selection_color = "#ddddff" + selection_color = "#d1deff" req_admin_notify = 1 is_command = 1 transfer_allowed = FALSE @@ -167,7 +167,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca spawn_positions = 1 supervisors = "the Nanotrasen representative" department_head = list("Captain") - selection_color = "#ddddff" + selection_color = "#d1deff" req_admin_notify = 1 is_command = 1 transfer_allowed = FALSE @@ -221,7 +221,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca spawn_positions = 1 supervisors = "the Nanotrasen Supreme Court" department_head = list("Captain") - selection_color = "#ddddff" + selection_color = "#edccd7" req_admin_notify = 1 is_legal = 1 transfer_allowed = FALSE @@ -274,7 +274,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca is_legal = 1 supervisors = "the magistrate" department_head = list("Captain") - selection_color = "#ddddff" + selection_color = "#edccd7" access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING) minimal_access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING) alt_titles = list("Human Resources Agent","Lawyer","Attorney") diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 3dd1f2942d2..81194e467c3 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -1,132 +1,3 @@ -//Food -/datum/job/bartender - title = "Bartender" - flag = JOB_BARTENDER - department_flag = JOBCAT_SUPPORT - total_positions = 1 - spawn_positions = 1 - is_service = 1 - supervisors = "the head of personnel" - department_head = list("Head of Personnel") - selection_color = "#dddddd" - access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) - minimal_access = list(ACCESS_BAR, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) - alt_titles = list("Barman","Barkeeper","Drink Artist") - money_factor = 2 - outfit = /datum/outfit/job/bartender - -/datum/outfit/job/bartender - name = "Bartender" - jobtype = /datum/job/bartender - - uniform = /obj/item/clothing/under/rank/bartender - suit = /obj/item/clothing/suit/armor/vest - belt = /obj/item/storage/belt/bandolier/full - shoes = /obj/item/clothing/shoes/black - l_ear = /obj/item/radio/headset/headset_service - glasses = /obj/item/clothing/glasses/sunglasses/reagent - pda = /obj/item/pda/bar - backpack_contents = list( - /obj/item/toy/russian_revolver = 1 - ) - -/datum/outfit/job/bartender/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - if(visualsOnly) - return - - H.dna.SetSEState(GLOB.soberblock,1) - genemutcheck(H, GLOB.soberblock, null, MUTCHK_FORCED) - H.dna.default_blocks.Add(GLOB.soberblock) - H.check_mutations = 1 - - - -/datum/job/chef - title = "Chef" - flag = JOB_CHEF - department_flag = JOBCAT_SUPPORT - total_positions = 1 - spawn_positions = 1 - is_service = 1 - supervisors = "the head of personnel" - department_head = list("Head of Personnel") - selection_color = "#dddddd" - access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE) - minimal_access = list(ACCESS_KITCHEN) - alt_titles = list("Cook","Culinary Artist","Butcher") - money_factor = 2 - outfit = /datum/outfit/job/chef - -/datum/outfit/job/chef - name = "Chef" - jobtype = /datum/job/chef - - uniform = /obj/item/clothing/under/rank/chef - suit = /obj/item/clothing/suit/chef - belt = /obj/item/storage/belt/chef - shoes = /obj/item/clothing/shoes/black - head = /obj/item/clothing/head/chefhat - l_ear = /obj/item/radio/headset/headset_service - pda = /obj/item/pda/chef - backpack_contents = list( - /obj/item/paper/chef=1,\ - /obj/item/book/manual/chef_recipes=1) - -/datum/outfit/job/chef/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - ..() - if(visualsOnly) - return - var/datum/martial_art/cqc/under_siege/justacook = new - justacook.teach(H) - -/datum/outfit/job/chef/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - if(H.mind && H.mind.role_alt_title) - switch(H.mind.role_alt_title) - if("Culinary Artist") - uniform = /obj/item/clothing/under/artist - belt = /obj/item/storage/belt/chef/artistred - head = /obj/item/clothing/head/chefcap - suit = /obj/item/clothing/suit/storage/chefbluza - - -/datum/job/hydro - title = "Botanist" - flag = JOB_BOTANIST - department_flag = JOBCAT_SUPPORT - total_positions = 2 - spawn_positions = 2 - is_service = 1 - supervisors = "the head of personnel" - department_head = list("Head of Personnel") - selection_color = "#dddddd" - access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE) - minimal_access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE) - alt_titles = list("Hydroponicist", "Botanical Researcher") - exp_requirements = 300 - exp_type = EXP_TYPE_CREW - money_factor = 2 - outfit = /datum/outfit/job/hydro - -/datum/outfit/job/hydro - name = "Botanist" - jobtype = /datum/job/hydro - - uniform = /obj/item/clothing/under/rank/hydroponics - suit = /obj/item/clothing/suit/apron - gloves = /obj/item/clothing/gloves/botanic_leather - shoes = /obj/item/clothing/shoes/black - l_ear = /obj/item/radio/headset/headset_service - suit_store = /obj/item/plant_analyzer - pda = /obj/item/pda/botanist - - backpack = /obj/item/storage/backpack/botany - satchel = /obj/item/storage/backpack/satchel_hyd - dufflebag = /obj/item/storage/backpack/duffel/hydro - - - //Cargo /datum/job/qm title = "Quartermaster" @@ -137,7 +8,7 @@ is_supply = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") - selection_color = "#dddddd" + selection_color = "#9f8545" access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) min_age_allowed = 30 @@ -174,7 +45,7 @@ is_supply = 1 supervisors = "the quartermaster" department_head = list("Head of Personnel") - selection_color = "#dddddd" + selection_color = "#e2dbc8" access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) money_factor = 2 @@ -201,7 +72,7 @@ is_supply = 1 supervisors = "the quartermaster" department_head = list("Head of Personnel") - selection_color = "#dddddd" + selection_color = "#e2dbc8" access = list(ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_MINING, ACCESS_MINT, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) alt_titles = list("Spelunker") @@ -254,6 +125,133 @@ suit = /obj/item/clothing/suit/space/hardsuit/mining mask = /obj/item/clothing/mask/breath +//Food +/datum/job/bartender + title = "Bartender" + flag = JOB_BARTENDER + department_flag = JOBCAT_SUPPORT + total_positions = 1 + spawn_positions = 1 + is_service = 1 + supervisors = "the head of personnel" + department_head = list("Head of Personnel") + selection_color = "#d1e8d3" + access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_BAR, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) + alt_titles = list("Barman","Barkeeper","Drink Artist") + money_factor = 2 + outfit = /datum/outfit/job/bartender + +/datum/outfit/job/bartender + name = "Bartender" + jobtype = /datum/job/bartender + + uniform = /obj/item/clothing/under/rank/bartender + suit = /obj/item/clothing/suit/armor/vest + belt = /obj/item/storage/belt/bandolier/full + shoes = /obj/item/clothing/shoes/black + l_ear = /obj/item/radio/headset/headset_service + glasses = /obj/item/clothing/glasses/sunglasses/reagent + pda = /obj/item/pda/bar + backpack_contents = list( + /obj/item/toy/russian_revolver = 1 + ) + +/datum/outfit/job/bartender/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(visualsOnly) + return + + H.dna.SetSEState(GLOB.soberblock,1) + genemutcheck(H, GLOB.soberblock, null, MUTCHK_FORCED) + H.dna.default_blocks.Add(GLOB.soberblock) + H.check_mutations = 1 + + + +/datum/job/chef + title = "Chef" + flag = JOB_CHEF + department_flag = JOBCAT_SUPPORT + total_positions = 1 + spawn_positions = 1 + is_service = 1 + supervisors = "the head of personnel" + department_head = list("Head of Personnel") + selection_color = "#d1e8d3" + access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE) + minimal_access = list(ACCESS_KITCHEN) + alt_titles = list("Cook","Culinary Artist","Butcher") + money_factor = 2 + outfit = /datum/outfit/job/chef + +/datum/outfit/job/chef + name = "Chef" + jobtype = /datum/job/chef + + uniform = /obj/item/clothing/under/rank/chef + suit = /obj/item/clothing/suit/chef + belt = /obj/item/storage/belt/chef + shoes = /obj/item/clothing/shoes/black + head = /obj/item/clothing/head/chefhat + l_ear = /obj/item/radio/headset/headset_service + pda = /obj/item/pda/chef + backpack_contents = list( + /obj/item/paper/chef=1,\ + /obj/item/book/manual/chef_recipes=1) + +/datum/outfit/job/chef/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + var/datum/martial_art/cqc/under_siege/justacook = new + justacook.teach(H) + +/datum/outfit/job/chef/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(H.mind && H.mind.role_alt_title) + switch(H.mind.role_alt_title) + if("Culinary Artist") + uniform = /obj/item/clothing/under/artist + belt = /obj/item/storage/belt/chef/artistred + head = /obj/item/clothing/head/chefcap + suit = /obj/item/clothing/suit/storage/chefbluza + + +/datum/job/hydro + title = "Botanist" + flag = JOB_BOTANIST + department_flag = JOBCAT_SUPPORT + total_positions = 2 + spawn_positions = 2 + is_service = 1 + supervisors = "the head of personnel" + department_head = list("Head of Personnel") + selection_color = "#d1e8d3" + access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE) + minimal_access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE) + alt_titles = list("Hydroponicist", "Botanical Researcher") + exp_requirements = 300 + exp_type = EXP_TYPE_CREW + money_factor = 2 + outfit = /datum/outfit/job/hydro + +/datum/outfit/job/hydro + name = "Botanist" + jobtype = /datum/job/hydro + + uniform = /obj/item/clothing/under/rank/hydroponics + suit = /obj/item/clothing/suit/apron + gloves = /obj/item/clothing/gloves/botanic_leather + shoes = /obj/item/clothing/shoes/black + l_ear = /obj/item/radio/headset/headset_service + suit_store = /obj/item/plant_analyzer + pda = /obj/item/pda/botanist + + backpack = /obj/item/storage/backpack/botany + satchel = /obj/item/storage/backpack/satchel_hyd + dufflebag = /obj/item/storage/backpack/duffel/hydro + //Griff //BS12 EDIT /datum/job/clown @@ -265,7 +263,7 @@ is_service = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") - selection_color = "#dddddd" + selection_color = "#d1e8d3" access = list(ACCESS_CLOWN, ACCESS_THEATRE) minimal_access = list(ACCESS_CLOWN, ACCESS_THEATRE) alt_titles = list("Performance Artist","Comedian","Jester") @@ -324,7 +322,7 @@ genemutcheck(H, GLOB.comicblock, null, MUTCHK_FORCED) H.dna.default_blocks.Add(GLOB.comicblock) H.check_mutations = TRUE - H.add_language("Clownish") + H.add_language(LANGUAGE_CLOWN) //action given to antag clowns /datum/action/innate/toggle_clumsy @@ -356,7 +354,7 @@ is_service = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") - selection_color = "#dddddd" + selection_color = "#d1e8d3" access = list(ACCESS_MIME, ACCESS_THEATRE) minimal_access = list(ACCESS_MIME, ACCESS_THEATRE) alt_titles = list("Panthomimist") @@ -411,7 +409,7 @@ is_service = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") - selection_color = "#dddddd" + selection_color = "#d1e8d3" access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS) minimal_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS) alt_titles = list("Custodial Technician","Sanitation Technician") @@ -438,7 +436,7 @@ is_service = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") - selection_color = "#dddddd" + selection_color = "#d1e8d3" access = list(ACCESS_LIBRARY) minimal_access = list(ACCESS_LIBRARY) alt_titles = list("Journalist") @@ -468,7 +466,7 @@ is_service = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") - selection_color = "#dddddd" + selection_color = "#d1e8d3" alt_titles = list("Hair Stylist","Beautician") access = list() minimal_access = list() @@ -495,7 +493,7 @@ spawn_positions = 0 supervisors = "the head of personnel" department_head = list("Head of Personnel") - selection_color = "#dddddd" + selection_color = "#d1e8d3" access = list(ACCESS_MAINT_TUNNELS, ACCESS_GATEWAY, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS) minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_GATEWAY, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS) outfit = /datum/outfit/job/explorer diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm index 7a6b0295952..3a8b1128bb6 100644 --- a/code/game/jobs/job/support_chaplain.dm +++ b/code/game/jobs/job/support_chaplain.dm @@ -8,7 +8,7 @@ is_service = TRUE supervisors = "the head of personnel" department_head = list("Head of Personnel") - selection_color = "#dddddd" + selection_color = "#d1e8d3" access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_MAINT_TUNNELS) minimal_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_MAINT_TUNNELS) alt_titles = list("Priest","Monk","Preacher","Reverend","Oracle","Nun","Imam","Exorcist") diff --git a/code/game/jobs/job/syndicate.dm b/code/game/jobs/job/syndicate.dm index ca71db768e5..cd3ad1a1add 100644 --- a/code/game/jobs/job/syndicate.dm +++ b/code/game/jobs/job/syndicate.dm @@ -5,7 +5,7 @@ total_positions = 5 spawn_positions = 5 supervisors = "the admins" - selection_color = "#ff0000" + selection_color = "#4c1e1e" access = list() minimal_access = list() admin_only = 1 diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 0eb62a7aadd..4b96dbef0da 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -7,7 +7,7 @@ layer = WIRE_LAYER plane = FLOOR_PLANE layer = 2.5 - anchored = 1 + anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 0 var/syndicate = 0 @@ -42,12 +42,12 @@ destroy_beacon() return ..() -/obj/machinery/bluespace_beacon/hide(var/intact) - invisibility = intact ? INVISIBILITY_ABSTRACT : 0 - update_icon() +/obj/machinery/bluespace_beacon/hide(intact) + invisibility = intact ? INVISIBILITY_MAXIMUM : 0 + update_icon(UPDATE_ICON_STATE) // update the icon_state -/obj/machinery/bluespace_beacon/update_icon() +/obj/machinery/bluespace_beacon/update_icon_state() var/state="floor_beacon" if(invisibility) icon_state = "[state]f" @@ -61,11 +61,11 @@ Beacon.loc = loc else create_beacon() - update_icon() + update_icon(UPDATE_ICON_STATE) else if(Beacon) destroy_beacon() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/bluespace_beacon/syndicate diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index f4c5e63fcac..681b8ca57eb 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -4,7 +4,7 @@ icon_state = "freezer" density = 1 var/min_temperature = 0 - anchored = 1.0 + anchored = TRUE use_power = IDLE_POWER_USE active_power_usage = 5000 //cooling down massive amounts of air's not cheap. This is still very low considering everything power_channel = EQUIP @@ -69,7 +69,7 @@ if(default_deconstruction_screwdriver(user, "freezer-o", "freezer", I)) on = FALSE use_power = IDLE_POWER_USE - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE /obj/machinery/atmospherics/unary/cold_sink/freezer/wrench_act(mob/user, obj/item/I) @@ -91,14 +91,14 @@ build_network() update_icon() -/obj/machinery/atmospherics/unary/cold_sink/freezer/update_icon() +/obj/machinery/atmospherics/unary/cold_sink/freezer/update_icon_state() if(panel_open) icon_state = "freezer-o" - else if(src.on) + else if(on) icon_state = "freezer_1" else icon_state = "freezer" - return + /obj/machinery/atmospherics/unary/cold_sink/freezer/attack_ai(mob/user as mob) attack_hand(user) @@ -160,12 +160,13 @@ amount = text2num(amount) current_temperature = clamp(amount, T20C, min_temperature) -/obj/machinery/atmospherics/unary/cold_sink/freezer/power_change() - ..() +/obj/machinery/atmospherics/unary/cold_sink/freezer/power_change(forced = FALSE) + if(!..()) + return if(stat & NOPOWER) - on = 0 + on = FALSE use_power = IDLE_POWER_USE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/atmospherics/unary/heat_reservoir/heater/ name = "нагреватель" @@ -173,7 +174,7 @@ icon_state = "heater" density = 1 var/max_temperature = 0 - anchored = 1.0 + anchored = TRUE layer = 3 current_heat_capacity = 1000 active_power_usage = 5000 @@ -241,7 +242,7 @@ if(default_deconstruction_screwdriver(user, "heater-o", "heater", I)) on = 0 use_power = IDLE_POWER_USE - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE /obj/machinery/atmospherics/unary/heat_reservoir/heater/wrench_act(mob/user, obj/item/I) @@ -261,16 +262,17 @@ node = target break build_network() - update_icon() + update_icon(UPDATE_ICON_STATE) + -/obj/machinery/atmospherics/unary/heat_reservoir/heater/update_icon() +/obj/machinery/atmospherics/unary/heat_reservoir/heater/update_icon_state() if(panel_open) icon_state = "heater-o" - else if(src.on) + else if(on) icon_state = "heater_1" else icon_state = "heater" - return + /obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_ai(mob/user as mob) attack_hand(user) @@ -329,9 +331,12 @@ amount = text2num(amount) current_temperature = clamp(amount, T20C, T20C + max_temperature) -/obj/machinery/atmospherics/unary/heat_reservoir/heater/power_change() - ..() + +/obj/machinery/atmospherics/unary/heat_reservoir/heater/power_change(forced = FALSE) + if(!..()) + return if(stat & NOPOWER) - on = 0 + on = FALSE use_power = IDLE_POWER_USE - update_icon() + update_icon(UPDATE_ICON_STATE) + diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 1f88eb65aa8..50d4ec1e888 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/surgery.dmi' icon_state = "table2-idle" density = 1 - anchored = 1.0 + anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 1 active_power_usage = 5 @@ -39,7 +39,7 @@ else return FALSE -/obj/machinery/optable/MouseDrop_T(atom/movable/O, mob/user) +/obj/machinery/optable/MouseDrop_T(atom/movable/O, mob/user, params) if(!ishuman(user) && !isrobot(user)) //Only Humanoids and Cyborgs can put things on this table return if(!check_table()) //If the Operating Table is occupied, you cannot put someone else on it @@ -50,6 +50,7 @@ return add_fingerprint(user) take_patient(O, user) + return TRUE /** * Updates the `patient` var to be the mob occupying the table @@ -61,10 +62,12 @@ else patient = null if(!no_icon_updates) - if(patient && patient.pulse) - icon_state = "table2-active" - else - icon_state = "table2-idle" + update_icon(UPDATE_ICON_STATE) + + +/obj/machinery/optable/update_icon_state() + icon_state = "table2-[(patient && patient.pulse) ? "active" : "idle"]" + /obj/machinery/optable/Crossed(atom/movable/AM, oldloc) . = ..() diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index a4350e61887..b62893f59dd 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -3,8 +3,9 @@ desc = "A PDA painting machine. To use, simply insert your PDA and choose the desired preset paint scheme." icon = 'icons/obj/pda.dmi' icon_state = "pdapainter" + base_icon_state = "pdapainter" density = 1 - anchored = 1 + anchored = TRUE max_integrity = 200 var/obj/item/pda/storedpda = null var/list/colorlist = list() @@ -14,25 +15,9 @@ var/allowErasePda = TRUE -/obj/machinery/pdapainter/update_icon() - cut_overlays() - - if(stat & BROKEN) - icon_state = "[initial(icon_state)]-broken" - return - - if(storedpda) - add_overlay("[initial(icon_state)]-closed") - - if(powered()) - icon_state = initial(icon_state) - else - icon_state = "[initial(icon_state)]-off" - - return - /obj/machinery/pdapainter/Initialize(mapload) . = ..() + var/blocked = list(/obj/item/pda/silicon, /obj/item/pda/silicon/ai, /obj/item/pda/silicon/robot, /obj/item/pda/silicon/pai, /obj/item/pda/heads, /obj/item/pda/clear, /obj/item/pda/syndicate, /obj/item/pda/chameleon, /obj/item/pda/chameleon/broken) @@ -51,6 +36,26 @@ QDEL_NULL(storedpda) return ..() + +/obj/machinery/pdapainter/update_icon_state() + if(stat & BROKEN) + icon_state = "[base_icon_state]-broken" + return + + if(powered()) + icon_state = base_icon_state + else + icon_state = "[base_icon_state]-off" + + +/obj/machinery/pdapainter/update_overlays() + . = ..() + if(stat & BROKEN) + return + if(storedpda) + . += "[base_icon_state]-closed" + + /obj/machinery/pdapainter/on_deconstruction() if(storedpda) storedpda.forceMove(loc) @@ -109,8 +114,10 @@ ui_interact(user) -/obj/machinery/pdapainter/power_change() - ..() + +/obj/machinery/pdapainter/power_change(forced = FALSE) + if(!..()) + return update_icon() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 3e6bad4728b..5c58e704a48 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -10,9 +10,8 @@ icon_state = "sleeper-open" var/base_icon = "sleeper" density = 1 - anchored = 1 + anchored = TRUE dir = WEST - var/orient = "LEFT" // "RIGHT" changes the dir suffix to "-r" var/mob/living/carbon/human/occupant = null var/possible_chems = list("ephedrine", "salglu_solution", "salbutamol", "charcoal") var/emergency_chems = list("ephedrine") // Desnowflaking @@ -31,12 +30,6 @@ light_color = LIGHT_COLOR_CYAN -/obj/machinery/sleeper/power_change() - ..() - if(!(stat & (BROKEN|NOPOWER))) - set_light(2) - else - set_light(0) /obj/machinery/sleeper/New() ..() @@ -65,6 +58,22 @@ component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() + +/obj/machinery/sleeper/power_change(forced = FALSE) + ..() //we don't check parent return here because we also care about BROKEN + if(!(stat & (BROKEN|NOPOWER))) + set_light(2) + else + set_light(0) + + +/obj/machinery/sleeper/update_icon_state() + if(occupant) + icon_state = base_icon + else + icon_state = "[base_icon]-open" + + /obj/machinery/sleeper/RefreshParts() var/E for(var/obj/item/stock_parts/matter_bin/B in component_parts) @@ -336,7 +345,7 @@ var/mob/M = G.affecting M.forceMove(src) occupant = M - icon_state = "[base_icon]" + update_icon(UPDATE_ICON_STATE) to_chat(M, span_boldnotice("You feel cool air surround you. You go numb as your senses turn inward.")) add_fingerprint(user) qdel(G) @@ -357,6 +366,7 @@ if(default_deconstruction_screwdriver(user, "[base_icon]-o", "[base_icon]-open", I)) return TRUE + /obj/machinery/sleeper/wrench_act(mob/user, obj/item/I) . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) @@ -367,12 +377,9 @@ if(panel_open) to_chat(user, span_notice("Close the maintenance panel first.")) return - if(dir == EAST) - orient = "LEFT" - setDir(WEST) - else - orient = "RIGHT" - setDir(EAST) + + setDir(turn(dir, -90)) + /obj/machinery/sleeper/ex_act(severity) if(filtering) @@ -386,7 +393,7 @@ if(A == occupant) occupant = null updateUsrDialog() - update_icon() + update_icon(UPDATE_ICON_STATE) SStgui.update_uis(src) if(A == beaker) beaker = null @@ -426,7 +433,7 @@ return occupant.forceMove(loc) occupant = null - icon_state = "[base_icon]-open" + update_icon(UPDATE_ICON_STATE) // eject trash the occupant dropped for(var/atom/movable/A in contents - component_parts - list(beaker)) A.forceMove(loc) @@ -463,10 +470,9 @@ if(usr.incapacitated()) //are you cuffed, dying, lying, stunned or other return - icon_state = "[base_icon]-open" go_out() add_fingerprint(usr) - return + /obj/machinery/sleeper/verb/remove_beaker() set name = "Remove Beaker" @@ -483,9 +489,9 @@ beaker = null SStgui.update_uis(src) add_fingerprint(usr) - return -/obj/machinery/sleeper/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) + +/obj/machinery/sleeper/MouseDrop_T(atom/movable/O, mob/user, params) if(O.loc == user) //no you can't pull things out of your ass return if(user.incapacitated()) //are you cuffed, dying, lying, stunned or other @@ -504,41 +510,48 @@ return if(panel_open) to_chat(user, span_boldnotice("Close the maintenance panel first.")) - return + return TRUE if(occupant) to_chat(user, span_boldnotice("The sleeper is already occupied!")) - return + return TRUE var/mob/living/L = O if(!istype(L) || L.buckled) return if(L.abiotic()) to_chat(user, span_boldnotice("Subject cannot have abiotic items on.")) - return + return TRUE if(L.has_buckled_mobs()) //mob attached to us to_chat(user, span_warning("[L] will not fit into [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.")) - return + return TRUE if(L == user) visible_message("[user] starts climbing into the sleeper.") else visible_message("[user] starts putting [L.name] into the sleeper.") + . = TRUE + INVOKE_ASYNC(src, PROC_REF(put_in), L, user) - if(do_after(user, 20, target = L)) - if(occupant) - to_chat(user, span_boldnotice("The sleeper is already occupied!")) - return - if(!L) return - L.forceMove(src) - occupant = L - icon_state = "[base_icon]" - to_chat(L, span_boldnotice("You feel cool air surround you. You go numb as your senses turn inward.")) - add_fingerprint(user) - if(user.pulling == L) - user.stop_pulling() - if(L.grabbed_by) - QDEL_LIST(L.grabbed_by) - SStgui.update_uis(src) + +/obj/machinery/sleeper/proc/put_in(mob/living/L, mob/user) + if(!do_after(user, 2 SECONDS, target = L)) return - return + + if(occupant) + to_chat(user, span_boldnotice("The sleeper is already occupied!")) + return + if(!L) + return + + L.forceMove(src) + occupant = L + update_icon(UPDATE_ICON_STATE) + to_chat(L, span_boldnotice("You feel cool air surround you. You go numb as your senses turn inward.")) + add_fingerprint(user) + if(user.pulling == L) + user.stop_pulling() + if(L.grabbed_by) + QDEL_LIST(L.grabbed_by) + SStgui.update_uis(src) + /obj/machinery/sleeper/AllowDrop() return FALSE @@ -561,21 +574,8 @@ to_chat(usr, span_warning("[usr] will not fit into [src] because [usr.p_they()] [usr.p_have()] a slime latched onto [usr.p_their()] head.")) return visible_message("[usr] starts climbing into the sleeper.") - if(do_after(usr, 20, target = usr)) - if(occupant) - to_chat(usr, span_boldnotice("The sleeper is already occupied!")) - return - usr.stop_pulling() - usr.forceMove(src) - occupant = usr - icon_state = "[base_icon]" - - for(var/obj/O in src) - qdel(O) - add_fingerprint(usr) - SStgui.update_uis(src) - return - return + put_in(usr, usr) + /obj/machinery/sleeper/syndie icon_state = "sleeper_s-open" diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 21a9ef8dc86..a096bacbde0 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -16,15 +16,35 @@ go_out() return ..() -/obj/machinery/bodyscanner/power_change() - ..() +/obj/machinery/bodyscanner/power_change(forced = FALSE) + if(!..()) + return if(!(stat & (BROKEN|NOPOWER))) set_light(2) else set_light(0) + +/obj/machinery/bodyscanner/examine(mob/user) + . = ..() + if(occupant) + if(occupant.is_dead()) + . += span_warning("You see [occupant.name] inside. [occupant.p_they(TRUE)] [occupant.p_are()] dead!>") + else + . += span_notice("You see [occupant.name] inside.") + if(Adjacent(user)) + . += span_info("You can Alt-Click to eject the current occupant. Click-drag someone to the scanner to place them inside.") + + +/obj/machinery/bodyscanner/update_icon_state() + if(occupant) + icon_state = "bodyscanner" + else + icon_state = "bodyscanner-open" + + /obj/machinery/bodyscanner/process() - for(var/mob/M as mob in src) // makes sure that simple mobs don't get stuck inside a sleeper when they resist out of occupant's grasp + for(var/mob/M in src) // makes sure that simple mobs don't get stuck inside a sleeper when they resist out of occupant's grasp if(M == occupant) continue else @@ -63,7 +83,7 @@ return M.forceMove(src) occupant = M - icon_state = "bodyscanner" + update_icon(UPDATE_ICON_STATE) add_fingerprint(user) qdel(TYPECAST_YOUR_SHIT) SStgui.update_uis(src) @@ -79,6 +99,7 @@ if(default_deconstruction_screwdriver(user, "bodyscanner-o", "bodyscanner-open", I)) return TRUE + /obj/machinery/bodyscanner/wrench_act(mob/user, obj/item/I) . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) @@ -89,12 +110,11 @@ if(panel_open) to_chat(user, span_notice("Close the maintenance panel first.")) return - if(dir == EAST) - setDir(WEST) - else - setDir(EAST) -/obj/machinery/bodyscanner/MouseDrop_T(mob/living/carbon/human/H, mob/user) + setDir(turn(dir, -90)) + + +/obj/machinery/bodyscanner/MouseDrop_T(mob/living/carbon/human/H, mob/user, params) if(!istype(H)) return FALSE //not human if(user.incapacitated()) @@ -107,18 +127,18 @@ return FALSE //not a borg or human if(panel_open) to_chat(user, span_notice("Close the maintenance panel first.")) - return FALSE //panel open + return TRUE //panel open if(occupant) to_chat(user, span_notice("[src] is already occupied.")) - return FALSE //occupied + return TRUE //occupied if(H.buckled) return FALSE if(H.abiotic()) to_chat(user, span_notice("Subject cannot have abiotic items on.")) - return FALSE + return TRUE if(H.has_buckled_mobs()) //mob attached to us to_chat(user, span_warning("[H] will not fit into [src] because [H.p_they()] [H.p_have()] a slime latched onto [H.p_their()] head.")) - return + return TRUE if(H == user) visible_message("[user] climbs into [src].") @@ -128,9 +148,10 @@ add_fingerprint(user) H.forceMove(src) occupant = H - icon_state = "bodyscanner" + update_icon(UPDATE_ICON_STATE) add_fingerprint(user) SStgui.update_uis(src) + return TRUE /obj/machinery/bodyscanner/attack_ai(user) return attack_hand(user) @@ -175,7 +196,7 @@ return occupant.forceMove(loc) occupant = null - icon_state = "bodyscanner-open" + update_icon(UPDATE_ICON_STATE) // eject trash the occupant dropped for(var/atom/movable/A in contents - component_parts) A.forceMove(loc) @@ -194,7 +215,7 @@ if(A == occupant) occupant = null updateUsrDialog() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/bodyscanner/narsie_act() go_out() diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 990903e626c..4b02439c75c 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -4,84 +4,96 @@ icon_state = "liquid_dispenser" layer = 3 plane = FLOOR_PLANE - anchored = 1.0 + anchored = TRUE max_integrity = 200 armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) var/uses = 20 var/disabled = TRUE - var/lethal = 0 var/locked = TRUE - var/cooldown_time = 0 - var/cooldown_timeleft = 0 + var/cooldown_time = 10 SECONDS var/cooldown_on = FALSE req_access = list(ACCESS_AI_UPLOAD) + +/obj/machinery/ai_slipper/examine(mob/user) + . = ..() + . += span_notice("A small counter shows it has: [uses] use\s remaining.") + + /obj/machinery/ai_slipper/power_change() - if(stat & BROKEN) - update_icon() - else - if( powered() ) - stat &= ~NOPOWER - else - stat |= NOPOWER - disabled = TRUE - update_icon() - -/obj/machinery/ai_slipper/proc/setState(var/enabled, var/uses) - disabled = disabled - uses = uses - power_change() + ..() //we don't check return here because we also care about the BROKEN flag + if(stat & NOPOWER) + disabled = TRUE + update_icon(UPDATE_ICON_STATE) + /obj/machinery/ai_slipper/attackby(obj/item/W, mob/user, params) + add_fingerprint(user) if(stat & (NOPOWER|BROKEN)) - add_fingerprint(user) return - if(istype(user, /mob/living/silicon)) + if(issilicon(user)) return attack_hand(user) - if(allowed(usr)) // trying to unlock the interface - add_fingerprint(user) - locked = !locked - to_chat(user, "You [locked ? "lock" : "unlock"] the device.") - if(locked) - if(user.machine == src) - user.unset_machine() - user << browse(null, "window=ai_slipper") - else - if(user.machine == src) - attack_hand(usr) - return - return ..() + if(!allowed(user)) // trying to unlock the interface + to_chat(user, span_warning("Access denied.")) + return ..() + + locked = !locked + to_chat(user, span_notice("You [locked ? "lock" : "unlock"] the device.")) + if(locked) + if(user.machine == src) + user.unset_machine() + user << browse(null, "window=ai_slipper") + else + if(user.machine == src) + attack_hand(user) + /obj/machinery/ai_slipper/proc/ToggleOn() if(stat & (NOPOWER|BROKEN)) return disabled = !disabled - update_icon() + update_icon(UPDATE_ICON_STATE) + -/obj/machinery/ai_slipper/proc/Activate() +/obj/machinery/ai_slipper/proc/Activate(mob/user) if(stat & (NOPOWER|BROKEN)) return - if(cooldown_on || disabled) + if(!uses) + to_chat(user, span_warning("[src] is empty!")) return - else - new /obj/effect/particle_effect/foam(loc) - uses-- - cooldown_on = TRUE - cooldown_time = world.timeofday + 100 - slip_process() - -/obj/machinery/ai_slipper/update_icon() - if(stat & (NOPOWER|BROKEN) || disabled) + if(cooldown_on) + to_chat(user, span_warning("[src] is still recharging!")) + return + + new /obj/effect/particle_effect/foam(loc) + uses-- + cooldown_on = TRUE + update_icon(UPDATE_ICON_STATE) + addtimer(CALLBACK(src, PROC_REF(recharge)), cooldown_time) + + +/obj/machinery/ai_slipper/proc/recharge() + if(!uses) + return + cooldown_on = FALSE + update_icon(UPDATE_ICON_STATE) + + +/obj/machinery/ai_slipper/update_icon_state() + if((stat & (NOPOWER|BROKEN)) || disabled || cooldown_on || !uses) icon_state = "liquid_dispenser" else icon_state = "liquid_dispenser_on" + /obj/machinery/ai_slipper/attack_ai(mob/user) return attack_hand(user) + /obj/machinery/ai_slipper/attack_ghost(mob/user) return attack_hand(user) + /obj/machinery/ai_slipper/attack_hand(mob/user) if(stat & (NOPOWER|BROKEN)) return @@ -106,6 +118,7 @@ user << browse(t, "window=computer;size=575x450") onclose(user, "computer") + /obj/machinery/ai_slipper/Topic(href, href_list) if(..()) return 1 @@ -118,22 +131,7 @@ ToggleOn() if(href_list["toggleUse"]) - Activate() + Activate(usr) attack_hand(usr) -/obj/machinery/ai_slipper/proc/slip_process() - while(cooldown_time - world.timeofday > 0) - var/ticksleft = cooldown_time - world.timeofday - - if(ticksleft > 1e5) - cooldown_time = world.timeofday + 10 // midnight rollover - - - cooldown_timeleft = (ticksleft / 10) - sleep(5) - if(uses <= 0) - return - if(uses >= 0) - cooldown_on = FALSE - power_change() diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 22ed3d826e7..330b7b00b7b 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -72,7 +72,7 @@ name = "alarm" icon = 'icons/obj/machines/monitors.dmi' icon_state = "alarm0" - anchored = 1 + anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 4 active_power_usage = 8 @@ -92,7 +92,7 @@ var/rcon_time = 0 var/locked = 1 var/datum/wires/alarm/wires = null - var/wiresexposed = 0 // If it's been screwdrivered open. + var/wiresexposed = FALSE // If it's been screwdrivered open. var/aidisabled = 0 var/AAlarmwires = 31 var/shorted = 0 @@ -204,8 +204,8 @@ if(dir) setDir(direction) - buildstage = 0 - wiresexposed = 1 + buildstage = AIR_ALARM_FRAME + wiresexposed = TRUE set_pixel_offsets_from_dir(-24, 24, -24, 24) update_icon() return @@ -262,7 +262,7 @@ return 0 /obj/machinery/alarm/process() - if((stat & (NOPOWER|BROKEN)) || shorted || buildstage != 2) + if((stat & (NOPOWER|BROKEN)) || shorted || buildstage != AIR_ALARM_READY) return var/turf/simulated/location = loc @@ -356,29 +356,43 @@ environment.merge(gas) -/obj/machinery/alarm/update_icon() + +/obj/machinery/alarm/update_icon_state() if(wiresexposed) - icon_state = "alarmx" - set_light(0) + switch(buildstage) + if(AIR_ALARM_FRAME) + icon_state = "alarm_b1" + if(AIR_ALARM_BUILDING) + icon_state = "alarm_b2" + if(AIR_ALARM_READY) + icon_state = "alarmx" return + if((stat & (NOPOWER|BROKEN)) || shorted) icon_state = "alarmp" - set_light(0) return - var/new_color = null - switch(max(danger_level, alarm_area.atmosalm-1)) + if(!alarm_area) // We wont have our alarm_area if we aint initialised + return + + switch(max(danger_level, alarm_area.atmosalm - 1)) if(ATMOS_ALARM_NONE) icon_state = "alarm0" - new_color = COLOR_GREEN if(ATMOS_ALARM_WARNING) icon_state = "alarm2" //yes, alarm2 is yellow alarm - new_color = COLOR_YELLOW if(ATMOS_ALARM_DANGER) icon_state = "alarm1" - new_color = COLOR_RED - set_light(1, 1, new_color) + +/obj/machinery/alarm/update_overlays() + . = ..() + underlays.Cut() + + if(stat & NOPOWER || buildstage != AIR_ALARM_READY || wiresexposed || shorted) + return + + underlays += emissive_appearance(icon, "alarm_lightmask") + /obj/machinery/alarm/proc/register_env_machine(m_id, device_type) var/new_name @@ -574,7 +588,7 @@ /////////////// /obj/machinery/alarm/attack_ai(mob/user) - if(buildstage != 2) + if(buildstage != AIR_ALARM_READY) return add_hiddenprint(user) @@ -590,7 +604,7 @@ return interact(user) /obj/machinery/alarm/interact(mob/user) - if(buildstage != 2) + if(buildstage != AIR_ALARM_READY) return if(wiresexposed) @@ -801,7 +815,7 @@ return !locked /obj/machinery/alarm/ui_status(mob/user, datum/ui_state/state) - if(buildstage != 2) + if(buildstage != AIR_ALARM_READY) return STATUS_CLOSE if(aidisabled && (isAI(user) || isrobot(user))) @@ -949,47 +963,46 @@ /obj/machinery/alarm/attackby(obj/item/I, mob/user, params) switch(buildstage) - if(2) + if(AIR_ALARM_READY) if(I.GetID() || ispda(I)) // trying to unlock the interface if(stat & (NOPOWER|BROKEN)) - to_chat(user, "It does nothing") + to_chat(user, span_warning("It does nothing!")) return + + if(allowed(user) && !wires.is_cut(WIRE_IDSCAN)) + add_fingerprint(user) + locked = !locked + to_chat(user, span_notice("You [ locked ? "lock" : "unlock"] the Air Alarm interface.")) + SStgui.update_uis(src) else - if(allowed(usr) && !wires.is_cut(WIRE_IDSCAN)) - add_fingerprint(user) - locked = !locked - to_chat(user, span_notice("You [ locked ? "lock" : "unlock"] the Air Alarm interface.")) - SStgui.update_uis(src) - else - to_chat(user, span_warning("Access denied.")) + to_chat(user, span_warning("Access denied.")) return - if(1) + if(AIR_ALARM_BUILDING) if(iscoil(I)) var/obj/item/stack/cable_coil/coil = I if(coil.get_amount() < 5) - to_chat(user, "You need more cable for this!") + to_chat(user, span_notice("You need more cable for this!")) return add_fingerprint(user) to_chat(user, "You wire \the [src]!") - playsound(get_turf(src), coil.usesound, 50, 1) + playsound(get_turf(src), coil.usesound, 50, TRUE) coil.use(5) - if(!coil.amount) - qdel(coil) - - buildstage = 2 + buildstage = AIR_ALARM_READY + wiresexposed = TRUE update_icon() first_run() return - if(0) + + if(AIR_ALARM_FRAME) if(istype(I, /obj/item/airalarm_electronics)) add_fingerprint(user) - to_chat(user, "You insert the circuit!") + to_chat(user, span_notice("You insert the circuit!")) playsound(get_turf(src), I.usesound, 50, 1) qdel(I) - buildstage = 1 - update_icon() + buildstage = AIR_ALARM_BUILDING + update_icon(UPDATE_ICON_STATE) return return ..() @@ -999,15 +1012,15 @@ . = TRUE if(!I.tool_start_check(src, user, 0)) return - to_chat(user, "You start prying out the circuit.") + CROWBAR_ATTEMPT_PRY_CIRCUIT_MESSAGE if(!I.use_tool(src, user, 20, volume = I.tool_volume)) return if(buildstage != AIR_ALARM_BUILDING) return - to_chat(user, "You pry out the circuit!") + CROWBAR_PRY_CIRCUIT_SUCCESS_MESSAGE new /obj/item/airalarm_electronics(user.drop_location()) buildstage = AIR_ALARM_FRAME - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/alarm/multitool_act(mob/user, obj/item/I) if(buildstage != AIR_ALARM_READY) @@ -1040,7 +1053,7 @@ if(wires.is_all_cut()) // all wires cut new /obj/item/stack/cable_coil(user.drop_location(), 5) buildstage = AIR_ALARM_BUILDING - update_icon() + update_icon(UPDATE_ICON_STATE) if(wiresexposed) wires.Interact(user) @@ -1054,13 +1067,15 @@ WRENCH_UNANCHOR_WALL_MESSAGE qdel(src) -/obj/machinery/alarm/power_change() - if(powered(power_channel)) - stat &= ~NOPOWER + +/obj/machinery/alarm/power_change(forced = FALSE) + ..() //we don't check return here because we also care about the BROKEN flag + if(stat & NOPOWER) + set_light(0) else - stat |= NOPOWER - spawn(rand(0,15)) - update_icon() + set_light(1, LIGHTING_MINIMUM_POWER) + update_icon() + /obj/machinery/alarm/obj_break(damage_flag) ..() @@ -1075,12 +1090,18 @@ new /obj/item/stack/cable_coil(loc, 3) qdel(src) + /obj/machinery/alarm/examine(mob/user) . = ..() - if(buildstage < 2) - . += span_notice("It is not wired.") - if(buildstage < 1) - . += span_notice("The circuit is missing.") + switch(buildstage) + if(AIR_ALARM_FRAME) + . += span_notice("Its circuit is missing and the bolts are exposed.") + if(AIR_ALARM_BUILDING) + . += span_notice("The frame is missing wires and the control circuit can be pried out.") + if(AIR_ALARM_READY) + if(wiresexposed) + . += span_notice("The wiring could be cut and removed or panel could screwed closed.") + /obj/machinery/alarm/proc/unshort_callback() if(shorted) diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index e55f1320421..28191123cc3 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -1,19 +1,29 @@ +GLOBAL_LIST_EMPTY(gas_sensors) + +#define SENSOR_PRESSURE 1 +#define SENSOR_TEMPERATURE 2 +#define SENSOR_O2 4 +#define SENSOR_PLASMA 8 +#define SENSOR_N2 16 +#define SENSOR_CO2 32 + + /obj/machinery/atmospherics/air_sensor icon = 'icons/obj/stationobjs.dmi' icon_state = "gsensor1" resistance_flags = FIRE_PROOF name = "gas sensor" - anchored = 1 - var/state = 0 - var/bolts = 1 + anchored = TRUE + var/state = NONE + var/bolts = TRUE var/id_tag frequency = ATMOS_TANKS_FREQ - var/on = 1 - var/output = 3 - //Flags: + on = TRUE + var/output = SENSOR_PRESSURE|SENSOR_TEMPERATURE + //Flags: (see lines 3-9) // 1 for pressure // 2 for temperature // Output >= 4 includes gas composition @@ -22,17 +32,20 @@ // 16 for nitrogen concentration // 32 for carbon dioxide concentration -/obj/machinery/atmospherics/air_sensor/update_icon() + +/obj/machinery/atmospherics/air_sensor/update_icon_state() icon_state = "gsensor[on]" + /obj/machinery/atmospherics/air_sensor/proc/toggle_out_flag(bitflag_value) - if(!(bitflag_value in list(1, 2, 4, 8, 16, 32))) - return 0 + if(!(bitflag_value in list(SENSOR_PRESSURE, SENSOR_TEMPERATURE, SENSOR_O2, SENSOR_PLASMA, SENSOR_N2, SENSOR_CO2))) + return if(output & bitflag_value) output &= ~bitflag_value else output |= bitflag_value + /obj/machinery/atmospherics/air_sensor/proc/toggle_bolts() bolts = !bolts if(bolts) @@ -99,10 +112,12 @@ /obj/machinery/atmospherics/air_sensor/Initialize() . = ..() + GLOB.gas_sensors += src SSair.atmos_machinery += src set_frequency(frequency) /obj/machinery/atmospherics/air_sensor/Destroy() + GLOB.gas_sensors -= src SSair.atmos_machinery -= src if(SSradio) SSradio.remove_object(src, frequency) diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index 8b0bd2e1e91..87e31ffda70 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -15,11 +15,12 @@ //Simple variable to prevent me from doing attack_hand in both this and the child computer var/zone = "This computer is working on a wireless range, the range is currently limited to 25 meters." -/obj/machinery/computer/area_atmos/New() - ..() + +/obj/machinery/computer/area_atmos/Initialize(mapload) + . = ..() //So the scrubbers have time to spawn - spawn(10) - scanscrubbers() + addtimer(CALLBACK(src, PROC_REF(scanscrubbers)), 1 SECONDS) + /obj/machinery/computer/area_atmos/attack_ai(mob/user as mob) src.add_hiddenprint(user) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 627c3d99cfc..647f4879cfa 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -43,42 +43,48 @@ GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new()) name = "canister" icon = 'icons/obj/pipes_and_stuff/atmospherics/atmos.dmi' icon_state = "yellow" - density = 1 + density = TRUE flags = CONDUCT - armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 50) + armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 10, RAD = 100, FIRE = 80, ACID = 50) max_integrity = 250 integrity_failure = 100 - var/valve_open = 0 + var/valve_open = FALSE var/release_pressure = ONE_ATMOSPHERE - var/list/canister_color //variable that stores colours - var/list/color_index // list which stores tgui color indexes for the recoloring options, to enable previously-set colors to show up right + /// Variable that stores colours + var/list/canister_color + /// List which stores tgui color indexes for the recoloring options, to enable previously-set colors to show up right + var/list/color_index - //lists for check_change() - var/list/oldcolor + /// Lists for check_change() + var/list/old_color - //passed to the ui to render the color lists + /// Passed to the ui to render the color lists var/list/colorcontainer - var/can_label = 1 + var/can_label = TRUE var/filled = 0.5 pressure_resistance = 7 * ONE_ATMOSPHERE var/temperature_resistance = 1000 + T0C volume = 1000 use_power = NO_POWER_USE - interact_offline = 1 - var/update_flag = 0 + interact_offline = TRUE + var/update_flag = NONE + + +/obj/machinery/portable_atmospherics/canister/Initialize(mapload) + . = ..() -/obj/machinery/portable_atmospherics/canister/New() - ..() canister_color = list( "prim" = "yellow", "sec" = "none", "ter" = "none", - "quart" = "none" + "quart" = "none", ) - oldcolor = new /list() + + old_color = list() + colorcontainer = list( "prim" = list( "options" = GLOB.canister_icon_container.possiblemaincolor, @@ -97,84 +103,98 @@ GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new()) "name" = "Quaternary color", ) ) + color_index = list() update_icon() + +#define HOLDING_TANK 1 +#define CONNECTED_PORT 2 +#define LOW_PRESSURE 4 +#define NORMAL_PRESSURE 8 +#define HIGH_PRESSURE 16 +#define EXTREME_PRESSURE 32 +#define NEW_COLOR 64 +#define RESET 68 + /obj/machinery/portable_atmospherics/canister/proc/check_change() var/old_flag = update_flag - update_flag = 0 + + update_flag = NONE if(holding) - update_flag |= 1 + update_flag |= HOLDING_TANK if(connected_port) - update_flag |= 2 + update_flag |= CONNECTED_PORT var/tank_pressure = air_contents.return_pressure() if(tank_pressure < 10) - update_flag |= 4 + update_flag |= LOW_PRESSURE else if(tank_pressure < ONE_ATMOSPHERE) - update_flag |= 8 + update_flag |= NORMAL_PRESSURE else if(tank_pressure < 15*ONE_ATMOSPHERE) - update_flag |= 16 + update_flag |= HIGH_PRESSURE else - update_flag |= 32 + update_flag |= EXTREME_PRESSURE - if(list2params(oldcolor) != list2params(canister_color)) - update_flag |= 64 - oldcolor = canister_color.Copy() + if(list2params(old_color) != list2params(canister_color)) + update_flag |= NEW_COLOR + old_color = canister_color.Copy() - if(update_flag == old_flag) - return 1 - else - return 0 + return update_flag != old_flag -/obj/machinery/portable_atmospherics/canister/update_icon() + +/obj/machinery/portable_atmospherics/canister/update_icon_state() /* -update_flag -1 = holding -2 = connected_port -4 = tank_pressure < 10 -8 = tank_pressure < ONE_ATMOS -16 = tank_pressure < 15*ONE_ATMOS -32 = tank_pressure go boom. -64 = colors (note: colors has to be applied every icon update) */ - if(stat & BROKEN) - overlays = 0 - icon_state = text("[]-1", canister_color["prim"])//yes, I KNOW the colours don't reflect when the can's borked, whatever. + icon_state = "[canister_color["prim"]]-1"//yes, I KNOW the colours don't reflect when the can's borked, whatever. return if(icon_state != canister_color["prim"]) icon_state = canister_color["prim"] - if(check_change()) //Returns 1 if no change needed to icons. + +/obj/machinery/portable_atmospherics/canister/update_overlays() + . = ..() + + if(stat & BROKEN) return - overlays.Cut() + if(!check_change()) //Returns FALSE if no change needed to icons. + return for(var/C in canister_color) if(C == "prim") continue if(canister_color[C] == "none") continue - overlays.Add(canister_color[C]) - - if(update_flag & 1) - overlays += "can-open" - if(update_flag & 2) - overlays += "can-connector" - if(update_flag & 4) - overlays += "can-o0" - if(update_flag & 8) - overlays += "can-o1" - else if(update_flag & 16) - overlays += "can-o2" - else if(update_flag & 32) - overlays += "can-o3" - - update_flag &= ~68 //the flag 64 represents change, not states. As such, we have to reset them to be able to detect a change on the next go. - return + . += canister_color[C] + + if(update_flag & HOLDING_TANK) + . += "can-open" + if(update_flag & CONNECTED_PORT) + . += "can-connector" + if(update_flag & LOW_PRESSURE) + . += "can-o0" + if(update_flag & NORMAL_PRESSURE) + . += "can-o1" + else if(update_flag & HIGH_PRESSURE) + . += "can-o2" + else if(update_flag & EXTREME_PRESSURE) + . += "can-o3" + + update_flag &= ~RESET //the flag NEW_COLOR represents change, not states. As such, we have to reset them to be able to detect a change on the next go. + +#undef HOLDING_TANK +#undef CONNECTED_PORT +#undef LOW_PRESSURE +#undef NORMAL_PRESSURE +#undef HIGH_PRESSURE +#undef EXTREME_PRESSURE +#undef NEW_COLOR +#undef RESET + /obj/machinery/portable_atmospherics/canister/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() @@ -212,6 +232,7 @@ update_flag holding.forceMove(T) holding = null + /obj/machinery/portable_atmospherics/canister/process_atmos() if(stat & BROKEN) return @@ -245,9 +266,10 @@ update_flag if(air_contents.return_pressure() < 1) - can_label = 1 + can_label = TRUE else - can_label = 0 + can_label = FALSE + /obj/machinery/portable_atmospherics/canister/return_air() return air_contents @@ -274,6 +296,20 @@ update_flag else if(valve_open && holding) investigate_log("[key_name_log(user)] started a transfer into [holding].", INVESTIGATE_ATMOS) + +/obj/machinery/portable_atmospherics/canister/welder_act(mob/user, obj/item/I) + if(!(stat & BROKEN)) + return + . = TRUE + if(!I.tool_use_check(user, 0)) + return + WELDER_ATTEMPT_SLICING_MESSAGE + if(I.use_tool(src, user, 50, volume = I.tool_volume)) + to_chat(user, span_notice("You salvage whats left of [src]!")) + new /obj/item/stack/sheet/metal(drop_location(), 3) + qdel(src) + + /obj/machinery/portable_atmospherics/canister/attack_ai(var/mob/user) return attack_hand(user) @@ -385,105 +421,79 @@ update_flag /obj/machinery/portable_atmospherics/canister/toxins name = "Canister \[Toxin (Plasma)\]" - icon_state = "orange" //See New() - can_label = 0 + icon_state = "orange" //See Initialize() + can_label = FALSE /obj/machinery/portable_atmospherics/canister/oxygen name = "Canister: \[O2\]" - icon_state = "blue" //See New() - can_label = 0 + icon_state = "blue" //See Initialize() + can_label = FALSE /obj/machinery/portable_atmospherics/canister/sleeping_agent name = "Canister: \[N2O\]" - icon_state = "redws" //See New() - can_label = 0 + icon_state = "redws" //See Initialize() + can_label = FALSE /obj/machinery/portable_atmospherics/canister/nitrogen name = "Canister: \[N2\]" - icon_state = "red" //See New() - can_label = 0 + icon_state = "red" //See Initialize() + can_label = FALSE /obj/machinery/portable_atmospherics/canister/carbon_dioxide name = "Canister \[CO2\]" - icon_state = "black" //See New() - can_label = 0 + icon_state = "black" //See Initialize() + can_label = FALSE /obj/machinery/portable_atmospherics/canister/air name = "Canister \[Air\]" - icon_state = "grey" //See New() - can_label = 0 + icon_state = "grey" //See Initialize() + can_label = FALSE /obj/machinery/portable_atmospherics/canister/custom_mix name = "Canister \[Custom\]" - icon_state = "whiters" //See New() - can_label = 0 - + icon_state = "whiters" //See Initialize() + can_label = FALSE -/obj/machinery/portable_atmospherics/canister/toxins/New() - ..() +/obj/machinery/portable_atmospherics/canister/toxins/Initialize(mapload) + . = ..() canister_color["prim"] = "orange" air_contents.toxins = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) - update_icon() - return 1 -/obj/machinery/portable_atmospherics/canister/oxygen/New() - ..() +/obj/machinery/portable_atmospherics/canister/oxygen/Initialize(mapload) + . = ..() canister_color["prim"] = "blue" air_contents.oxygen = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) - update_icon() - return 1 -/obj/machinery/portable_atmospherics/canister/sleeping_agent/New() - ..() +/obj/machinery/portable_atmospherics/canister/sleeping_agent/Initialize(mapload) + . = ..() canister_color["prim"] = "redws" air_contents.sleeping_agent = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) - update_icon() - return 1 -/obj/machinery/portable_atmospherics/canister/nitrogen/New() - ..() +/obj/machinery/portable_atmospherics/canister/nitrogen/Initialize(mapload) + . = ..() canister_color["prim"] = "red" air_contents.nitrogen = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) - update_icon() - return 1 -/obj/machinery/portable_atmospherics/canister/carbon_dioxide/New() - ..() +/obj/machinery/portable_atmospherics/canister/carbon_dioxide/Initialize(mapload) + . = ..() canister_color["prim"] = "black" air_contents.carbon_dioxide = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) - update_icon() - return 1 -/obj/machinery/portable_atmospherics/canister/air/New() - ..() - +/obj/machinery/portable_atmospherics/canister/air/Initialize(mapload) + . = ..() canister_color["prim"] = "grey" air_contents.oxygen = (O2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) air_contents.nitrogen = (N2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) - update_icon() - return 1 -/obj/machinery/portable_atmospherics/canister/custom_mix/New() - ..() +/obj/machinery/portable_atmospherics/canister/custom_mix/Initialize(mapload) + . = ..() canister_color["prim"] = "whiters" update_icon() // Otherwise new canisters do not have their icon updated with the pressure light, likely want to add this to the canister class constructor, avoiding at current time to refrain from screwing up code for other canisters. --DZD - return 1 -/obj/machinery/portable_atmospherics/canister/welder_act(mob/user, obj/item/I) - if(!(stat & BROKEN)) - return - . = TRUE - if(!I.tool_use_check(user, 0)) - return - WELDER_ATTEMPT_SLICING_MESSAGE - if(I.use_tool(src, user, 50, volume = I.tool_volume)) - to_chat(user, span_notice("You salvage whats left of [src]!")) - new /obj/item/stack/sheet/metal(drop_location(), 3) - qdel(src) diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index da0c9fb5a24..a2546559ba3 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -31,19 +31,20 @@ target = null return ..() -/obj/machinery/atmospherics/meter/process_atmos() + +/obj/machinery/atmospherics/meter/update_icon_state() if(!target) icon_state = "meterX" - return 0 + return if(stat & (BROKEN|NOPOWER)) icon_state = "meter0" - return 0 + return var/datum/gas_mixture/environment = target.return_air() if(!environment) icon_state = "meterX" - return 0 + return var/env_pressure = environment.return_pressure() if(env_pressure <= 0.15*ONE_ATMOSPHERE) @@ -60,21 +61,37 @@ else icon_state = "meter4" - if(frequency) - var/datum/radio_frequency/radio_connection = SSradio.return_frequency(frequency) - - if(!radio_connection) return - - var/datum/signal/signal = new - signal.source = src - signal.transmission_method = 1 - signal.data = list( - "tag" = id_tag, - "device" = "AM", - "pressure" = round(env_pressure), - "sigtype" = "status" - ) - radio_connection.post_signal(src, signal) + +/obj/machinery/atmospherics/meter/process_atmos() + if(!target || (stat & (BROKEN|NOPOWER))) + update_icon(UPDATE_ICON_STATE) + return + + var/datum/gas_mixture/environment = target.return_air() + if(!environment) + update_icon(UPDATE_ICON_STATE) + return + + update_icon(UPDATE_ICON_STATE) + + if(!frequency) + return + + var/datum/radio_frequency/radio_connection = SSradio.return_frequency(frequency) + if(!radio_connection) + return + + var/datum/signal/signal = new + signal.source = src + signal.transmission_method = 1 + signal.data = list( + "tag" = id_tag, + "device" = "AM", + "pressure" = round(environment.return_pressure()), + "sigtype" = "status", + ) + radio_connection.post_signal(src, signal) + /obj/machinery/atmospherics/meter/proc/status() var/t = "" diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index ad658db1ced..ed430b6175b 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -7,34 +7,40 @@ var/obj/machinery/atmospherics/unary/portables_connector/connected_port var/obj/item/tank/holding - var/volume = 0 - var/maximum_pressure = 90*ONE_ATMOSPHERE -/obj/machinery/portable_atmospherics/New() - ..() + +/obj/machinery/portable_atmospherics/Initialize(mapload) + . = ..() SSair.atmos_machinery += src air_contents.volume = volume air_contents.temperature = T20C - return 1 + if(mapload) + return INITIALIZE_HINT_LATELOAD + + check_for_port() + + +// Late init this otherwise it shares with the port and it tries to div temperature by 0 +/obj/machinery/portable_atmospherics/LateInitialize() + check_for_port() + + +/obj/machinery/portable_atmospherics/proc/check_for_port() + var/obj/machinery/atmospherics/unary/portables_connector/port = locate() in loc + if(port) + connect(port) -/obj/machinery/portable_atmospherics/Initialize() - . = ..() - spawn() - var/obj/machinery/atmospherics/unary/portables_connector/port = locate() in loc - if(port) - connect(port) - update_icon() /obj/machinery/portable_atmospherics/process_atmos() if(!connected_port) //only react when pipe_network will ont it do it for you //Allow for reactions air_contents.react() - else - update_icon() + return + update_icon() /obj/machinery/portable_atmospherics/Destroy() SSair.atmos_machinery -= src @@ -43,17 +49,20 @@ QDEL_NULL(holding) return ..() -/obj/machinery/portable_atmospherics/update_icon() - return null +/obj/machinery/portable_atmospherics/update_icon_state() + return + +/obj/machinery/portable_atmospherics/update_overlays() + . = list() /obj/machinery/portable_atmospherics/proc/connect(obj/machinery/atmospherics/unary/portables_connector/new_port) //Make sure not already connected to something else if(connected_port || !new_port || new_port.connected_device) - return 0 + return FALSE //Make sure are close enough for a valid connection if(new_port.loc != loc) - return 0 + return FALSE //Perform the connection connected_port = new_port @@ -64,20 +73,20 @@ connected_port.build_network() connected_port.parent.reconcile_air() - anchored = 1 //Prevent movement + anchored = TRUE //Prevent movement - return 1 + return TRUE /obj/machinery/portable_atmospherics/proc/disconnect() if(!connected_port) - return 0 + return FALSE - anchored = 0 + anchored = FALSE connected_port.connected_device = null connected_port = null - return 1 + return TRUE /obj/machinery/portable_atmospherics/portableConnectorReturnAir() return air_contents @@ -121,10 +130,10 @@ if(!user.drop_transfer_item_to_loc(T, src)) return add_fingerprint(user) - if(src.holding) + if(holding) to_chat(user, span_notice("[holding ? "In one smooth motion you pop [holding] out of [src]'s connector and replace it with [T]" : "You insert [T] into [src]"].")) replace_tank(user, FALSE) - src.holding = T + holding = T update_icon() return return ..() diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index e5987d8076f..c86161bb714 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -19,21 +19,18 @@ /// The desired pressure the pump should be outputting, either into the atmosphere, or into a holding tank. var/target_pressure = 101.325 -/obj/machinery/portable_atmospherics/pump/update_icon() - overlays = 0 - if(on) - icon_state = "psiphon:1" - else - icon_state = "psiphon:0" +/obj/machinery/portable_atmospherics/pump/update_icon_state() + icon_state = "psiphon:[on]" - if(holding) - overlays += "siphon-open" +/obj/machinery/portable_atmospherics/pump/update_overlays() + . = ..() + if(holding) + . += "siphon-open" if(connected_port) - overlays += "siphon-connector" + . += "siphon-connector" - return /obj/machinery/portable_atmospherics/pump/emp_act(severity) if(stat & (BROKEN|NOPOWER)) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 5d1b6f5a3ee..7d1d95a0ec7 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -25,21 +25,18 @@ ..(severity) -/obj/machinery/portable_atmospherics/scrubber/update_icon() - overlays = 0 - if(on) - icon_state = "pscrubber:1" - else - icon_state = "pscrubber:0" +/obj/machinery/portable_atmospherics/scrubber/update_icon_state() + icon_state = "pscrubbe:[on]" - if(holding) - overlays += "scrubber-open" +/obj/machinery/portable_atmospherics/scrubber/update_overlays() + . = ..() + if(holding) + . += "scrubber-open" if(connected_port) - overlays += "scrubber-connector" + . += "scrubber-connector" - return /obj/machinery/portable_atmospherics/scrubber/process_atmos() ..() @@ -164,7 +161,7 @@ /obj/machinery/portable_atmospherics/scrubber/huge name = "Huge Air Scrubber" icon_state = "scrubber:0" - anchored = 1 + anchored = TRUE volume = 50000 volume_rate = 5000 widenet = 1 @@ -183,13 +180,14 @@ /obj/machinery/portable_atmospherics/scrubber/huge/attack_hand(mob/user) to_chat(usr, span_warning("You can't directly interact with this machine. Use the area atmos computer.")) -/obj/machinery/portable_atmospherics/scrubber/huge/update_icon() - overlays = 0 - if(on) - icon_state = "scrubber:1" - else - icon_state = "scrubber:0" +/obj/machinery/portable_atmospherics/scrubber/huge/update_icon_state() + icon_state = "pscrubbe:[on]" + + +/obj/machinery/portable_atmospherics/scrubber/update_overlays() + . = list() + /obj/machinery/portable_atmospherics/scrubber/huge/wrench_act(mob/user, obj/item/I) . = TRUE diff --git a/code/game/machinery/atmoalter/zvent.dm b/code/game/machinery/atmoalter/zvent.dm index a135833b903..162fe45fe22 100644 --- a/code/game/machinery/atmoalter/zvent.dm +++ b/code/game/machinery/atmoalter/zvent.dm @@ -9,8 +9,8 @@ var/on = 0 var/volume_rate = 800 -/obj/machinery/zvent/New() - ..() +/obj/machinery/zvent/Initialize(mapload) + . = ..() SSair.atmos_machinery += src /obj/machinery/zvent/Destroy() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 6001a1d638e..1e9319154d8 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -12,7 +12,7 @@ var/list/queue = list() var/queue_max_len = 12 var/turf/BuildTurf - anchored = 1.0 + anchored = TRUE var/list/L = list() var/list/LL = list() var/hacked = 0 @@ -376,8 +376,7 @@ if(can_build(D, multiplier)) being_built = list(D, multiplier) use_power(power) - icon_state = "autolathe" - flick("autolathe_n",src) + flick("autolathe_n", src) if(is_stack) var/list/materials_used = list(MAT_METAL=metal_cost*multiplier, MAT_GLASS=glass_cost*multiplier) materials.use_amount(materials_used) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 8802037979c..54e28a7c775 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -9,8 +9,8 @@ icon_state = "launcherbtt" desc = "A remote control switch for a mass driver." var/id_tag = "default" - var/active = 0 - anchored = 1.0 + var/active = FALSE + anchored = TRUE armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 10, bio = 100, rad = 100, fire = 90, acid = 70) use_power = IDLE_POWER_USE idle_power_usage = 2 @@ -57,6 +57,10 @@ return ..() +/obj/machinery/driver_button/update_icon_state() + icon_state = active ? "launcheract" : "launcherbtt" + + /obj/machinery/driver_button/attack_ai(mob/user as mob) return attack_hand(user) @@ -96,8 +100,8 @@ launch_sequence() /obj/machinery/driver_button/proc/launch_sequence() - active = 1 - icon_state = "launcheract" + active = TRUE + update_icon(UPDATE_ICON_STATE) if(logic_connect) if(!radio_connection) //can't output without this @@ -145,8 +149,8 @@ rearm() /obj/machinery/driver_button/proc/rearm() - icon_state = "launcherbtt" active = FALSE + update_icon(UPDATE_ICON_STATE) ////////////////////////////////////// // Ignition Switch // @@ -158,8 +162,8 @@ icon_state = "launcherbtt" desc = "A remote control switch for a mounted igniter." var/id = null - var/active = 0 - anchored = 1.0 + var/active = FALSE + anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 @@ -181,8 +185,8 @@ use_power(5) - active = 1 - icon_state = "launcheract" + active = TRUE + update_icon(UPDATE_ICON_STATE) for(var/obj/machinery/sparker/M in GLOB.machines) if(M.id == id) @@ -197,5 +201,10 @@ sleep(50) - icon_state = "launcherbtt" - active = 0 + active = FALSE + update_icon(UPDATE_ICON_STATE) + + +/obj/machinery/ignition_switch/update_icon_state() + icon_state = active ? "launcheract" : "launcherbtt" + diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 6a7416df3f5..ecf1df39b62 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -2,6 +2,7 @@ name = "security camera" desc = "It's used to monitor rooms." icon = 'icons/obj/machines/monitors.dmi' + blocks_emissive = EMISSIVE_BLOCK_GENERIC icon_state = "camera" use_power = ACTIVE_POWER_USE idle_power_usage = 5 @@ -39,8 +40,8 @@ wires = new(src) assembly = new(src) assembly.state = 4 - assembly.anchored = 1 - assembly.update_icon() + assembly.anchored = TRUE + assembly.update_icon(UPDATE_ICON_STATE) GLOB.cameranet.cameras += src if(networks) @@ -82,15 +83,14 @@ return if(!isEmpProof()) if(prob(150/severity)) - update_icon() stat |= EMPED set_light(0) - update_icon() + update_icon(UPDATE_ICON_STATE) GLOB.cameranet.removeCamera(src) - addtimer(CALLBACK(src, PROC_REF(triggerCameraAlarm)), 10 SECONDS, TIMER_UNIQUE | TIMER_DELETE_ME) - addtimer(CALLBACK(src, PROC_REF(restore_from_emp)), 90 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_DELETE_ME) + addtimer(CALLBACK(src, PROC_REF(triggerCameraAlarm)), 10 SECONDS, TIMER_UNIQUE|TIMER_DELETE_ME) + addtimer(CALLBACK(src, PROC_REF(restore_from_emp)), 90 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_DELETE_ME) for(var/mob/M in GLOB.player_list) if(M.client && M.client.eye == src) @@ -102,7 +102,7 @@ /obj/machinery/camera/proc/restore_from_emp() stat &= ~EMPED - update_icon() + update_icon(UPDATE_ICON_STATE) if(can_use()) GLOB.cameranet.addCamera(src) @@ -254,7 +254,7 @@ assembly.forceMove(drop_location()) assembly.state = 1 assembly.setDir(dir) - assembly.update_icon() + assembly.update_icon(UPDATE_ICON_STATE) assembly = null else var/obj/item/I = new /obj/item/camera_assembly(loc) @@ -262,7 +262,8 @@ new /obj/item/stack/cable_coil(loc, 2) qdel(src) -/obj/machinery/camera/update_icon() + +/obj/machinery/camera/update_icon_state() if(!status) icon_state = "[initial(icon_state)]1" else if(stat & EMPED) @@ -270,6 +271,7 @@ else icon_state = "[initial(icon_state)]" + /obj/machinery/camera/proc/toggle_cam(mob/user, displaymessage = TRUE) status = !status if(can_use()) @@ -299,7 +301,7 @@ visible_message(span_danger("\The [src] [change_msg]!")) playsound(loc, toggle_sound, 100, 1) - update_icon() + update_icon(UPDATE_ICON_STATE) // now disconnect anyone using the camera //Apparently, this will disconnect anyone even if the camera was re-activated. @@ -423,8 +425,8 @@ /obj/machinery/camera/portable/Initialize(mapload) . = ..() assembly.state = 0 //These cameras are portable, and so shall be in the portable state if removed. - assembly.anchored = 0 - assembly.update_icon() + assembly.anchored = FALSE + assembly.update_icon(UPDATE_ICON_STATE) /obj/machinery/camera/portable/process() //Updates whenever the camera is moved. if(GLOB.cameranet && get_turf(src) != prev_turf) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 6370aa4351c..9ef6ebd632c 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -119,12 +119,12 @@ WRENCH_ANCHOR_TO_WALL_MESSAGE anchored = TRUE state = ASSEMBLY_WRENCHED - update_icon() + update_icon(UPDATE_ICON_STATE) auto_turn() else if(state == ASSEMBLY_WRENCHED) WRENCH_UNANCHOR_WALL_MESSAGE anchored = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) state = ASSEMBLY_UNBUILT else to_chat(user, span_warning("[src] can't fit here!")) @@ -147,7 +147,7 @@ to_chat(user, span_notice("You unweld [src] from its place.")) state = ASSEMBLY_WRENCHED -/obj/item/camera_assembly/update_icon() +/obj/item/camera_assembly/update_icon_state() if(anchored) icon_state = "camera1" else diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 1ce7b76d783..d47de7afbb2 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -3,7 +3,7 @@ desc = "It charges power cells." icon = 'icons/obj/engines_and_power/power.dmi' icon_state = "ccharger0" - anchored = 1 + anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 60 @@ -21,20 +21,19 @@ QDEL_NULL(charging) return ..() -/obj/machinery/cell_charger/proc/updateicon() + +/obj/machinery/cell_charger/update_icon_state() icon_state = "ccharger[charging ? 1 : 0]" - if(charging && !(stat & (BROKEN|NOPOWER))) - var/newlevel = round(charging.percent() * 4 / 100) - if(chargelevel != newlevel) - chargelevel = newlevel +/obj/machinery/cell_charger/update_overlays() + . = ..() + if(!charging || (stat & (BROKEN|NOPOWER))) + return - overlays.Cut() - overlays += "ccharger-o[newlevel]" + var/newlevel = round(charging.percent() * 4 / 100) + . += "ccharger-o[newlevel]" - else - overlays.Cut() /obj/machinery/cell_charger/examine(mob/user) . = ..() @@ -67,8 +66,8 @@ charging = I user.visible_message("[user] inserts a cell into the charger.", span_notice("You insert a cell into the charger.")) - chargelevel = -1 - updateicon() + check_level() + update_icon() else return ..() @@ -90,7 +89,7 @@ charging.update_icon() charging = null chargelevel = -1 - updateicon() + update_icon() /obj/machinery/cell_charger/attack_hand(mob/user) if(!charging) @@ -137,4 +136,13 @@ use_power(200) //this used to use CELLRATE, but CELLRATE is fucking awful. feel free to fix this properly! charging.give(175) //inefficiency. - updateicon() + if(check_level()) + update_icon(UPDATE_OVERLAYS) + + +/obj/machinery/cell_charger/proc/check_level() + var/newlevel = round(charging.percent() * 4 / 100) + if(chargelevel != newlevel) + chargelevel = newlevel + return TRUE + diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 1324085660a..d1412461175 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -53,13 +53,15 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ light_color = LIGHT_COLOR_PURE_GREEN -/obj/machinery/clonepod/power_change() - ..() + +/obj/machinery/clonepod/power_change(forced = FALSE) + ..() //we don't check return here because we also care about the BROKEN flag if(!(stat & (BROKEN|NOPOWER))) set_light(2) else set_light(0) + /obj/machinery/clonepod/biomass biomass = CLONE_BIOMASS @@ -460,7 +462,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ . = TRUE // These icon states don't really matter since we need to call update_icon() to handle panel open/closed overlays anyway. default_deconstruction_screwdriver(user, null, null, I) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/machinery/clonepod/wrench_act(mob/user, obj/item/I) . = TRUE @@ -596,13 +598,8 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ mess = TRUE update_icon() -/obj/machinery/clonepod/update_icon() - ..() - cut_overlays() - - if(panel_open) - add_overlay("panel_open") +/obj/machinery/clonepod/update_icon_state() if(occupant && !(stat & NOPOWER)) icon_state = "pod_cloning" else if(mess) @@ -610,6 +607,13 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ else icon_state = "pod_idle" + +/obj/machinery/clonepod/update_overlays() + . = ..() + if(panel_open) + . += "panel_open" + + /obj/machinery/clonepod/relaymove(mob/user) if(user.stat == CONSCIOUS) go_out() diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index b578fef4d6f..cf44d50900b 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -332,13 +332,11 @@ icon_state = "grass1" floor_tile = /obj/item/stack/tile/grass -/turf/simulated/floor/holofloor/grass/New() - ..() - spawn(1) - update_icon() +/turf/simulated/floor/holofloor/grass/Initialize(mapload) + . = ..() + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), UPDATE_ICON_STATE), 0.1 SECONDS) -/turf/simulated/floor/holofloor/grass/update_icon() - ..() +/turf/simulated/floor/holofloor/grass/update_icon_state() if(!(icon_state in list("grass1", "grass2", "grass3", "grass4", "sand"))) icon_state = "grass[pick("1","2","3","4")]" @@ -400,7 +398,7 @@ density = 1 layer = 3.2//Just above doors pressure_resistance = 4*ONE_ATMOSPHERE - anchored = 1.0 + anchored = TRUE flags = ON_BORDER /obj/structure/rack/holorack/has_prints() @@ -463,18 +461,22 @@ ..() item_color = pick("red","blue","green","purple") + +/obj/item/holo/esword/update_icon_state() + icon_state = active ? "sword[item_color]" : "sword0" + + /obj/item/holo/esword/attack_self(mob/living/user as mob) active = !active + update_icon(UPDATE_ICON_STATE) if(active) force = 30 - icon_state = "sword[item_color]" hitsound = "sound/weapons/blade1.ogg" w_class = WEIGHT_CLASS_BULKY playsound(user, 'sound/weapons/saberon.ogg', 20, 1) to_chat(user, span_notice("[src] is now active.")) else force = 3 - icon_state = "sword0" hitsound = "swing_hit" w_class = WEIGHT_CLASS_SMALL playsound(user, 'sound/weapons/saberoff.ogg', 20, 1) @@ -506,7 +508,7 @@ desc = "Boom, Shakalaka!" icon = 'icons/obj/basketball.dmi' icon_state = "hoop" - anchored = 1 + anchored = TRUE density = 1 pass_flags = LETPASSTHROW @@ -564,7 +566,7 @@ var/area/currentarea = null var/eventstarted = 0 - anchored = 1.0 + anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 6 @@ -594,7 +596,7 @@ add_fingerprint(user) ready = !ready - update_icon() + update_icon(UPDATE_ICON_STATE) var/numbuttons = 0 var/numready = 0 @@ -606,11 +608,9 @@ if(numbuttons == numready) begin_event() -/obj/machinery/readybutton/update_icon() - if(ready) - icon_state = "auth_on" - else - icon_state = "auth_off" +/obj/machinery/readybutton/update_icon_state() + icon_state = ready ? "auth_on" : "auth_off" + /obj/machinery/readybutton/proc/begin_event() eventstarted = 1 diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 0b250ef8c9d..00b06ad8c3e 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -3,7 +3,7 @@ /obj/machinery/computer/operating name = "operating computer" density = 1 - anchored = 1.0 + anchored = TRUE icon_keyboard = "med_key" icon_screen = "crew" circuit = /obj/item/circuitboard/operating diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 461383e8026..d698ed8119c 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -1,6 +1,6 @@ /obj/structure/AIcore density = 1 - anchored = 0 + anchored = FALSE name = "AI core" icon = 'icons/mob/ai.dmi' icon_state = "0" @@ -25,7 +25,7 @@ add_fingerprint(user) playsound(loc, P.usesound, 50, 1) to_chat(user, span_notice("You place the circuit board inside the frame.")) - update_icon() + update_icon(UPDATE_ICON_STATE) state = CIRCUIT_CORE circuit = P return @@ -39,7 +39,7 @@ add_fingerprint(user) to_chat(user, span_notice("You add cables to the frame.")) state = CABLED_CORE - update_icon() + update_icon(UPDATE_ICON_STATE) else to_chat(user, span_warning("You need five lengths of cable to wire the AI core!")) return @@ -53,7 +53,7 @@ add_fingerprint(user) to_chat(user, span_notice("You put in the glass panel.")) state = GLASS_CORE - update_icon() + update_icon(UPDATE_ICON_STATE) else to_chat(user, span_warning("You need two sheets of reinforced glass to insert them into the AI core!")) return @@ -115,7 +115,7 @@ add_fingerprint(user) brain = M to_chat(user, span_notice("You add [M.name] to the frame.")) - update_icon() + update_icon(UPDATE_ICON_STATE) return return ..() @@ -143,7 +143,7 @@ to_chat(user, span_notice("You remove the brain.")) brain.forceMove(loc) brain = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/AIcore/screwdriver_act(mob/living/user, obj/item/I) if(!(state in list(SCREWED_CORE, CIRCUIT_CORE, GLASS_CORE, AI_READY_CORE))) @@ -182,7 +182,7 @@ if(AI_READY_CORE) to_chat(user, span_notice("You disconnect the monitor.")) state = GLASS_CORE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/AIcore/wirecutter_act(mob/living/user, obj/item/I) @@ -205,7 +205,7 @@ return default_unfasten_wrench(user, I, 20) -/obj/structure/AIcore/update_icon() +/obj/structure/AIcore/update_icon_state() switch(state) if(EMPTY_CORE) icon_state = "0" diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 9b5bbe4902d..749de03db75 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -63,6 +63,9 @@ return switch(action) if("fix") + if(occupant.suiciding) + to_chat(usr, span_warning("Memory corruption detected in recovery partition, likely due to a sudden self-induced shutdown. AI is unrecoverable.")) + return if(active) // Prevent from starting a fix while fixing. to_chat(usr, span_warning("You are already fixing this AI!")) return @@ -93,22 +96,23 @@ sleep(10) active = FALSE -/obj/machinery/computer/aifixer/update_icon() - ..() + +/obj/machinery/computer/aifixer/update_overlays() + . = ..() if(stat & (NOPOWER|BROKEN)) return + + if(active) + . += "ai-fixer-on" + if(occupant) + switch(occupant.stat) + if(CONSCIOUS) + . += "ai-fixer-full" + if(DEAD) + . += "ai-fixer-404" else - var/overlay_layer = LIGHTING_LAYER+0.2 // +0.1 from the default computer overlays - if(active) - overlays += image(icon,"ai-fixer-on",overlay_layer) - if(occupant) - switch(occupant.stat) - if(0) - overlays += image(icon,"ai-fixer-full",overlay_layer) - if(2) - overlays += image(icon,"ai-fixer-404",overlay_layer) - else - overlays += image(icon,"ai-fixer-empty",overlay_layer) + . += "ai-fixer-empty" + /obj/machinery/computer/aifixer/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/aicard/card) if(!..()) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 52e81a8e665..214415f01a0 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -83,11 +83,12 @@ minor_alarms += zone update_icon() -/obj/machinery/computer/atmos_alert/update_icon() + +/obj/machinery/computer/atmos_alert/update_icon_state() if(length(priority_alarms)) icon_screen = "alert:2" else if(length(minor_alarms)) icon_screen = "alert:1" else icon_screen = "alert:0" - ..() + diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 72da90aa7b2..ca7c63935e6 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -475,7 +475,7 @@ playsound(src, 'sound/effects/pop.ogg', 50) /obj/item/circuitboard/rdconsole/attackby(obj/item/I, mob/user, params) - if(I.GetID()) + if(istype(I, /obj/item/card/id) || istype(I, /obj/item/pda)) if(allowed(user)) user.visible_message(span_notice("\the [user] waves [user.p_their()] ID past the [src]'s access protocol scanner."), span_notice("You swipe your ID past the [src]'s access protocol scanner.")) var/console_choice = tgui_input_list(user, "What do you want to configure the access to?", "Access Modification", access_types) @@ -522,11 +522,43 @@ var/state = STATE_EMPTY var/obj/item/circuitboard/circuit = null + +/obj/structure/computerframe/examine(mob/user) + . = ..() + . += span_notice("It is [anchored ? "bolted to the floor" : "unbolted"].") + switch(state) + if(STATE_EMPTY) + . += span_notice("The frame is welded together, but it is missing a circuit board.") + if(STATE_CIRCUIT) + . += span_notice("A circuit board is firmly connected, but the cover is unscrewed and open.") + if(STATE_NOWIRES) + . += span_notice("The cover is screwed shut, but the frame is missing wiring.") + if(STATE_WIRES) + . += span_notice("The frame is wired, but the glass is missing.") + if(STATE_GLASS) + . += span_notice("The glass is loosely connected and needs to be screwed into place.") + if(!anchored) + . += span_notice("Alt-Click to rotate it.") + + /obj/structure/computerframe/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT)) drop_computer_parts() return ..() // will qdel the frame + +/obj/structure/computerframe/AltClick(mob/user) + if(user.incapacitated()) + to_chat(user, span_warning("You can't do that right now!")) + return + if(!Adjacent(user)) + return + if(anchored) + to_chat(user, span_warning("The frame is anchored to the floor!")) + return + setDir(turn(dir, 90)) + + /obj/structure/computerframe/obj_break(damage_flag) deconstruct() @@ -541,8 +573,7 @@ if(state == STATE_GLASS) new /obj/item/stack/sheet/glass(location, 2) -/obj/structure/computerframe/update_icon() - . = ..() +/obj/structure/computerframe/update_icon_state() icon_state = "comp_frame_[state]" /obj/structure/computerframe/welder_act(mob/user, obj/item/I) @@ -588,7 +619,7 @@ return I.play_tool_sound(src) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/computerframe/screwdriver_act(mob/living/user, obj/item/I) . = TRUE @@ -600,12 +631,12 @@ to_chat(user, span_notice("You screw the circuit board into place.")) state = STATE_NOWIRES I.play_tool_sound(src) - update_icon() + update_icon(UPDATE_ICON_STATE) if(STATE_NOWIRES) to_chat(user, span_notice("You unfasten the circuit board.")) state = STATE_CIRCUIT I.play_tool_sound(src) - update_icon() + update_icon(UPDATE_ICON_STATE) if(STATE_GLASS) to_chat(user, span_notice("You connect the monitor.")) I.play_tool_sound(src) @@ -616,6 +647,7 @@ SC.can_order_contraband = C.contraband_enabled qdel(src) + /obj/structure/computerframe/wirecutter_act(mob/living/user, obj/item/I) . = TRUE if(!I.use_tool(src, user)) @@ -626,7 +658,8 @@ new /obj/item/stack/cable_coil(drop_location(), 5) state = STATE_NOWIRES I.play_tool_sound(src) - update_icon() + update_icon(UPDATE_ICON_STATE) + /obj/structure/computerframe/attackby(obj/item/I, mob/user, params) switch(state) @@ -648,7 +681,7 @@ state = STATE_CIRCUIT user.drop_transfer_item_to_loc(B, src) circuit = B - update_icon() + update_icon(UPDATE_ICON_STATE) return if(STATE_NOWIRES) @@ -670,7 +703,7 @@ to_chat(user, span_notice("You add cables to the frame.")) state = STATE_WIRES - update_icon() + update_icon(UPDATE_ICON_STATE) return if(STATE_WIRES) @@ -692,11 +725,11 @@ to_chat(user, span_notice("You put in the glass panel.")) state = STATE_GLASS - update_icon() + update_icon(UPDATE_ICON_STATE) return - return ..() + /obj/structure/computerframe/HONKputer name = "Bananium Computer-frame" icon = 'icons/obj/machines/HONKputer.dmi' @@ -711,10 +744,11 @@ /obj/structure/computerframe/abductor icon_state = "comp_frame_alien1" -/obj/structure/computerframe/abductor/update_icon() - . = ..() + +/obj/structure/computerframe/abductor/update_icon_state() icon_state = "comp_frame_alien[state]" + /obj/structure/computerframe/abductor/screwdriver_act(mob/living/user, obj/item/I) . = TRUE if(!I.use_tool(src, user)) @@ -725,26 +759,25 @@ to_chat(user, span_notice("You screw the circuit board into place.")) state = STATE_NOWIRES I.play_tool_sound(src) - update_icon() + update_icon(UPDATE_ICON_STATE) if(STATE_NOWIRES) to_chat(user, span_notice("You unfasten the circuit board.")) state = STATE_CIRCUIT I.play_tool_sound(src) - update_icon() + update_icon(UPDATE_ICON_STATE) if(STATE_GLASS) to_chat(user, span_notice("You connect the monitor.")) I.play_tool_sound(src) - var/obj/machinery/computer/B = new circuit.build_path(loc) - B.abductor = TRUE - B.max_integrity = 400 - B.obj_integrity = 400 - if(B.icon_state == "computer") - B.icon_state = "aliencomputer" - B.update_icon() + var/obj/machinery/computer/computer = new circuit.build_path(loc) + computer.abductor = TRUE + computer.update_icon() + computer.max_integrity = 400 + computer.obj_integrity = 400 + computer.update_icon() if(istype(circuit, /obj/item/circuitboard/supplycomp)) - var/obj/machinery/computer/supplycomp/SC = B - var/obj/item/circuitboard/supplycomp/C = circuit - SC.can_order_contraband = C.contraband_enabled + var/obj/machinery/computer/supplycomp/supply_comp = computer + var/obj/item/circuitboard/supplycomp/supply_circuit = circuit + supply_comp.can_order_contraband = supply_circuit.contraband_enabled qdel(src) /obj/structure/computerframe/abductor/drop_computer_parts() diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index d87ca65f39f..c1887478d23 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -194,6 +194,19 @@ cam_background.icon_state = "scanline2" cam_background.fill_rect(1, 1, default_map_size, default_map_size) + + +// Other computer monitors. +/obj/machinery/computer/security/telescreen + name = "telescreen" + desc = "Used for watching camera networks." + icon_state = "telescreen_console" + icon_screen = "telescreen" + icon_keyboard = null + density = FALSE + circuit = /obj/item/circuitboard/camera/telescreen + + /obj/machinery/computer/security/telescreen/multitool_act(mob/user, obj/item/I) . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) @@ -213,28 +226,27 @@ if("West") pixel_x = -32 -// Other computer monitors. -/obj/machinery/computer/security/telescreen - name = "telescreen" - desc = "Used for watching camera networks." - icon_state = "telescreen_console" - icon_screen = "telescreen" - icon_keyboard = null - light_range_on = 0 - density = 0 - circuit = /obj/item/circuitboard/camera/telescreen /obj/machinery/computer/security/telescreen/entertainment name = "entertainment monitor" desc = "Damn, they better have Paradise TV on these things." icon_state = "entertainment_console" - icon_screen = "entertainment" + icon_screen = "entertainment_off" light_color = "#FFEEDB" - light_range_on = 0 + light_power_on = LIGHTING_MINIMUM_POWER network = list("news") - luminosity = 0 layer = 4 //becouse of plasma glass with layer = 3 circuit = /obj/item/circuitboard/camera/telescreen/entertainment + /// Icon utilised when feeds_on is true + var/icon_screen_on = "entertainment" + /// Used to detect how many video cameras are active + var/feeds_on = 0 + + +/obj/machinery/computer/security/telescreen/entertainment/update_overlays() + icon_screen = feeds_on ? icon_screen_on : initial(icon_screen) + return ..() + /obj/machinery/computer/security/telescreen/singularity name = "Singularity Engine Telescreen" diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 19cd3110b46..8da496e8a52 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -109,6 +109,7 @@ var/eye_initialized = 0 var/visible_icon = 0 var/image/user_image = null + ai_detector_visible = FALSE // Abductors dont trigger the Ai Detector /mob/camera/aiEye/remote/Destroy() eye_user = null diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 9007b353a23..5585d22f58b 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -157,7 +157,7 @@ return call_shuttle_proc(usr, input) if(SSshuttle.emergency.timer) - post_status("shuttle") + post_status(STATUS_DISPLAY_TRANSFER_SHUTTLE_TIME) setMenuState(usr, COMM_SCREEN_MAIN) if("cancelshuttle") @@ -168,7 +168,7 @@ if(response == "Yes") cancel_call_proc(usr) if(SSshuttle.emergency.timer) - post_status("shuttle") + post_status(STATUS_DISPLAY_TRANSFER_SHUTTLE_TIME) setMenuState(usr, COMM_SCREEN_MAIN) if("messagelist") @@ -204,13 +204,13 @@ switch(display_type) if("message") display_icon = null - post_status("message", stat_msg1, stat_msg2, usr) + post_status(STATUS_DISPLAY_MESSAGE, stat_msg1, stat_msg2) if("alert") display_icon = params["alert"] - post_status("alert", params["alert"], user = usr) + post_status(STATUS_DISPLAY_ALERT, params["alert"]) else display_icon = null - post_status(params["statdisp"], user = usr) + post_status(display_type) setMenuState(usr, COMM_SCREEN_STAT) if("setmsg1") @@ -481,27 +481,23 @@ add_game_logs("has tried and failed to recall the shuttle.", user) message_admins("[ADMIN_LOOKUPFLW(user)] has tried and failed to recall the shuttle.") -/proc/post_status(command, data1, data2, mob/user = null) - var/datum/radio_frequency/frequency = SSradio.return_frequency(DISPLAY_FREQ) +/proc/post_status(mode, data1, data2) + if(usr && mode == STATUS_DISPLAY_MESSAGE) + log_and_message_admins("set status screen message: [data1] [data2]") - if(!frequency) return + for(var/obj/machinery/status_display/display as anything in GLOB.status_displays) + if(display.is_supply) + continue - var/datum/signal/status_signal = new - status_signal.transmission_method = 1 - status_signal.data["command"] = command + display.set_mode(mode) + switch(mode) + if(STATUS_DISPLAY_MESSAGE) + display.set_message(data1, data2) + if(STATUS_DISPLAY_ALERT) + display.set_picture(data1) - switch(command) - if("message") - status_signal.data["msg1"] = data1 - status_signal.data["msg2"] = data2 - add_misc_logs(user, "STATUS: [key_name_log(user)] set status screen message: [data1] [data2]") - //message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]") - if("alert") - status_signal.data["picture_state"] = data1 - - spawn(0) - frequency.post_signal(null, status_signal) + display.update() /obj/machinery/computer/communications/Destroy() diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 3451e9d0014..25871f0310a 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -2,8 +2,8 @@ name = "computer" icon = 'icons/obj/machines/computer.dmi' icon_state = "computer" - density = 1 - anchored = 1.0 + density = TRUE + anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 300 active_power_usage = 300 @@ -11,24 +11,19 @@ integrity_failure = 100 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 20) var/obj/item/circuitboard/circuit = null //if circuit==null, computer can't disassembly - var/processing = 0 var/icon_keyboard = "generic_key" var/icon_screen = "generic" - var/light_range_on = 2 - var/light_power_on = 1 - var/overlay_layer + var/light_range_on = 1 + var/light_power_on = 0.7 var/abductor = FALSE /// Are we in the middle of a flicker event? var/flickering = FALSE /// Are we forcing the icon to be represented in a no-power state? var/force_no_power_icon_state = FALSE -/obj/machinery/computer/New() - overlay_layer = layer - ..() -/obj/machinery/computer/Initialize() - ..() +/obj/machinery/computer/Initialize(mapload) + . = ..() power_change() update_icon() @@ -75,33 +70,46 @@ update_icon() flickering = FALSE -/obj/machinery/computer/update_icon() - overlays.Cut() + +/obj/machinery/computer/update_icon_state() + icon_state = abductor ? "aliencomputer" : initial(icon_state) + + +/obj/machinery/computer/update_overlays() + . = ..() + underlays.Cut() + if((stat & NOPOWER) || force_no_power_icon_state) if(icon_keyboard && abductor) - overlays += image(icon,"alien_key_off",overlay_layer) + . += "alien_key_off" else if(icon_keyboard) - overlays += image(icon,"[icon_keyboard]_off",overlay_layer) + . += "[icon_keyboard]_off" return if(stat & BROKEN) - overlays += image(icon,"[icon_state]_broken",overlay_layer) + . += "[icon_state]_broken" else - overlays += image(icon,icon_screen,overlay_layer) + . += "[icon_screen]" + if(light) + underlays += emissive_appearance(icon, "[icon_state]_lightmask") if(icon_keyboard && abductor) - overlays += image(icon, "alien_key" ,overlay_layer) + . += "alien_key" + underlays += emissive_appearance(icon, "alien_key_lightmask") else if(icon_keyboard) - overlays += image(icon, icon_keyboard ,overlay_layer) + . += "[icon_keyboard]" + underlays += emissive_appearance(icon, "[icon_keyboard]_lightmask") -/obj/machinery/computer/power_change() - ..() - update_icon() +/obj/machinery/computer/power_change(forced = FALSE) + . = ..() //we don't check parent return due to this also being contigent on the BROKEN stat flag if((stat & (BROKEN|NOPOWER))) set_light(0) else set_light(light_range_on, light_power_on) + if(.) + update_icon() + /obj/machinery/computer/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) diff --git a/code/game/machinery/computer/depot.dm b/code/game/machinery/computer/depot.dm index cd3c4065136..0d7f73bcf6f 100644 --- a/code/game/machinery/computer/depot.dm +++ b/code/game/machinery/computer/depot.dm @@ -378,8 +378,9 @@ Enjoy your stay. "}) -/obj/machinery/computer/syndicate_depot/syndiecomms/power_change() - . = ..() +/obj/machinery/computer/syndicate_depot/syndiecomms/power_change(forced = FALSE) + if(!..()) + return if(!security_lockout && (stat & NOPOWER)) security_lockout = TRUE raise_alert("[src] lost power.") diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm index 57e6bd17543..026214d380a 100644 --- a/code/game/machinery/computer/honkputer.dm +++ b/code/game/machinery/computer/honkputer.dm @@ -89,29 +89,3 @@ dat += "
\[ [(src.state != STATE_DEFAULT) ? "Main Menu | " : ""]Close \]" user << browse(dat, "window=honkputer;size=400x500") onclose(user, "honkputer") - - -/obj/machinery/computer/HONKputer/attackby(obj/I, mob/user, params) - if(istype(I, /obj/item/screwdriver) && circuit) - var/obj/item/screwdriver/S = I - playsound(src.loc, S.usesound, 50, 1) - if(do_after(user, 20 * S.toolspeed * gettoolspeedmod(user), target = src)) - var/obj/structure/computerframe/HONKputer/A = new /obj/structure/computerframe/HONKputer( src.loc ) - var/obj/item/circuitboard/M = new circuit( A ) - A.circuit = M - A.anchored = 1 - A.add_fingerprint(user) - for(var/obj/C in src) - C.loc = src.loc - if(src.stat & BROKEN) - to_chat(user, span_notice("The broken glass falls out.")) - new /obj/item/shard( src.loc ) - A.state = 4 - A.icon_state = "comp_frame_4" - else - to_chat(user, span_notice("You disconnect the monitor.")) - A.state = 5 - A.icon_state = "comp_frame_5" - qdel(src) - else - return ..() diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index bb4d5eaf9ed..2a5d7a7b3cf 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -63,14 +63,15 @@ else if(user) to_chat(user, span_notice("A no server error appears on the screen.")) -/obj/machinery/computer/message_monitor/update_icon() + +/obj/machinery/computer/message_monitor/update_icon_state() if(emag || hacking) icon_screen = hack_icon else icon_screen = normal_icon - ..() + /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. @@ -488,22 +489,21 @@ /obj/item/paper/monitorkey - //..() name = "Monitor Decryption Key" - var/obj/machinery/message_server/server = null -/obj/item/paper/monitorkey/New() + +/obj/item/paper/monitorkey/Initialize(mapload) ..() - spawn(10) - 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 - overlays += "paper_words" - break + return INITIALIZE_HINT_LATELOAD + +/obj/item/paper/monitorkey/LateInitialize() + for(var/obj/machinery/message_server/server as anything in GLOB.message_servers) + 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 + update_icon() + break /obj/item/paper/rnd_logs_key name = "RnD logs Decryption Key" @@ -519,4 +519,5 @@ var/decryption_key = located_server.logs_decryption_key info = "
RnD logs Access key
The new RnD logs access key is \"[decryption_key]\"." info_links = info - overlays += "paper_words" + update_icon() + diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index de9496dba94..934e2ad24f1 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -4,29 +4,40 @@ icon_screen = "mass_driver" light_color = "#555555" circuit = /obj/item/circuitboard/pod - var/list/id_tags = list() - var/list/door_only_tags = list() - var/list/synced = list() - var/list/timings = list() - var/list/times = list() - var/list/maxtimes = list() - var/list/powers = list() - var/list/loopings = list() + var/initial_set = FALSE + var/list/id_tags + var/list/door_only_tags + var/list/synced + var/list/timings + var/list/times + var/list/maxtimes + var/list/powers + var/list/loopings + var/static/list/deathsquad_teles -/obj/machinery/computer/pod/New() - ..() - spawn(5) - driver_sync() + +/obj/machinery/computer/pod/Initialize(mapload) + . = ..() + addtimer(CALLBACK(src, PROC_REF(driver_sync)), 0.5 SECONDS) /obj/machinery/computer/pod/proc/driver_sync() + initial_set = TRUE + id_tags = list() + door_only_tags = list() + synced = list() timings = list() times = list() - synced = list() - for(var/obj/machinery/mass_driver/M in GLOB.machines) - if(M.z != src.z) continue + maxtimes = list() + powers = list() + loopings = list() + deathsquad_teles = list() + for(var/obj/machinery/mass_driver/driver in GLOB.machines) + if(driver.z != src.z) + continue + for(var/ident_tag in id_tags) - if((M.id_tag == ident_tag) && !(ident_tag in synced)) + if((driver.id_tag == ident_tag) && !(ident_tag in synced)) synced += ident_tag timings += ident_tag timings[ident_tag] = 0.0 @@ -39,19 +50,21 @@ loopings += ident_tag loopings[ident_tag] = 0 break - for(var/obj/machinery/door/poddoor/M in GLOB.airlocks) - if(M.z != src.z) continue + + for(var/obj/machinery/door/poddoor/poddoor in GLOB.airlocks) + if(poddoor.z != src.z) + continue for(var/ident_tag in id_tags) - if((M.id_tag == ident_tag) && !(ident_tag in synced) && !(ident_tag in door_only_tags)) + if((poddoor.id_tag == ident_tag) && !(ident_tag in synced) && !(ident_tag in door_only_tags)) door_only_tags += ident_tag break - return -/obj/machinery/computer/pod/proc/solo_sync(var/ident_tag) - for(var/obj/machinery/mass_driver/M in GLOB.machines) - if(M.z != src.z) continue - if((M.id_tag == ident_tag) && !(ident_tag in synced)) +/obj/machinery/computer/pod/proc/solo_sync(ident_tag) + for(var/obj/machinery/mass_driver/driver in GLOB.machines) + if(driver.z != src.z) + continue + if((driver.id_tag == ident_tag) && !(ident_tag in synced)) synced += ident_tag timings += ident_tag timings[ident_tag] = 0.0 @@ -64,48 +77,50 @@ loopings += ident_tag loopings[ident_tag] = 0 break + if(!(ident_tag in synced)) - for(var/obj/machinery/door/poddoor/M in GLOB.airlocks) - if(M.z != src.z) continue - if((M.id_tag == ident_tag) && !(ident_tag in synced) && !(ident_tag in door_only_tags)) + for(var/obj/machinery/door/poddoor/poddoor in GLOB.airlocks) + if(poddoor.z != src.z) + continue + if((poddoor.id_tag == ident_tag) && !(ident_tag in synced) && !(ident_tag in door_only_tags)) door_only_tags += ident_tag break - return - -/obj/machinery/computer/pod/proc/launch_sequence(var/ident_tag) +/obj/machinery/computer/pod/proc/launch_sequence(ident_tag) if(stat & (NOPOWER|BROKEN)) return - var/anydriver = 0 + + var/anydriver = FALSE for(var/obj/machinery/mass_driver/M in GLOB.machines) - if(M.z != src.z) continue + if(M.z != src.z) + continue if(M.id_tag == ident_tag) - anydriver = 1 + anydriver = TRUE + if(!anydriver) visible_message("Cannot locate any mass driver of that ID. Cancelling firing sequence!") return - for(var/obj/machinery/door/poddoor/M in GLOB.airlocks) - if(M.z != src.z) continue - if(M.id_tag == ident_tag) - spawn() - M.open() - sleep(20) + for(var/obj/machinery/door/poddoor/poddoor in GLOB.airlocks) + if(poddoor.z != src.z) + continue + if(poddoor.id_tag == ident_tag) + INVOKE_ASYNC(poddoor, TYPE_PROC_REF(/obj/machinery/door, open)) + sleep(2 SECONDS) + for(var/obj/machinery/mass_driver/driver in GLOB.machines) + if(driver.z != src.z) + continue + if(driver.id_tag == ident_tag) + driver.drive() - for(var/obj/machinery/mass_driver/M in GLOB.machines) - if(M.z != src.z) continue - if(M.id_tag == ident_tag) - M.drive() - - sleep(50) - for(var/obj/machinery/door/poddoor/M in GLOB.airlocks) - if(M.z != src.z) continue - if(M.id_tag == ident_tag) - spawn() - M.close() - return + sleep(5 SECONDS) + for(var/obj/machinery/door/poddoor/poddoor in GLOB.airlocks) + if(poddoor.z != src.z) + continue + if(poddoor.id_tag == ident_tag) + INVOKE_ASYNC(poddoor, TYPE_PROC_REF(/obj/machinery/door, close)) /obj/machinery/computer/pod/attack_ai(var/mob/user as mob) @@ -161,15 +176,14 @@ return /obj/machinery/computer/pod/process() - if(!..()) + if(!..() || !initial_set) return for(var/ident_tag in id_tags) if(timings[ident_tag]) if(times[ident_tag] > 0) times[ident_tag] = round(times[ident_tag]) - 1 else - spawn() - launch_sequence(ident_tag) + INVOKE_ASYNC(src, PROC_REF(launch_sequence), ident_tag) if(loopings[ident_tag]) times[ident_tag] = maxtimes[ident_tag] else @@ -178,7 +192,6 @@ else times[ident_tag] = maxtimes[ident_tag] updateDialog() - return /obj/machinery/computer/pod/Topic(href, href_list) @@ -213,8 +226,7 @@ if(href_list["massfire"]) for(var/ident_tag in synced) - spawn() - launch_sequence(ident_tag) + INVOKE_ASYNC(src, PROC_REF(launch_sequence), ident_tag) if(href_list["power"]) var/ident_tag = href_list["driver"] var/t = text2num(href_list["power"]) @@ -240,14 +252,14 @@ maxtimes[ident_tag] = min(max(round(maxtimes[ident_tag]), 0), 120) if(href_list["door"]) var/ident_tag = href_list["driver"] - for(var/obj/machinery/door/poddoor/M in GLOB.airlocks) - if(M.z != src.z) continue - if(M.id_tag == ident_tag) - spawn() - if(M.density) - M.open() - else - M.close() + for(var/obj/machinery/door/poddoor/poddoor in GLOB.airlocks) + if(poddoor.z != src.z) + continue + if(poddoor.id_tag == ident_tag) + if(poddoor.density) + INVOKE_ASYNC(poddoor, TYPE_PROC_REF(/obj/machinery/door, open)) + else + INVOKE_ASYNC(poddoor, TYPE_PROC_REF(/obj/machinery/door, close)) if(href_list["rename"]) var/new_title = input("Enter a new title", "[name]", "[name]") if(new_title) @@ -291,77 +303,105 @@ var/teleporter_dest = 0 circuit = /obj/item/circuitboard/pod/deathsquad -/obj/machinery/computer/pod/deathsquad/launch_sequence(var/ident_tag) + +/obj/machinery/computer/pod/deathsquad/launch_sequence(ident_tag) if(stat & (NOPOWER|BROKEN)) return - var/anydriver = 0 + + var/anydriver = FALSE for(var/obj/machinery/mass_driver/M in GLOB.machines) - if(M.z != src.z) continue + if(M.z != src.z) + continue if(M.id_tag == ident_tag) - anydriver = 1 + anydriver = TRUE + if(!anydriver) visible_message("Cannot locate any mass driver of that ID. Cancelling firing sequence!") return - var/spawn_marauder[] = new() - for(var/thing in GLOB.landmarks_list) - var/obj/effect/landmark/L = thing - if(L.name == "Marauder Entry") - spawn_marauder.Add(L) - for(var/thing in GLOB.landmarks_list) - var/obj/effect/landmark/L = thing - if(L.name == "Marauder Exit") - var/obj/effect/portal/P = new(L.loc, pick(spawn_marauder)) - P.invisibility = INVISIBILITY_ABSTRACT//So it is not seen by anyone. - P.failchance = 0//So it has no fail chance when teleporting. - P.can_mecha_pass = TRUE - spawn_marauder.Remove(P.target) - - for(var/obj/machinery/door/poddoor/M in GLOB.airlocks) - if(M.z != src.z) continue - if(M.id_tag == ident_tag) - spawn() - M.open() - sleep(20) - - for(var/obj/machinery/mass_driver/M in GLOB.machines) - if(M.z != src.z) continue - if(M.id_tag == ident_tag) - M.drive() - - sleep(50) - for(var/obj/machinery/door/poddoor/M in GLOB.airlocks) - if(M.z != src.z) continue - if(M.id_tag == ident_tag) - spawn() - M.close() - - for(var/obj/structure/deathsquad_tele/D in world) - if(D.z != src.z) continue - if(D.id_tag == ident_tag) - D.icon_state = "tele0" - D.density = 0 - - return + var/list/spawn_marauder = list() + for(var/obj/effect/landmark/landmark as anything in GLOB.landmarks_list) + if(landmark.name == "Marauder Entry") + spawn_marauder.Add(landmark) + + for(var/obj/effect/landmark/landmark as anything in GLOB.landmarks_list) + if(landmark.name == "Marauder Exit") + var/obj/effect/landmark/target_landmark = pick_n_take(spawn_marauder) + var/obj/effect/portal/portal = new(landmark.loc, target_landmark.loc) + portal.invisibility = INVISIBILITY_ABSTRACT //So it is not seen by anyone. + portal.failchance = 0 //So it has no fail chance when teleporting. + portal.can_mecha_pass = TRUE + + for(var/obj/machinery/door/poddoor/poddoor in GLOB.airlocks) + if(poddoor.z != src.z) + continue + if(poddoor.id_tag == ident_tag) + INVOKE_ASYNC(poddoor, TYPE_PROC_REF(/obj/machinery/door, open)) + + sleep(2 SECONDS) + for(var/obj/machinery/mass_driver/driver in GLOB.machines) + if(driver.z != src.z) + continue + if(driver.id_tag == ident_tag) + driver.drive() + + sleep(5 SECONDS) + for(var/obj/machinery/door/poddoor/poddoor in GLOB.airlocks) + if(poddoor.z != src.z) + continue + if(poddoor.id_tag == ident_tag) + INVOKE_ASYNC(poddoor, TYPE_PROC_REF(/obj/machinery/door, close)) + + for(var/obj/structure/deathsquad_tele/tele in GLOB.deathsquad_teles) + if(tele.z != src.z) + continue + if(tele.id_tag == ident_tag) + tele.working = TRUE + tele.update_icon(UPDATE_ICON_STATE) + + +GLOBAL_LIST_EMPTY(deathsquad_teles) /obj/structure/deathsquad_tele name = "Mech Teleporter" - density = 0 - anchored = 1 + density = TRUE + anchored = TRUE icon = 'icons/obj/stationobjs.dmi' icon_state = "tele0" var/ztarget = 0 var/id_tag = "" + var/working = FALSE + + +/obj/structure/deathsquad_tele/Initialize(mapload) + . = ..() + GLOB.deathsquad_teles += src + + +/obj/structure/deathsquad_tele/Destroy() + GLOB.deathsquad_teles -= src + return ..() + + +/obj/structure/deathsquad_tele/update_icon_state() + icon_state = "tele[working]" /obj/structure/deathsquad_tele/Bumped(atom/movable/moving_atom) - if(!ztarget) return ..() - var/y = moving_atom.y - spawn() - moving_atom.z = ztarget - moving_atom.y = y - moving_atom.x = world.maxx - TRANSITIONEDGE - 2 - moving_atom.dir = 8 - var/atom/target = get_edge_target_turf(moving_atom, moving_atom.dir) - moving_atom.throw_at(target, 50, 1) - return + if(!ztarget || !working) + return ..() + + INVOKE_ASYNC(src, PROC_REF(async_bump_effect), moving_atom) + + +/obj/structure/deathsquad_tele/proc/async_bump_effect(atom/movable/moving_atom) + if(QDELETED(moving_atom)) + return + + moving_atom.z = ztarget + moving_atom.y = moving_atom.y + moving_atom.x = world.maxx - TRANSITIONEDGE - 2 + moving_atom.dir = 8 + var/atom/target = get_edge_target_turf(moving_atom, moving_atom.dir) + moving_atom.throw_at(target, 50, 1) + diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm index c8e7dae6b74..b0b6b761c9f 100644 --- a/code/game/machinery/computer/power.dm +++ b/code/game/machinery/computer/power.dm @@ -47,8 +47,8 @@ QDEL_NULL(power_monitor) return ..() -/obj/machinery/computer/monitor/power_change() - ..() +/obj/machinery/computer/monitor/power_change(forced = FALSE) + . = ..() if(is_secret_monitor) return if(!(stat & (NOPOWER|BROKEN))) diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 82241309b82..073bd226ea2 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -76,7 +76,7 @@ return update_icon() -/obj/machinery/computer/station_alert/update_icon() +/obj/machinery/computer/station_alert/update_icon_state() var/active_alarms = FALSE var/list/list/temp_alarm_list = SSalarm.alarms.Copy() for(var/cat in temp_alarm_list) diff --git a/code/game/machinery/computer/syndie_cargo.dm b/code/game/machinery/computer/syndie_cargo.dm index 68a3dcc753d..99b8a1e3fe0 100644 --- a/code/game/machinery/computer/syndie_cargo.dm +++ b/code/game/machinery/computer/syndie_cargo.dm @@ -109,11 +109,11 @@ GLOBAL_LIST_INIT(data_storages, list()) //list of all cargo console data storage if(istype(crate, /obj/structure/closet/crate)) var/obj/structure/closet/crate/CR = crate CR.manifest = slip - CR.update_icon() + CR.update_icon(UPDATE_OVERLAYS) if(istype(crate, /obj/structure/largecrate)) var/obj/structure/largecrate/LC = crate LC.manifest = slip - LC.update_icon() + LC.update_icon(UPDATE_OVERLAYS) /*************************** diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 4583134eab8..c0d9b637c5d 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -1,20 +1,23 @@ +// Construction | Deconstruction +#define STATE_EMPTY 1 // Add wires | Wrench to destroy +#define STATE_WIRED 2 // Add cicuit / Wrench to unchor/unanchor | Remove wires with wirecutters +#define STATE_COMPONENTS 3 // Add components / Wrench to unchor/unanchor | Remove circuit/components with crowbar + /obj/machinery/constructable_frame //Made into a seperate type to make future revisions easier. name = "machine frame" icon = 'icons/obj/stock_parts.dmi' icon_state = "box_0" - density = 1 + density = TRUE anchored = TRUE use_power = NO_POWER_USE max_integrity = 250 - var/obj/item/circuitboard/circuit = null - var/list/components = null - var/list/req_components = null - var/list/req_component_names = null // user-friendly names of components - var/state = 1 + var/obj/item/circuitboard/circuit + var/list/components + var/list/req_components + /// User-friendly names of components + var/list/req_component_names + var/state = STATE_EMPTY - // For pods - var/list/connected_parts = list() - var/pattern_idx=0 /obj/machinery/constructable_frame/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT)) @@ -26,21 +29,18 @@ circuit = null return ..() + /obj/machinery/constructable_frame/obj_break(damage_flag) deconstruct() -// unfortunately, we have to instance the objects really quickly to get the names -// fortunately, this is only called once when the board is added and the items are immediately GC'd -// and none of the parts do much in their constructors -/obj/machinery/constructable_frame/proc/update_namelist() - if(!req_components) - return - req_component_names = new() - for(var/tname in req_components) - var/path = tname - var/obj/O = new path() - req_component_names[tname] = O.name +/obj/machinery/constructable_frame/proc/update_lists(list/circuit_components) + req_components = circuit_components.Copy() + components = list() + req_component_names = list() + for(var/atom/path as anything in req_components) + req_component_names[path] = initial(path.name) + /obj/machinery/constructable_frame/proc/get_req_components_amt() var/amt = 0 @@ -48,145 +48,212 @@ amt += req_components[path] return amt -// update description of required components remaining -/obj/machinery/constructable_frame/proc/update_req_desc() + +/obj/machinery/constructable_frame/proc/get_req_desc() + . = "" + if(!req_components || !req_component_names) return - var/hasContent = 0 - desc = "Requires" - for(var/i = 1 to req_components.len) + var/hasContent = FALSE + var/components_len = length(req_components) + . = "Required components:" + for(var/i = 1 to components_len) var/tname = req_components[i] var/amt = req_components[tname] - if(amt == 0) + if(!amt) continue - var/use_and = i == req_components.len - desc += "[(hasContent ? (use_and ? ", and" : ",") : "")] [amt] [amt == 1 ? req_component_names[tname] : "[req_component_names[tname]]\s"]" - hasContent = 1 + var/use_and = (i == components_len) + . += "[(hasContent ? (use_and ? ", and" : ",") : "")] [amt] [amt == 1 ? req_component_names[tname] : "[req_component_names[tname]]\s"]" + hasContent = TRUE - if(!hasContent) - desc = "Does not require any more components." + if(hasContent) + . += "." else - desc += "." + . = span_notice("Does not require any more components.") -/obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P, mob/user, params) + +/obj/machinery/constructable_frame/machine_frame/examine(mob/user) + . = ..() + . += span_notice("It is [anchored ? "bolted to the floor" : "unbolted"].") switch(state) - if(1) - if(istype(P, /obj/item/stack/cable_coil)) - var/obj/item/stack/cable_coil/C = P - if(C.get_amount() >= 5) - playsound(src.loc, C.usesound, 50, 1) - to_chat(user, span_notice("You start to add cables to the frame.")) - if(do_after(user, 20 * C.toolspeed * gettoolspeedmod(user), target = src)) - if(state == 1 && C.use(5)) - add_fingerprint(user) - to_chat(user, span_notice("You add cables to the frame.")) - state = 2 - icon_state = "box_1" - else - to_chat(user, span_warning("At some point during construction you lost some cable. Make sure you have five lengths before trying again.")) - return - else - to_chat(user, span_warning("You need five lengths of cable to wire the frame.")) - return + if(STATE_EMPTY) + . += span_notice("The frame is constructed, but it is missing a wiring.") + if(STATE_WIRED) + . += span_notice("The frame is wired, but it is missing a circuit board") + if(STATE_COMPONENTS) + var/required = get_req_desc() + if(required) + . += required - if(istype(P, /obj/item/wrench)) - playsound(src.loc, P.usesound, 75, 1) - to_chat(user, span_notice("You dismantle the frame.")) - deconstruct(TRUE) - return - if(2) - if(istype(P, /obj/item/circuitboard)) - var/obj/item/circuitboard/B = P - if(B.board_type == "machine") - add_fingerprint(user) - playsound(src.loc, B.usesound, 50, 1) - to_chat(user, span_notice("You add the circuit board to the frame.")) - circuit = P - user.drop_transfer_item_to_loc(P, src) - name += " ([B.board_name])" - icon_state = "box_2" - state = 3 - components = list() - req_components = circuit.req_components.Copy() - update_namelist() - update_req_desc() - else - to_chat(user, span_danger("This frame does not accept circuit boards of this type!")) - return - if(istype(P, /obj/item/wirecutters)) - add_fingerprint(user) - playsound(src.loc, P.usesound, 50, 1) - to_chat(user, span_notice("You remove the cables.")) - state = 1 - icon_state = "box_0" - new /obj/item/stack/cable_coil(src.loc, 5) + +/obj/machinery/constructable_frame/machine_frame/update_icon_state() + switch(state) + if(STATE_EMPTY) + icon_state = "box_0" + if(STATE_WIRED) + icon_state = "box_1" + if(STATE_COMPONENTS) + icon_state = "box_2" + + +/obj/machinery/constructable_frame/machine_frame/wrench_act(mob/living/user, obj/item/I) + . = TRUE + add_fingerprint(user) + if(!I.use_tool(src, user, 3 SECONDS, volume = I.tool_volume)) + return . + + if(state == STATE_EMPTY) + deconstruct(TRUE) + to_chat(user, span_notice("You dismantle the frame.")) + return . + + if(anchored) + anchored = FALSE + WRENCH_UNANCHOR_MESSAGE + return . + + if(isinspace()) + to_chat(user, span_warning("You cannot tightens the bolts in space!")) + return . + + anchored = TRUE + WRENCH_ANCHOR_MESSAGE + + +/obj/machinery/constructable_frame/machine_frame/wirecutter_act(mob/living/user, obj/item/I) + . = TRUE + add_fingerprint(user) + if(state != STATE_WIRED) + return . + + if(!I.use_tool(src, user, 3 SECONDS, volume = I.tool_volume)) + return . + + state = STATE_EMPTY + WIRECUTTER_SNIP_MESSAGE + update_icon(UPDATE_ICON_STATE) + new /obj/item/stack/cable_coil(loc, 5) + + +/obj/machinery/constructable_frame/machine_frame/crowbar_act(mob/living/user, obj/item/I) + . = TRUE + add_fingerprint(user) + if(state != STATE_COMPONENTS) + return . + + if(!I.use_tool(src, user, 3 SECONDS, volume = I.tool_volume)) + return . + + state = STATE_WIRED + circuit.forceMove(loc) + circuit = null + + if(length(components)) + to_chat(user, span_notice("You remove the circuit board and other components.")) + for(var/obj/item/component in components) + component.forceMove(loc) + else + to_chat(user, span_notice("You remove the circuit board.")) + + name = initial(name) + desc = initial(desc) + req_components = null + components = null + update_icon(UPDATE_ICON_STATE) + + +/obj/machinery/constructable_frame/machine_frame/screwdriver_act(mob/living/user, obj/item/I) + . = TRUE + add_fingerprint(user) + if(state != STATE_COMPONENTS) + return . + + var/component_check = TRUE + for(var/component in req_components) + if(req_components[component] > 0) + component_check = FALSE + break + + if(!component_check) + to_chat(user, span_warning("Machine frame requires more components!")) + return . + + if(!I.use_tool(src, user, 5 SECONDS, volume = I.tool_volume)) + return . + + to_chat(user, span_notice("You finish the construction.")) + var/obj/machinery/new_machine = new circuit.build_path(loc) + new_machine.on_construction() + for(var/obj/component in new_machine.component_parts) + qdel(component) + new_machine.component_parts = list() + for(var/obj/component in src) + component.loc = null + new_machine.component_parts += component + circuit.loc = null + new_machine.RefreshParts() + transfer_fingerprints_to(new_machine) + qdel(src) + + +/obj/machinery/constructable_frame/machine_frame/attackby(obj/item/I, mob/user, params) + if(user.a_intent == INTENT_HARM) + return ..() + + add_fingerprint(user) + + switch(state) + if(STATE_EMPTY) + if(!iscoil(I)) + return ..() + + var/obj/item/stack/cable_coil/coil = I + if(coil.get_amount() < 5) + to_chat(user, span_warning("You need five lengths of cable to wire the frame.")) return - if(istype(P, /obj/item/wrench)) - add_fingerprint(user) - playsound(src.loc, P.usesound, 75, 1) - if(!anchored && !isinspace()) - anchored = TRUE - WRENCH_ANCHOR_MESSAGE - else if(anchored) - anchored = FALSE - WRENCH_UNANCHOR_MESSAGE + + playsound(loc, coil.usesound, 50, TRUE) + to_chat(user, span_notice("You start to add cables to the frame.")) + if(!do_after(user, 2 SECONDS * coil.toolspeed * gettoolspeedmod(user), target = src) || state != STATE_EMPTY) return - if(3) - if(istype(P, /obj/item/crowbar)) - add_fingerprint(user) - playsound(src.loc, P.usesound, 50, 1) - state = 2 - circuit.loc = src.loc - circuit = null - if(components.len == 0) - to_chat(user, span_notice("You remove the circuit board.")) - else - to_chat(user, span_notice("You remove the circuit board and other components.")) - for(var/obj/item/I in components) - I.loc = src.loc - name = initial(name) - desc = initial(desc) - req_components = null - components = null - icon_state = "box_1" + + if(!coil.use(5)) + to_chat(user, span_warning("At some point during construction you lost some cable. Make sure you have five lengths before trying again.")) return - if(istype(P, /obj/item/wrench)) - add_fingerprint(user) - playsound(src.loc, P.usesound, 75, 1) - if(!anchored && !isinspace()) - anchored = TRUE - WRENCH_ANCHOR_MESSAGE - else if(anchored) - anchored = FALSE - WRENCH_UNANCHOR_MESSAGE + state = STATE_WIRED + update_icon(UPDATE_ICON_STATE) + to_chat(user, span_notice("You add cables to the frame.")) + + if(STATE_WIRED) + if(!istype(I, /obj/item/circuitboard)) + return ..() + + var/obj/item/circuitboard/new_circuit = I + if(new_circuit.board_type != "machine") + to_chat(user, span_warning("This frame does not accept circuit boards of this type!")) return - if(istype(P, /obj/item/screwdriver)) - var/component_check = 1 - for(var/R in req_components) - if(req_components[R] > 0) - component_check = 0 - break - if(component_check) - playsound(src.loc, P.usesound, 50, 1) - var/obj/machinery/new_machine = new src.circuit.build_path(src.loc) - new_machine.on_construction() - for(var/obj/O in new_machine.component_parts) - qdel(O) - new_machine.component_parts = list() - for(var/obj/O in src) - O.loc = null - new_machine.component_parts += O - circuit.loc = null - new_machine.RefreshParts() - transfer_fingerprints_to(new_machine) - qdel(src) + if(!user.drop_transfer_item_to_loc(new_circuit, src)) + to_chat(user, span_warning("[new_circuit] is stuck to you and cannot be placed into [src]!")) return - if(istype(P, /obj/item/storage/part_replacer) && P.contents.len && get_req_components_amt()) - var/obj/item/storage/part_replacer/replacer = P + state = STATE_COMPONENTS + circuit = new_circuit + name += " ([new_circuit.board_name])" + if(length(circuit.req_components)) + update_lists(circuit.req_components) + else + stack_trace("Circuit without req_components list, placed in [src].") + playsound(loc, new_circuit.usesound, 50, TRUE) + to_chat(user, span_notice("You add the circuit board to the frame.")) + update_icon(UPDATE_ICON_STATE) + + if(STATE_COMPONENTS) + + if(istype(I, /obj/item/storage/part_replacer) && length(I.contents) && get_req_components_amt()) + var/obj/item/storage/part_replacer/replacer = I var/list/added_components = list() var/list/part_list = list() @@ -206,42 +273,40 @@ components += part to_chat(user, span_notice("[part.name] applied.")) replacer.play_rped_sound() - - update_req_desc() return - if(istype(P, /obj/item)) - var/success - for(var/I in req_components) - if(istype(P, I) && (req_components[I] > 0) && (!(P.flags & NODROP) || istype(P, /obj/item/stack))) - add_fingerprint(user) - success=1 - playsound(src.loc, P.usesound, 50, 1) - if(istype(P, /obj/item/stack)) - var/obj/item/stack/S = P - var/camt = min(S.get_amount(), req_components[I]) - var/obj/item/stack/NS - if (S.is_cyborg && S.cyborg_construction_stack) - NS = new S.cyborg_construction_stack(src, camt) + if(isitem(I)) + var/success = FALSE + for(var/path in req_components) + var/is_stack = isstack(I) + if(istype(I, path) && (req_components[path] > 0) && (!(I.flags & NODROP) || is_stack)) + success = TRUE + playsound(loc, I.usesound, 50, TRUE) + if(is_stack) + var/obj/item/stack/stack = I + var/camt = min(stack.get_amount(), req_components[path]) + var/obj/item/stack/new_stack + if(stack.is_cyborg && stack.cyborg_construction_stack) + new_stack = new stack.cyborg_construction_stack(src, camt) else - NS = new P.type(src, camt) - NS.update_icon() - S.use(camt) - components += NS - req_components[I] -= camt - update_req_desc() + new_stack = new stack.type(src, camt) + new_stack.update_icon() + stack.use(camt) + components += new_stack + req_components[path] -= camt break - user.drop_transfer_item_to_loc(P, src) - components += P - req_components[I]-- - update_req_desc() - return 1 + user.drop_transfer_item_to_loc(I, src) + components += I + req_components[path]-- + break + if(!success) - to_chat(user, span_danger("You cannot add that to the machine!")) - return 0 - return - if(user.a_intent == INTENT_HARM) - return ..() + to_chat(user, span_warning("You cannot add that to the machine!")) + + +#undef STATE_EMPTY +#undef STATE_WIRED +#undef STATE_COMPONENTS //Machine Frame Circuit Boards @@ -376,7 +441,7 @@ to destroy them and players will be able to make replacements. /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/thermomachine/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/screwdriver)) + if(I.tool_behaviour == TOOL_SCREWDRIVER) if(build_path == /obj/machinery/atmospherics/unary/cold_sink/freezer) build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater board_name = "Heater" diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index f5c148e8dc0..e351c09ee86 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -1,5 +1,7 @@ #define AUTO_EJECT_DEAD (1<<0) #define AUTO_EJECT_HEALTHY (1<<1) +#define OCCUPANT_PIXEL_BOUNCE_HIGH 28 +#define OCCUPANT_PIXEL_BOUNCE_LOW 22 /obj/machinery/atmospherics/unary/cryo_cell name = "криокапсула" @@ -7,19 +9,21 @@ icon = 'icons/obj/machines/cryogenics.dmi' icon_state = "pod0" density = 1 - anchored = 1.0 + anchored = TRUE layer = ABOVE_WINDOW_LAYER plane = GAME_PLANE resistance_flags = null interact_offline = 1 max_integrity = 350 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 30, "acid" = 30) - var/on = FALSE + on = FALSE var/temperature_archived - var/mob/living/carbon/occupant = null - var/obj/item/reagent_containers/glass/beaker = null + var/mob/living/carbon/occupant + /// A separate effect for the occupant, as you can't animate overlays reliably and constantly removing and adding overlays is spamming the subsystem. + var/obj/effect/occupant_overlay + var/obj/item/reagent_containers/glass/beaker //if you don't want to dupe reagents - var/list/reagents_blacklist = list( + var/static/list/reagents_blacklist = list( "stimulants" ) /// Holds two bitflags, AUTO_EJECT_DEAD and AUTO_EJECT_HEALTHY. Used to determine if the cryo cell will auto-eject dead and/or completely health patients. @@ -34,12 +38,26 @@ light_color = LIGHT_COLOR_WHITE -/obj/machinery/atmospherics/unary/cryo_cell/power_change() + +/obj/machinery/atmospherics/unary/cryo_cell/power_change(forced = FALSE) ..() - if(!(stat & (BROKEN|NOPOWER))) - set_light(2) - else + if(stat & (BROKEN|NOPOWER)) set_light(0) + else + set_light(2) + + +/obj/machinery/atmospherics/unary/cryo_cell/examine(mob/user) + . = ..() + if(occupant) + if(occupant.is_dead()) + . += span_warning("You see [occupant.name] inside. [occupant.p_they(TRUE)] [occupant.p_are()] dead!") + else + . += span_notice("You see [occupant.name] inside.") + . += span_notice("The Cryogenic cell chamber is effective at treating those with genetic damage, but all other damage types at a moderate rate.") + . += span_notice("Mostly using cryogenic chemicals, such as cryoxadone for it's medical purposes, requires that the inside of the cell be kept cool at all times. Hooking up a freezer and cooling the pipeline will do this nicely.") + . += span_info("Click-drag someone to a cell to place them in it, Alt-Click it to remove it.") + /obj/machinery/atmospherics/unary/cryo_cell/New() ..() @@ -110,7 +128,7 @@ beaker.forceMove(drop_location()) beaker = null -/obj/machinery/atmospherics/unary/cryo_cell/MouseDrop_T(atom/movable/O, mob/living/user) +/obj/machinery/atmospherics/unary/cryo_cell/MouseDrop_T(atom/movable/O, mob/living/user, params) if(O.loc == user) //no you can't pull things out of your ass return if(user.incapacitated()) //are you cuffed, dying, lying, stunned or other @@ -129,16 +147,17 @@ return if(occupant) to_chat(user, span_boldnotice("Криокапсула уже занята!")) - return + return TRUE var/mob/living/L = O if(!istype(L) || L.buckled) return if(L.abiotic()) to_chat(user, span_danger("Субъект не должен держать в руках абиотические предметы.")) - return + return TRUE if(L.has_buckled_mobs()) //mob attached to us to_chat(user, span_warning("[L] нельзя поместить в [src], поскольку к [genderize_ru(L.gender,"его","её","его","их")] голове прилеплен слайм.")) - return + return TRUE + . = TRUE if(put_mob(L)) add_fingerprint(user) if(L == user) @@ -338,59 +357,40 @@ if(default_deconstruction_screwdriver(user, "pod0-o", "pod0", I)) return TRUE -/obj/machinery/atmospherics/unary/cryo_cell/update_icon() - handle_update_icon() -/obj/machinery/atmospherics/unary/cryo_cell/proc/handle_update_icon() //making another proc to avoid spam in update_icon - overlays.Cut() //empty the overlay proc, just in case +/obj/machinery/atmospherics/unary/cryo_cell/update_icon_state() icon_state = "pod[on]" //set the icon properly every time - if(!src.occupant) - overlays += "lid[on]" //if no occupant, just put the lid overlay on, and ignore the rest - return - - if(occupant) - var/mutable_appearance/pickle = mutable_appearance(occupant.icon, occupant.icon_state) - pickle.overlays = occupant.overlays - pickle.pixel_y = 22 - overlays += pickle - overlays += "lid[on]" - if(src.on && !running_bob_animation) //no bobbing if off - var/up = 0 //used to see if we are going up or down, 1 is down, 2 is up - spawn(0) // Without this, the icon update will block. The new thread will die once the occupant leaves. - running_bob_animation = 1 - while(occupant) - overlays -= "lid[on]" //have to remove the overlays first, to force an update- remove cloning pod overlay - overlays -= pickle //remove mob overlay +/obj/machinery/atmospherics/unary/cryo_cell/update_overlays() + . = ..() - switch(pickle.pixel_y) //this looks messy as fuck but it works, switch won't call itself twice + if(occupant_overlay) + QDEL_NULL(occupant_overlay) - if(23) //inbetween state, for smoothness - switch(up) //this is set later in the switch, to keep track of where the mob is supposed to go - if(2) //2 is up - pickle.pixel_y = 24 //set to highest - - if(1) //1 is down - pickle.pixel_y = 22 //set to lowest + if(!occupant) + . += "lid[on]" //if no occupant, just put the lid overlay on, and ignore the rest + return - if(22) //mob is at it's lowest - pickle.pixel_y = 23 //set to inbetween - up = 2 //have to go up + if(occupant) + occupant_overlay = new(get_turf(src)) + occupant_overlay.icon = occupant.icon + occupant_overlay.icon_state = occupant.icon_state + occupant_overlay.overlays = occupant.overlays + occupant_overlay.pixel_y = OCCUPANT_PIXEL_BOUNCE_LOW + occupant_overlay.layer = layer + 0.01 - if(24) //mob is at it's highest - pickle.pixel_y = 23 //set to inbetween - up = 1 //have to go down + if(on) + animate(occupant_overlay, time = 3 SECONDS, loop = -1, easing = QUAD_EASING, pixel_y = OCCUPANT_PIXEL_BOUNCE_HIGH) + animate(time = 3 SECONDS, loop = -1, easing = QUAD_EASING, pixel_y = OCCUPANT_PIXEL_BOUNCE_LOW) - overlays += pickle //re-add the mob to the icon - overlays += "lid[on]" //re-add the overlay of the pod, they are inside it, not floating + . += mutable_appearance(icon = icon, icon_state = "lid[on]", layer = occupant_overlay.layer + 0.01) - sleep(7) //don't want to jiggle violently, just slowly bob - running_bob_animation = 0 /obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant() if(air_contents.total_moles() < 10) return + if(occupant) if(occupant.bodytemperature < T0C) var/stun_time = (max(5 / efficiency, (1 / occupant.bodytemperature) * 2000/efficiency)) STATUS_EFFECT_CONSTANT @@ -416,6 +416,7 @@ if(next_trans == 17) next_trans = 0 + /obj/machinery/atmospherics/unary/cryo_cell/proc/heat_gas_contents() if(!occupant) return @@ -442,7 +443,7 @@ if(occupant.bodytemperature < 261 && occupant.bodytemperature >= 70) //Patch by Aranclanos to stop people from taking burn damage after being ejected occupant.bodytemperature = 261 occupant = null - update_icon() + update_icon(UPDATE_OVERLAYS) // eject trash the occupant dropped for(var/atom/movable/A in contents - component_parts - list(beaker)) A.forceMove(get_step(loc, SOUTH)) @@ -479,11 +480,18 @@ if(M.health > -100 && (M.health < 0 || M.IsSleeping())) to_chat(M, span_boldnotice("Вас окружает холодная жидкость. Кожа начинает замерзать.")) occupant = M -// M.metabslow = 1 add_fingerprint(usr) - update_icon() + update_icon(UPDATE_OVERLAYS) M.ExtinguishMob() - return 1 + return TRUE + + +/obj/machinery/atmospherics/unary/cryo_cell/AltClick(mob/living/carbon/user) + if(user && (!iscarbon(user) || user.incapacitated() || user.restrained() || !Adjacent(user))) + return + go_out() + add_fingerprint(user) + /obj/machinery/atmospherics/unary/cryo_cell/verb/move_eject() set name = "Извлечь пациента" @@ -562,3 +570,6 @@ #undef AUTO_EJECT_HEALTHY #undef AUTO_EJECT_DEAD +#undef OCCUPANT_PIXEL_BOUNCE_HIGH +#undef OCCUPANT_PIXEL_BOUNCE_LOW + diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 348dbf2a6b2..87ed2ff2b0f 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -177,20 +177,23 @@ desc = "A bewildering tangle of machinery and pipes." icon = 'icons/obj/machines/cryogenic2.dmi' icon_state = "cryo_rear" - anchored = 1 + anchored = TRUE + var/orient_right = FALSE //Flips the sprite. - var/orient_right = null //Flips the sprite. /obj/structure/cryofeed/right - orient_right = 1 + orient_right = TRUE icon_state = "cryo_rear-r" + /obj/structure/cryofeed/Initialize(mapload) . = ..() - if(orient_right) - icon_state = "cryo_rear-r" - else - icon_state = "cryo_rear" + update_icon(UPDATE_ICON_STATE) + + +/obj/structure/cryofeed/update_icon_state() + icon_state = "cryo_rear[orient_right ? "-r" : ""]" + //Cryopods themselves. /obj/machinery/cryopod @@ -210,9 +213,7 @@ var/allow_occupant_types = list(/mob/living/carbon/human) var/disallow_occupant_types = list() var/syndicate = FALSE - var/mob/living/occupant = null // Person waiting to be despawned. - var/orient_right = null // Flips the sprite. // 15 minutes-ish safe period before being despawned. var/time_till_despawn = 9000 // This is reduced by 90% if a player manually enters cryo var/willing_time_divisor = 10 @@ -262,23 +263,22 @@ icon_state = "cryo_s" base_icon_state = "cryo_s-open" occupied_icon_state = "cryo_s" - dir = 8 + dir = WEST syndicate = TRUE -/obj/machinery/cryopod/New() + +/obj/machinery/cryopod/Initialize(mapload) + . = ..() announce = new /obj/item/radio/intercom(src) + announce.follow_target = src + icon_state = base_icon_state + set_light(1, 1, COLOR_LIGHT_GREEN) + find_control_computer() - if(orient_right) - icon_state = "[base_icon_state]-r" - else - icon_state = base_icon_state - ..() +/obj/machinery/cryopod/update_icon_state() + icon_state = occupant ? occupied_icon_state : base_icon_state -/obj/machinery/cryopod/Initialize() - ..() - set_light(1, 1, COLOR_LIGHT_GREEN) - find_control_computer() /obj/machinery/cryopod/proc/find_control_computer(urgent=0) var/area/A = get_area(src) @@ -434,10 +434,6 @@ announce_rank = G.fields["rank"] qdel(G) - if(orient_right) - icon_state = "[base_icon_state]-r" - else - icon_state = base_icon_state //Make an announcement and log the person entering storage + their rank var/list/crew_member = list() @@ -476,6 +472,7 @@ else occupant.ghostize(1) QDEL_NULL(occupant) + update_icon(UPDATE_ICON_STATE) name = initial(name) @@ -528,10 +525,6 @@ to_chat(user, span_notice("You stop putting [M] into the cryopod.")) return - if(orient_right) - icon_state = "[occupied_icon_state]-r" - else - icon_state = occupied_icon_state to_chat(M, span_notice("[on_enter_occupant_message]")) to_chat(M, span_boldnotice("If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.")) @@ -541,7 +534,7 @@ return ..() -/obj/machinery/cryopod/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) +/obj/machinery/cryopod/MouseDrop_T(atom/movable/O, mob/user, params) if(O.loc == user) //no you can't pull things out of your ass return @@ -561,8 +554,7 @@ return if(occupant) to_chat(user, span_boldnotice("The cryo pod is already occupied!")) - return - + return TRUE var/mob/living/L = O if(!istype(L) || L.buckled) @@ -570,30 +562,32 @@ if(L.stat == DEAD) to_chat(user, span_notice("Dead people can not be put into cryo.")) - return + return TRUE if(!L.mind) to_chat(user, span_notice("Catatonic people are not allowed into cryo.")) - return + return TRUE if(L.has_buckled_mobs()) //mob attached to us to_chat(user, span_warning("[L] will not fit into [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.")) - return + return TRUE + + INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/machinery/cryopod, put_in), user, L) + return TRUE +/obj/machinery/cryopod/proc/put_in(mob/user, mob/living/L) // need this proc to use INVOKE_ASYNC in other proc. You're not recommended to use that one var/willing = null //We don't want to allow people to be forced into despawning. time_till_despawn = initial(time_till_despawn) if(L.client) if(alert(L,"Would you like to enter cryosleep?",,"Yes","No") == "Yes") - if(!L) return + if(!L) + return willing = willing_time_divisor else willing = 1 - if(istype(L.loc, /obj/machinery/cryopod)) - return - if(willing) if(!Adjacent(L) && !Adjacent(user)) to_chat(user, span_boldnotice("You're not close enough to [src].")) @@ -602,18 +596,17 @@ visible_message("[user] starts climbing into the cryo pod.") else visible_message("[user] starts putting [L] into the cryo pod.") - - if(do_after(user, 20, target = L)) - if(!L) return - + if(do_after(user, 2 SECONDS, target = L)) + if(!L) + return if(occupant) - to_chat(user, span_boldnotice("\The [src] is in use.")) + to_chat(user, span_boldnotice("[src] is in use.")) return - add_fingerprint(user) take_occupant(L, willing) else to_chat(user, span_notice("You stop [L == user ? "climbing into the cryo pod." : "putting [L] into the cryo pod."]")) + /obj/machinery/cryopod/proc/take_occupant(var/mob/living/carbon/E, var/willing_factor = 1) if(occupant) return @@ -621,13 +614,10 @@ return E.forceMove(src) time_till_despawn = initial(time_till_despawn) / willing_factor - if(orient_right) - icon_state = "[occupied_icon_state]-r" - else - icon_state = occupied_icon_state to_chat(E, span_notice("[on_enter_occupant_message]")) to_chat(E, span_boldnotice("If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.")) occupant = E + update_icon(UPDATE_ICON_STATE) name = "[name] ([occupant.name])" time_entered = world.time if(findtext("[E.key]","@",1,2)) @@ -653,15 +643,12 @@ to_chat(usr, "The cryopod is in use and locked!") return - if(orient_right) - icon_state = "[base_icon_state]-r" - else - icon_state = base_icon_state - //Eject any items that aren't meant to be in the pod. var/list/items = contents - if(occupant) items -= occupant - if(announce) items -= announce + if(occupant) + items -= occupant + if(announce) + items -= announce for(var/obj/item/I in items) I.forceMove(get_turf(src)) @@ -704,11 +691,6 @@ occupant = usr time_till_despawn = initial(time_till_despawn) / willing_time_divisor - if(orient_right) - icon_state = "[occupied_icon_state]-r" - else - icon_state = occupied_icon_state - to_chat(usr, span_notice("[on_enter_occupant_message]")) to_chat(usr, span_boldnotice("If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.")) occupant = usr @@ -717,7 +699,6 @@ add_fingerprint(usr) name = "[name] ([usr.name])" - return /obj/machinery/cryopod/proc/go_out() if(!occupant) @@ -725,15 +706,9 @@ occupant.forceMove(get_turf(src)) occupant = null - - if(orient_right) - icon_state = "[base_icon_state]-r" - else - icon_state = base_icon_state - + update_icon(UPDATE_ICON_STATE) name = initial(name) - return //Attacks/effects. @@ -764,13 +739,11 @@ allow_occupant_types = list(/mob/living/silicon/robot) disallow_occupant_types = list() -/obj/machinery/cryopod/robot/right - orient_right = 1 - icon_state = "pod_0-r" /obj/machinery/cryopod/robot/despawn_occupant() var/mob/living/silicon/robot/R = occupant - if(!istype(R)) return ..() + if(!istype(R)) + return ..() R.contents -= R.mmi qdel(R.mmi) @@ -806,7 +779,7 @@ target_cryopod = safepick(free_cryopods) if(target_cryopod.check_occupant_allowed(person_to_cryo)) var/turf/T = get_turf(person_to_cryo) - var/obj/effect/portal/SP = new /obj/effect/portal(T, null, null, 40) + var/obj/effect/portal/SP = new /obj/effect/portal(T, null, null, 4 SECONDS, create_sparks = FALSE) SP.name = "NT SSD Teleportation Portal" target_cryopod.take_occupant(person_to_cryo, 1) return 1 diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index c8917f01419..ead58469c2c 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -71,12 +71,20 @@ WRENCH_UNANCHOR_MESSAGE playsound(src, 'sound/items/deconstruct.ogg', 50, 1) -/obj/machinery/disco/update_icon() + +/obj/machinery/disco/update_icon_state() if(active) icon_state = "disco1" else icon_state = "disco0" - ..() + + +/obj/machinery/disco/update_overlays() + . = ..() + underlays.Cut() + + if(active) + underlays += emissive_appearance(icon, "disco_lightmask") /obj/machinery/disco/attack_hand(mob/user) @@ -129,6 +137,7 @@ return active = TRUE update_icon() + set_light(1, LIGHTING_MINIMUM_POWER) //for emmisive appearance dance_setup() START_PROCESSING(SSobj, src) lights_spin() @@ -481,7 +490,8 @@ STOP_PROCESSING(SSobj, src) dance_over() playsound(src,'sound/machines/terminal_off.ogg',50,1) - icon_state = "disco0" + update_icon() + set_light(0) stop = world.time + 100 diff --git a/code/game/machinery/defib_mount.dm b/code/game/machinery/defib_mount.dm index 07c3b8fdb97..f2f56ef4cac 100644 --- a/code/game/machinery/defib_mount.dm +++ b/code/game/machinery/defib_mount.dm @@ -34,10 +34,10 @@ if(building) set_pixel_offsets_from_dir(30, -30, 30, -30) -/obj/machinery/defibrillator_mount/loaded/New() //loaded subtype for mapping use - ..() +/obj/machinery/defibrillator_mount/loaded/Initialize(mapload) //loaded subtype for mapping use + . = ..() defib = new/obj/item/defibrillator/loaded(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/machinery/defibrillator_mount/Destroy() QDEL_NULL(defib) @@ -46,7 +46,7 @@ /obj/machinery/defibrillator_mount/examine(mob/user) . = ..() if(defib) - . += span_notice("There is a defib unit hooked up. Alt-click to remove it.") + . += span_info("There is a defib unit hooked up. Alt-Click to remove it.") if(GLOB.security_level >= SEC_LEVEL_RED) . += span_notice("Due to a security situation, its locking clamps can be toggled by swiping any ID.") else @@ -58,47 +58,36 @@ if(defib && defib.cell && defib.cell.charge < defib.cell.maxcharge && is_operational()) use_power(200) defib.cell.give(180) //90% efficiency, slightly better than the cell charger's 87.5% - update_icon() + update_icon(UPDATE_OVERLAYS) + -/obj/machinery/defibrillator_mount/update_icon() - cut_overlays() +/obj/machinery/defibrillator_mount/update_overlays() + . = ..() if(defib) - add_overlay("defib") + . += "defib" if(defib.powered) - add_overlay(defib.safety ? "online" : "emagged") + . += "[defib.safety ? "online" : "emagged"]" var/ratio = defib.cell.charge / defib.cell.maxcharge ratio = CEILING(ratio * 4, 1) * 25 - add_overlay("charge[ratio]") + . += "charge[ratio]" if(clamps_locked) - add_overlay("clamps") + . += "clamps" + //defib interaction -/obj/machinery/defibrillator_mount/attack_hand(mob/living/carbon/) - var/mob/living/carbon/human/user = usr +/obj/machinery/defibrillator_mount/attack_hand(mob/living/carbon/human/user = usr) if(!defib) to_chat(user, span_warning("There's no defibrillator unit loaded!")) return - var/obj/item/organ/external/temp2 = user.bodyparts_by_name[BODY_ZONE_PRECISE_R_HAND] - var/obj/item/organ/external/temp = user.bodyparts_by_name[BODY_ZONE_PRECISE_L_HAND] - - if(!temp || !temp.is_usable() && !temp2 || !temp2.is_usable()) - to_chat(user, span_warning("You can't use your hand to take out the paddles!")) - return - - if(defib.paddles.loc != defib) - to_chat(user, span_warning("[defib.paddles.loc == user ? "You are already" : "Someone else is"] holding [defib]'s paddles!")) - return - - defib.paddles.forceMove_turf() - if(!user.put_in_hands(defib.paddles, ignore_anim = FALSE)) - defib.paddles.forceMove(defib) - to_chat(user, span_warning("You need a free hand to hold the paddles!")) + if(!defib.paddles_on_defib) + to_chat(user, span_warning("[user.is_in_hands(defib.paddles) ? "You are already" : "Someone else is"] holding [defib]'s paddles!")) return + defib.dispence_paddles(user) add_fingerprint(user) - defib.paddles_on_defib = FALSE + /obj/machinery/defibrillator_mount/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/defibrillator)) @@ -109,16 +98,20 @@ to_chat(user, span_warning("[I] is stuck to your hand!")) return add_fingerprint(user) - user.visible_message(span_notice("[user] hooks up [I] to [src]!"), \ - span_notice("You press [I] into the mount, and it clicks into place.")) + user.visible_message( + span_notice("[user] hooks up [I] to [src]!"), + span_notice("You press [I] into the mount, and it clicks into place."), + ) playsound(src, 'sound/machines/click.ogg', 50, TRUE) defib = I - update_icon() + update_icon(UPDATE_OVERLAYS) return - else if(defib && I == defib.paddles) + + if(defib && I == defib.paddles) add_fingerprint(user) - user.drop_from_active_hand() + user.drop_item_ground(I) return + var/obj/item/card/id = I.GetID() if(id) if(check_access(id) || GLOB.security_level >= SEC_LEVEL_RED) //anyone can toggle the clamps in red alert! @@ -128,12 +121,14 @@ add_fingerprint(user) clamps_locked = !clamps_locked to_chat(user, span_notice("Clamps [clamps_locked ? "" : "dis"]engaged.")) - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, span_warning("Insufficient access.")) return + return ..() + /obj/machinery/defibrillator_mount/wrench_act(mob/user, obj/item/I) . = TRUE if(defib) @@ -145,18 +140,19 @@ new /obj/item/mounted/frame/defib_mount(get_turf(user)) qdel(src) + /obj/machinery/defibrillator_mount/AltClick(mob/living/carbon/human/user) + if(!Adjacent(user)) + return if(!istype(user) || user.incapacitated()) to_chat(user, span_warning("You can't do that right now!")) return - var/obj/item/organ/external/temp2 = user.bodyparts_by_name[BODY_ZONE_PRECISE_R_HAND] - var/obj/item/organ/external/temp = user.bodyparts_by_name[BODY_ZONE_PRECISE_L_HAND] - if(!Adjacent(user)) - return if(!defib) to_chat(user, span_warning("It'd be hard to remove a defib unit from a mount that has none.")) return - if(!temp || !temp.is_usable() && !temp2 || !temp2.is_usable()) + var/obj/item/organ/external/hand_right = user.get_organ(BODY_ZONE_PRECISE_R_HAND) + var/obj/item/organ/external/hand_left = user.get_organ(BODY_ZONE_PRECISE_L_HAND) + if((!hand_right || !hand_right.is_usable()) && (!hand_left || !hand_left.is_usable())) to_chat(user, span_warning("You can't use your hand to take out the defibrillator!")) return if(clamps_locked) @@ -168,7 +164,8 @@ span_notice("You slide out [defib] from [src] and unhook the charging cables.")) playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE) defib = null - update_icon() + update_icon(UPDATE_OVERLAYS) + //wallframe, for attaching the mounts easily /obj/item/mounted/frame/defib_mount diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 323af03b398..f5ea968b96b 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -3,6 +3,7 @@ desc = "A remote control-switch for a door." icon = 'icons/obj/stationobjs.dmi' icon_state = "doorctrl" + base_icon_state = "doorctrl" power_channel = ENVIRON var/id = null var/safety_z_check = TRUE @@ -20,11 +21,18 @@ var/exposedwires = FALSE var/ai_control = TRUE + var/is_animating = FALSE anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 + +/obj/machinery/door_control/Initialize(mapload) + . = ..() + power_change(forced = TRUE) + + /obj/machinery/door_control/attack_ai(mob/user) if(ai_control) return attack_hand(user) @@ -48,50 +56,46 @@ /obj/machinery/door_control/Initialize(mapload) . = ..() - if(!istype(id, /list)) + if(!islist(id)) id = list(id) /obj/machinery/door_control/proc/do_main_action(mob/user) if(normaldoorcontrol) - for(var/obj/machinery/door/airlock/D in GLOB.airlocks) - if(safety_z_check && D.z != z || !(D.id_tag in id)) + for(var/obj/machinery/door/airlock/airlock in GLOB.airlocks) + if(safety_z_check && airlock.z != z || !(airlock.id_tag in id)) continue if(specialfunctions & OPEN) - if(D.density) - spawn(0) - D.open() + if(airlock.density) + INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door, open)) else - spawn(0) - D.close() + INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door, close)) if(desiredstate) if(specialfunctions & IDSCAN) - D.aiDisabledIdScanner = TRUE + airlock.aiDisabledIdScanner = TRUE if(specialfunctions & BOLTS) - D.lock() + airlock.lock() if(specialfunctions & SHOCK) - D.electrify(-1) + airlock.electrify(-1) if(specialfunctions & SAFE) - D.safe = FALSE + airlock.safe = FALSE else if(specialfunctions & IDSCAN) - D.aiDisabledIdScanner = FALSE + airlock.aiDisabledIdScanner = FALSE if(specialfunctions & BOLTS) - D.unlock() + airlock.unlock() if(specialfunctions & SHOCK) - D.electrify(0) + airlock.electrify(0) if(specialfunctions & SAFE) - D.safe = TRUE + airlock.safe = TRUE else - for(var/obj/machinery/door/poddoor/M in GLOB.airlocks) - if(safety_z_check && M.z != z || !(M.id_tag in id)) + for(var/obj/machinery/door/poddoor/poddoor in GLOB.airlocks) + if(safety_z_check && poddoor.z != z || !(poddoor.id_tag in id)) continue - if(M.density) - spawn(0) - M.open() + if(poddoor.density) + INVOKE_ASYNC(poddoor, TYPE_PROC_REF(/obj/machinery/door, open)) else - spawn(0) - M.close() + INVOKE_ASYNC(poddoor, TYPE_PROC_REF(/obj/machinery/door, close)) desiredstate = !desiredstate @@ -102,46 +106,86 @@ if(!allowed(user) && !user.can_advanced_admin_interact()) to_chat(user, span_warning("Access Denied.")) - flick("[initial(icon_state)]-denied",src) + flick("[base_icon_state]-denied",src) playsound(src, pick('sound/machines/button.ogg', 'sound/machines/button_alternate.ogg', 'sound/machines/button_meloboom.ogg'), 20) return use_power(5) - animate_activation() - do_main_action(user) + /obj/machinery/door_control/proc/animate_activation() - icon_state = "[initial(icon_state)]-inuse" - addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 15) + if(is_animating) + return + is_animating = TRUE + update_icon(UPDATE_ICON_STATE) + addtimer(CALLBACK(src, PROC_REF(finish_animation)), 1.5 SECONDS) -/obj/machinery/door_control/power_change() - ..() - update_icon() -/obj/machinery/door_control/update_icon() +/obj/machinery/door_control/proc/finish_animation() + is_animating = FALSE + update_icon(UPDATE_ICON_STATE) + + +/obj/machinery/door_control/power_change(forced = FALSE) + if(!..()) + return if(stat & NOPOWER) - icon_state = "[initial(icon_state)]-p" + set_light(0) else - icon_state = initial(icon_state) + set_light(1, LIGHTING_MINIMUM_POWER) + update_icon() + + +/obj/machinery/door_control/update_icon_state() + if(stat & NOPOWER) + icon_state = "[base_icon_state]-p" + return + icon_state = is_animating ? "[base_icon_state]-inuse" : base_icon_state + + +/obj/machinery/door_control/update_overlays() + . = ..() + underlays.Cut() + + if(stat & NOPOWER) + return + + underlays += emissive_appearance(icon, "[base_icon_state]_lightmask") + /obj/machinery/door_control/secure //Use icon_state = "altdoorctrl" if you just want cool icon for your button on map. This button is created for Admin-zones. icon_state = "altdoorctrl" + base_icon_state = "altdoorctrl" ai_control = FALSE /obj/machinery/door_control/secure/emag_act(user) if(user) to_chat(user, span_notice("The electronic systems in this device are far too advanced for your primitive hacking peripherals.")) -// hidden mimic button +// hidden mimic button /obj/machinery/door_control/mimic icon = 'icons/obj/lighting.dmi' icon_state = "lantern" + /obj/machinery/door_control/mimic/animate_activation() - audible_message("Something clicked.", ,1) + audible_message("Something clicked.", hearing_distance = 1) + -/obj/machinery/door_control/mimic/update_icon() +/obj/machinery/door_control/mimic/update_icon_state() return + + +/obj/machinery/door_control/mimic/update_overlays() + . = list() + + +/obj/machinery/door_control/mimic/power_change(forced = FALSE) + if(powered(power_channel)) + stat &= ~NOPOWER + else + stat |= NOPOWER + diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index c40549255f0..eb69b600a35 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -44,6 +44,7 @@ GLOBAL_LIST_EMPTY(airlock_overlays) +GLOBAL_LIST_EMPTY(airlock_emissive_underlays) /obj/machinery/door/airlock name = "airlock" @@ -86,14 +87,10 @@ GLOBAL_LIST_EMPTY(airlock_overlays) var/paintable = TRUE // If the airlock type can be painted with an airlock painter var/id //ID for tint controlle - var/image/old_frame_overlay //keep those in order to prevent unnecessary updating - var/image/old_filling_overlay - var/image/old_lights_overlay - var/image/old_panel_overlay - var/image/old_weld_overlay - var/image/old_sparks_overlay - var/image/old_dam_overlay - var/image/old_note_overlay + var/mutable_appearance/old_buttons_underlay + var/mutable_appearance/old_lights_underlay + var/mutable_appearance/old_damag_underlay + var/mutable_appearance/old_sparks_underlay var/doorOpen = 'sound/machines/airlock_open.ogg' var/doorClose = 'sound/machines/airlock_close.ogg' @@ -134,8 +131,8 @@ About the new airlock wires panel: /obj/machinery/door/airlock/Initialize() . = ..() - if(closeOtherId != null) - addtimer(CALLBACK(src, PROC_REF(update_other_id)), 5) + if(closeOtherId) + addtimer(CALLBACK(src, PROC_REF(update_other_id)), 0.5 SECONDS) if(glass) airlock_material = "glass" if(security_level > AIRLOCK_SECURITY_METAL) @@ -155,9 +152,9 @@ About the new airlock wires panel: damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_N /obj/machinery/door/airlock/proc/update_other_id() - for(var/obj/machinery/door/airlock/A in GLOB.airlocks) - if(A.closeOtherId == closeOtherId && A != src) - closeOther = A + for(var/obj/machinery/door/airlock/airlock in GLOB.airlocks) + if(airlock.closeOtherId == closeOtherId && airlock != src) + closeOther = airlock break /obj/machinery/door/airlock/Destroy() @@ -200,8 +197,6 @@ About the new airlock wires panel: return ..(user) -/obj/machinery/door/airlock/bumpopen(mob/living/simple_animal/user) - ..(user) /obj/machinery/door/airlock/proc/isElectrified() if(electrified_until != 0) @@ -314,22 +309,30 @@ About the new airlock wires panel: /obj/machinery/door/airlock/proc/shock_user(mob/user, prob) return (!issilicon(user) && isElectrified() && shock(user, prob)) -/obj/machinery/door/airlock/update_icon(state=0, override=0) + +/obj/machinery/door/airlock/update_icon(state = NONE, override = FALSE) if(operating && !override) return - check_unres() + icon_state = density ? "closed" : "open" switch(state) - if(0) + if(NONE) if(density) state = AIRLOCK_CLOSED else state = AIRLOCK_OPEN - if(AIRLOCK_OPEN, AIRLOCK_CLOSED) if(AIRLOCK_DENY, AIRLOCK_OPENING, AIRLOCK_CLOSING, AIRLOCK_EMAG) icon_state = "nonexistenticonstate" //MADNESS + + . = ..(UPDATE_ICON_STATE) // Sent after the icon_state is changed + set_airlock_overlays(state) + +/obj/machinery/door/airlock/update_icon_state() + return + + /obj/machinery/door/airlock/proc/set_airlock_overlays(state) var/image/frame_overlay var/image/filling_overlay @@ -340,14 +343,20 @@ About the new airlock wires panel: var/image/sparks_overlay var/image/note_overlay var/notetype = note_type() + var/mutable_appearance/buttons_underlay + var/mutable_appearance/lights_underlay + var/mutable_appearance/damag_underlay + var/mutable_appearance/sparks_underlay switch(state) if(AIRLOCK_CLOSED) frame_overlay = get_airlock_overlay("closed", icon) + buttons_underlay = get_airlock_emissive_underlay("closed_lightmask", overlays_file) if(airlock_material) filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) else filling_overlay = get_airlock_overlay("fill_closed", icon) if(panel_open) + buttons_underlay = null if(security_level) panel_overlay = get_airlock_overlay("panel_closed_protected", overlays_file) else @@ -356,15 +365,20 @@ About the new airlock wires panel: weld_overlay = get_airlock_overlay("welded", overlays_file) if(obj_integrity
[uppertext(disp1)]
[uppertext(disp2)]
"}
+ if(maptext != new_text)
+ maptext = new_text
+ else if(maptext)
+ maptext = ""
+
+
// has the door power situation changed, if so update icon.
-/obj/machinery/door_timer/power_change()
- ..()
- update_icon()
+/obj/machinery/door_timer/power_change(forced = FALSE)
+ if(!..())
+ return
+ update_display()
// open/closedoor checks if door_timer has power, if so it checks if the
@@ -185,14 +214,16 @@
// Closes and locks doors, power check
/obj/machinery/door_timer/proc/timer_start()
+ timing = TRUE
+ update_display()
if(stat & (NOPOWER|BROKEN))
- return 0
+ timing = FALSE
+ return FALSE
- if(!printed)
- if(!print_report())
- timing = FALSE
- return FALSE
+ if(!printed && !print_report())
+ timing = FALSE
+ return FALSE
// Set releasetime
releasetime = world.timeofday + timetoset
@@ -201,28 +232,30 @@
for(var/obj/machinery/door/window/brigdoor/door in targets)
if(door.density)
continue
- spawn(0)
- door.close()
+ INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/machinery/door, close))
- for(var/obj/structure/closet/secure_closet/brig/C in targets)
- if(C.broken)
+ for(var/obj/structure/closet/secure_closet/brig/closet in targets)
+ if(closet.broken)
continue
- if(C.opened && !C.close())
+ if(closet.opened && !closet.close())
continue
- C.locked = 1
- C.update_icon()
+ closet.locked = TRUE
+ closet.update_icon()
- for(var/obj/machinery/treadmill_monitor/T in targets)
- T.total_joules = 0
- T.on = 1
+ for(var/obj/machinery/treadmill_monitor/monitor in targets)
+ monitor.total_joules = 0
+ monitor.on = TRUE
- return 1
+ return TRUE
// Opens and unlocks doors, power check
/obj/machinery/door_timer/proc/timer_end()
+ timing = FALSE
+ update_display()
+
if(stat & (NOPOWER|BROKEN))
- return 0
+ return FALSE
// Reset vars
occupant = CELL_NONE
@@ -231,7 +264,7 @@
timetoset = 0
officer = CELL_NONE
releasetime = 0
- printed = 0
+ printed = FALSE
if(prisoner)
prisoner.fields["criminal"] = SEC_RECORD_STATUS_RELEASED
update_all_mob_security_hud()
@@ -242,20 +275,20 @@
continue
INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/machinery/door/window/brigdoor, open))
- for(var/obj/structure/closet/secure_closet/brig/C in targets)
- if(C.broken)
+ for(var/obj/structure/closet/secure_closet/brig/closet in targets)
+ if(closet.broken)
continue
- if(C.opened)
+ if(closet.opened)
continue
- C.locked = 0
- C.update_icon()
+ closet.locked = FALSE
+ closet.update_icon()
- for(var/obj/machinery/treadmill_monitor/T in targets)
- if(!T.stat)
- T.redeem()
- T.on = 0
+ for(var/obj/machinery/treadmill_monitor/monitor in targets)
+ if(!monitor.stat)
+ monitor.redeem()
+ monitor.on = FALSE
- return 1
+ return TRUE
// Check for releasetime timeleft
@@ -282,6 +315,22 @@
/obj/machinery/door_timer/attack_ghost(mob/user)
ui_interact(user)
+
+/obj/machinery/door_timer/emp_act(severity)
+ if((stat & (BROKEN|NOPOWER)) || emagged)
+ ..(severity)
+ return
+ if(timing && prob(100 / severity))
+ emagged = TRUE
+ ..(severity)
+
+
+/obj/machinery/door_timer/emag_act()
+ if((stat & (BROKEN|NOPOWER)) || emagged || !timing)
+ return
+ emagged = TRUE
+
+
//Allows humans to use door_timer
//Opens dialog window when someone clicks on door timer
// Allows altering timer and the timing boolean.
@@ -360,9 +409,7 @@
prisoner_name = null
prisoner_charge = null
prisoner_time = null
- timing = TRUE
timer_start()
- update_icon()
if("add_timer")
if(timing)
var/add_reason = sanitize(copytext(input(usr, "Reason:", name, "") as text|null, 1, MAX_MESSAGE_LEN))
@@ -412,74 +459,19 @@
else
. = FALSE
if("flash")
- for(var/obj/machinery/flasher/F in targets)
- if(F.last_flash && (F.last_flash + 150) > world.time)
- to_chat(usr, span_warning("Flash still charging."))
+ for(var/obj/machinery/flasher/flasher in targets)
+ if(flasher.last_flash && (flasher.last_flash + 15 SECONDS) > world.time)
+ to_chat(usr, span_warning("Flash is still recharging."))
else
- F.flash()
+ flasher.flash()
else
. = FALSE
-//icon update function
-// if NOPOWER, display blank
-// if BROKEN, display blue screen of death icon AI uses
-// if timing=true, run update display function
-/obj/machinery/door_timer/update_icon()
- if(stat & (NOPOWER))
- icon_state = "frame"
- return
- if(stat & (BROKEN))
- set_picture("ai_bsod")
- return
- if(timing)
- var/disp1 = id
- var/timeleft = timeleft()
- var/disp2 = "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]"
- if(length(disp2) > CHARS_PER_LINE)
- disp2 = "Error"
- update_display(disp1, disp2)
- else
- if(maptext) maptext = ""
-
-
-// Adds an icon in case the screen is broken/off, stolen from status_display.dm
-/obj/machinery/door_timer/proc/set_picture(state)
- picture_state = state
- overlays.Cut()
- overlays += image('icons/obj/status_display.dmi', icon_state=picture_state)
-
-/obj/machinery/door_timer/proc/return_time_input()
- var/mins = input(usr, "Minutes", "Enter number of minutes", 0) as num
- var/seconds = input(usr, "Seconds", "Enter number of seconds", 0) as num
- var/totaltime = (seconds + (mins * 60))
- return totaltime
-
-//Checks to see if there's 1 line or 2, adds text-icons-numbers/letters over display
-// Stolen from status_display
-/obj/machinery/door_timer/proc/update_display(line1, line2)
- line1 = uppertext(line1)
- line2 = uppertext(line2)
- var/new_text = {"[uppertext(disp2)]
[line1]
[line2]
"}
- if(maptext != new_text)
- maptext = new_text
-
-
-//Actual string input to icon display for loop, with 5 pixel x offsets for each letter.
-//Stolen from status_display
-/obj/machinery/door_timer/proc/texticon(tn, px = 0, py = 0)
- var/image/I = image('icons/obj/status_display.dmi', "blank")
- var/len = length(tn)
-
- for(var/d = 1 to len)
- var/char = copytext(tn, len-d+1, len-d+2)
- if(char == " ")
- continue
- var/image/ID = image('icons/obj/status_display.dmi', icon_state=char)
- ID.pixel_x = -(d-1)*5 + px
- ID.pixel_y = py
- I.overlays += ID
- return I
+/obj/machinery/door_timer/update_overlays()
+ . = ..()
+ if(!(stat & NOPOWER) && ((stat & BROKEN) || emagged))
+ . += "ai_bsod"
/obj/machinery/door_timer/cell_1
@@ -531,8 +523,3 @@
name = "Cell 8"
id = "Cell 8"
-#undef FONT_SIZE
-#undef FONT_COLOR
-#undef FONT_STYLE
-#undef CHARS_PER_LINE
-#undef CELL_NONE
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 742b85e7d2c..df810481825 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -15,7 +15,7 @@
var/closingLayer = CLOSED_DOOR_LAYER
var/visible = 1
/// Is it currently in the process of opening or closing.
- var/operating = FALSE
+ var/operating = NONE
var/autoclose = 0
/// Whether the door detects things and mobs in its way and reopen or crushes them.
var/safe = TRUE
@@ -65,9 +65,12 @@
..()
update_dir()
-/obj/machinery/door/power_change()
- ..()
- update_icon()
+
+/obj/machinery/door/power_change(forced = FALSE)
+ . = ..()
+ if(.)
+ update_icon()
+
/obj/machinery/door/proc/update_dir()
if(width > 1)
@@ -228,7 +231,7 @@
return
if(requiresID() && (allowed(user) || user.can_advanced_admin_interact()))
if(density)
- if(HAS_TRAIT(src, TRAIT_CMAGGED) && !user.can_advanced_admin_interact())
+ if(HAS_TRAIT(src, TRAIT_CMAGGED) && !user.can_advanced_admin_interact()) //cmag should not prevent admin intervention
cmag_switch(FALSE, user)
return
open()
@@ -236,7 +239,7 @@
if(HAS_TRAIT(src, TRAIT_CMAGGED) && !user.can_advanced_admin_interact())
return
close()
- return
+ return TRUE
if(HAS_TRAIT(src, TRAIT_CMAGGED))
cmag_switch(TRUE, user)
return
@@ -369,11 +372,10 @@
sound_ready = FALSE
addtimer(VARSET_CALLBACK(src, sound_ready, TRUE), sound_cooldown)
-/obj/machinery/door/update_icon()
- if(density)
- icon_state = "door1"
- else
- icon_state = "door0"
+
+/obj/machinery/door/update_icon_state()
+ icon_state = "door[density]"
+
/obj/machinery/door/proc/do_animate(animation)
switch(animation)
@@ -395,23 +397,23 @@
if(!density)
return TRUE
if(operating)
- return
- operating = TRUE
+ return FALSE
+ operating = DOOR_OPENING
do_animate("opening")
- set_opacity(0)
- sleep(5)
+ set_opacity(FALSE)
+ sleep(0.5 SECONDS)
density = FALSE
- sleep(5)
+ sleep(0.5 SECONDS)
layer = initial(layer)
update_icon()
- set_opacity(0)
- operating = FALSE
- air_update_turf(1)
+ operating = NONE
+ air_update_turf(TRUE)
update_freelook_sight()
if(autoclose)
autoclose_in(normalspeed ? auto_close_time : auto_close_time_dangerous)
return TRUE
+
/obj/machinery/door/proc/close()
if(density)
return TRUE
@@ -422,21 +424,21 @@
for(var/atom/movable/M in turf)
if(M.density && M != src) //something is blocking the door
if(autoclose)
- autoclose_in(60)
+ autoclose_in(6 SECONDS)
return
- operating = TRUE
+ operating = DOOR_CLOSING
do_animate("closing")
layer = closingLayer
- sleep(5)
+ sleep(0.5 SECONDS)
density = TRUE
- sleep(5)
+ sleep(0.5 SECONDS)
update_icon()
if(visible && !glass)
- set_opacity(1)
- operating = FALSE
- air_update_turf(1)
+ set_opacity(TRUE)
+ operating = NONE
+ air_update_turf(TRUE)
update_freelook_sight()
if(safe)
CheckForMobs()
@@ -444,6 +446,7 @@
crush()
return TRUE
+
/obj/machinery/door/proc/CheckForMobs()
if(locate(/mob/living) in get_turf(src))
sleep(1)
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index bc9eb38a6ad..e7fd99032e5 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -19,6 +19,7 @@
safe = FALSE
layer = BELOW_OPEN_DOOR_LAYER
closingLayer = CLOSED_FIREDOOR_LAYER
+ blocks_emissive = EMISSIVE_BLOCK_GENERIC
auto_close_time = 5 SECONDS
assemblytype = /obj/structure/firelock_frame
armor = list("melee" = 30, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 95, "acid" = 70)
@@ -79,14 +80,31 @@
return ..()
return 0
-/obj/machinery/door/firedoor/power_change()
- if(powered(power_channel))
- stat &= ~NOPOWER
- latetoggle()
+
+/obj/machinery/door/firedoor/proc/adjust_light()
+ if(stat & (NOPOWER|BROKEN))
+ set_light(0)
+ return
+ if(active_alarm)
+ set_light(1, 0.5, COLOR_RED_LIGHT)
else
- stat |= NOPOWER
+ set_light(1, LIGHTING_MINIMUM_POWER)
+
+/obj/machinery/door/firedoor/extinguish_light(force = FALSE)
+ set_light(0)
+ update_icon(UPDATE_OVERLAYS)
+
+
+/obj/machinery/door/firedoor/power_change(forced = FALSE)
+ . = ..()
+ if(!(stat & NOPOWER))
+ latetoggle()
+ if(!.)
+ return
+ adjust_light()
update_icon()
+
/obj/machinery/door/firedoor/attack_hand(mob/user)
if(user.a_intent == INTENT_HARM && ishuman(user) && user.dna.species.obj_damage)
add_fingerprint(user)
@@ -166,7 +184,7 @@
return
WELDER_WELD_SUCCESS_MESSAGE
welded = !welded
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/machinery/door/firedoor/try_to_crowbar(obj/item/I, mob/user)
if(welded || operating)
@@ -204,25 +222,31 @@
flick("door_closing", src)
playsound(src, 'sound/machines/firedoor.ogg', 60, 1)
-/obj/machinery/door/firedoor/update_icon()
- overlays.Cut()
+
+/obj/machinery/door/firedoor/update_icon_state()
+ icon_state = "door_[density ? "closed" : "open"]"
+
+
+/obj/machinery/door/firedoor/update_overlays()
+ . = ..()
+ if(welded)
+ . += "welded[density ? "" : "_open"]"
if(active_alarm && hasPower())
- overlays += image('icons/obj/doors/doorfire.dmi', "alarmlights")
- if(density)
- icon_state = "door_closed"
- if(welded)
- overlays += "welded"
- else
- icon_state = "door_open"
- if(welded)
- overlays += "welded_open"
+ if(light)
+ . += emissive_appearance('icons/obj/doors/doorfire.dmi', "alarmlights_lightmask")
+ . += image('icons/obj/doors/doorfire.dmi', "alarmlights")
+
/obj/machinery/door/firedoor/proc/activate_alarm()
active_alarm = TRUE
+ adjust_light()
update_icon()
/obj/machinery/door/firedoor/proc/deactivate_alarm()
active_alarm = FALSE
+ if(!density)
+ layer = initial(layer)
+ adjust_light()
update_icon()
/obj/machinery/door/firedoor/open(auto_close = TRUE)
@@ -230,7 +254,8 @@
return
. = ..()
latetoggle(auto_close)
-
+ if(active_alarm)
+ layer = closingLayer // Active firedoors take precedence and remain visible over closed airlocks.
if(auto_close)
autoclose = TRUE
@@ -245,13 +270,11 @@
/obj/machinery/door/firedoor/proc/latetoggle(auto_close = TRUE)
if(operating || !hasPower() || !nextstate)
return
- switch(nextstate)
- if(FD_OPEN)
- nextstate = null
- open(auto_close)
- if(FD_CLOSED)
- nextstate = null
- close()
+ if(nextstate == FD_OPEN)
+ INVOKE_ASYNC(src, PROC_REF(open), auto_close)
+ if(nextstate == FD_CLOSED)
+ INVOKE_ASYNC(src, PROC_REF(close))
+ nextstate = null
/obj/machinery/door/firedoor/proc/forcetoggle(magic = FALSE, auto_close = TRUE)
if(!magic && (operating || !hasPower()))
@@ -269,7 +292,7 @@
else
F.constructionStep = CONSTRUCTION_WIRES_EXPOSED
F.obj_integrity = F.max_integrity * 0.5
- F.update_icon()
+ F.update_icon(UPDATE_ICON_STATE)
qdel(src)
/obj/machinery/door/firedoor/border_only
@@ -366,8 +389,7 @@
if(CONSTRUCTION_NOCIRCUIT)
. += span_notice("There are no firelock electronics in the frame. The frame could be cut apart.")
-/obj/structure/firelock_frame/update_icon()
- ..()
+/obj/structure/firelock_frame/update_icon_state()
icon_state = "frame[constructionStep]"
/obj/structure/firelock_frame/attackby(obj/item/C, mob/user)
@@ -412,7 +434,7 @@
playsound(get_turf(src), B.usesound, 50, 1)
B.use(5)
constructionStep = CONSTRUCTION_WIRES_EXPOSED
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return
if(CONSTRUCTION_NOCIRCUIT)
if(istype(C, /obj/item/firelock_electronics))
@@ -430,7 +452,7 @@
span_notice("You insert and secure [C]."))
playsound(get_turf(src), C.usesound, 50, 1)
constructionStep = CONSTRUCTION_GUTTED
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return
return ..()
@@ -471,7 +493,7 @@
span_notice("You remove the circuit board from [src]."))
new /obj/item/firelock_electronics(get_turf(src))
constructionStep = CONSTRUCTION_NOCIRCUIT
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/firelock_frame/wirecutter_act(mob/user, obj/item/I)
if(constructionStep != CONSTRUCTION_WIRES_EXPOSED)
@@ -490,7 +512,7 @@
span_notice("You remove the wiring from [src], exposing the circuit board."))
new /obj/item/stack/cable_coil(drop_location(), 5)
constructionStep = CONSTRUCTION_GUTTED
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/firelock_frame/wrench_act(mob/user, obj/item/I)
if(constructionStep != CONSTRUCTION_PANEL_OPEN)
@@ -516,9 +538,6 @@
qdel(src)
-
-
-
/obj/structure/firelock_frame/welder_act(mob/user, obj/item/I)
if(constructionStep != CONSTRUCTION_NOCIRCUIT)
return
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index ae064f4adc8..5c4c4358578 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -53,11 +53,9 @@
flick("closing", src)
playsound(src, 'sound/machines/blastdoor.ogg', 30, 1)
-/obj/machinery/door/poddoor/update_icon()
- if(density)
- icon_state = "closed"
- else
- icon_state = "open"
+/obj/machinery/door/poddoor/update_icon_state()
+ icon_state = density ? "closed" : "open"
+
/obj/machinery/door/poddoor/try_to_activate_door(mob/user)
return
diff --git a/code/game/machinery/doors/spacepod.dm b/code/game/machinery/doors/spacepod.dm
index a69de0ee0d2..ee4f842324f 100644
--- a/code/game/machinery/doors/spacepod.dm
+++ b/code/game/machinery/doors/spacepod.dm
@@ -4,7 +4,7 @@
icon = 'icons/effects/beam.dmi'
icon_state = "n_beam"
density = 0
- anchored = 1
+ anchored = TRUE
var/id = 1.0
/obj/structure/spacepoddoor/Initialize()
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index faa3966c041..35190479d5c 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -46,11 +46,6 @@
QDEL_NULL(electronics)
return ..()
-/obj/machinery/door/window/update_icon()
- if(density)
- icon_state = base_state
- else
- icon_state = "[base_state]open"
/obj/machinery/door/window/examine(mob/user)
. = ..()
@@ -148,54 +143,62 @@
else
return 1
+
+/obj/machinery/door/window/update_icon_state()
+ switch(operating)
+ if(DOOR_OPENING)
+ icon_state = "[base_state]open"
+ if(DOOR_CLOSING)
+ icon_state = base_state
+ else
+ icon_state = base_state
+
+
/obj/machinery/door/window/open(forced=0)
if(operating) //doors can still open when emag-disabled
- return 0
- if(!forced)
- if(!hasPower())
- return 0
- if(forced < 2)
- if(emagged)
- return 0
+ return FALSE
+ if(!forced && !hasPower())
+ return FALSE
+ if(forced < 2 && emagged)
+ return FALSE
if(!operating) //in case of emag
- operating = TRUE
+ operating = DOOR_OPENING
do_animate("opening")
+ set_opacity(FALSE)
playsound(loc, 'sound/machines/windowdoor.ogg', 100, 1)
- icon_state ="[base_state]open"
- sleep(10)
+ update_icon()
+ sleep(1 SECONDS)
density = FALSE
-// sd_set_opacity(0) //TODO: why is this here? Opaque windoors? ~Carn
- air_update_turf(1)
+
+ air_update_turf(TRUE)
update_freelook_sight()
if(operating) //emag again
- operating = FALSE
- return 1
+ operating = NONE
+ return TRUE
+
-/obj/machinery/door/window/close(forced=0)
+/obj/machinery/door/window/close(forced = 0)
if(operating)
- return 0
- if(!forced)
- if(!hasPower())
- return 0
- if(forced < 2)
- if(emagged)
- return 0
- operating = TRUE
+ return FALSE
+ if(!forced && !hasPower())
+ return FALSE
+ if(forced < 2 && emagged)
+ return FALSE
+ operating = DOOR_CLOSING
do_animate("closing")
- playsound(loc, 'sound/machines/windowdoor.ogg', 100, 1)
- icon_state = base_state
+ playsound(loc, 'sound/machines/windowdoor.ogg', 100, TRUE)
- density = 1
-// if(visible)
-// set_opacity(1) //TODO: why is this here? Opaque windoors? ~Carn
- air_update_turf(1)
+ density = TRUE
+ update_icon()
+ air_update_turf(TRUE)
update_freelook_sight()
- sleep(10)
+ sleep(1 SECONDS)
+
+ operating = NONE
+ return TRUE
- operating = 0
- return 1
/obj/machinery/door/window/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index b8dcbf75845..c5ecaca8749 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -5,8 +5,9 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
desc = "A highly precise directional sensor array which measures the release of quants from decaying tachyons. The doppler shifting of the mirror-image formed by these quants can reveal the size, location and temporal affects of energetic disturbances within a large radius ahead of the array."
icon = 'icons/obj/machines/research.dmi'
icon_state = "tdoppler"
+ base_icon_state = "tdoppler"
density = 1
- anchored = 1
+ anchored = TRUE
atom_say_verb = "states coldly"
var/list/logged_explosions = list()
var/explosion_target
@@ -46,17 +47,13 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
return
return ..()
+
/obj/machinery/doppler_array/wrench_act(mob/user, obj/item/I)
. = TRUE
- if(!I.use_tool(src, user, 0, volume = I.tool_volume))
+ if(!default_unfasten_wrench(user, I, 0))
return
- if(!anchored && !isinspace())
- anchored = TRUE
- WRENCH_ANCHOR_MESSAGE
- else if(anchored)
- anchored = FALSE
- WRENCH_UNANCHOR_MESSAGE
- power_change()
+ update_icon(UPDATE_ICON_STATE)
+
/obj/machinery/doppler_array/attack_hand(mob/user)
if(..())
@@ -70,11 +67,15 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
/obj/machinery/doppler_array/AltClick(mob/user)
rotate(user)
-/obj/machinery/doppler_array/verb/rotate(mob/user)
+
+/obj/machinery/doppler_array/verb/rotate_verb()
set name = "Rotate Tachyon-doppler Dish"
set category = "Object"
set src in oview(1)
+ rotate(usr)
+
+/obj/machinery/doppler_array/proc/rotate(mob/user)
if(user.incapacitated())
return
if(!Adjacent(user))
@@ -164,16 +165,21 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
for(var/message in messages)
atom_say(message)
-/obj/machinery/doppler_array/power_change()
+
+/obj/machinery/doppler_array/update_icon_state()
if(stat & BROKEN)
- icon_state = "[initial(icon_state)]-broken"
+ icon_state = "[base_icon_state]-broken"
else
- if(powered() && anchored)
- icon_state = initial(icon_state)
- stat &= ~NOPOWER
- else
- icon_state = "[initial(icon_state)]-off"
- stat |= NOPOWER
+ icon_state = (!(stat & NOPOWER) && anchored) ? base_icon_state : "[base_icon_state]-off"
+
+
+/obj/machinery/doppler_array/power_change(forced = FALSE) // overrides base power_change to check to make sure machine is anchored
+ if(powered(power_channel) && anchored)
+ stat &= ~NOPOWER
+ else
+ stat |= NOPOWER
+ update_icon(UPDATE_ICON_STATE)
+
/obj/machinery/doppler_array/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)
diff --git a/code/game/machinery/dye_generator.dm b/code/game/machinery/dye_generator.dm
index 8b22c0aab12..ac043595d88 100644
--- a/code/game/machinery/dye_generator.dm
+++ b/code/game/machinery/dye_generator.dm
@@ -1,36 +1,60 @@
/obj/machinery/dye_generator
name = "Dye Generator"
icon = 'icons/obj/machines/vending.dmi'
- icon_state = "barbervend"
- density = 1
- anchored = 1
+ icon_state = "barbervend_off"
+ base_icon_state = "barbervend"
+ density = TRUE
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 40
var/dye_color = "#FFFFFF"
-/obj/machinery/dye_generator/Initialize()
- ..()
- power_change()
-/obj/machinery/dye_generator/power_change()
+/obj/machinery/dye_generator/Initialize(mapload)
+ . = ..()
+ update_icon(UPDATE_OVERLAYS)
+
+
+/obj/machinery/dye_generator/update_overlays()
+ . = ..()
+
+ underlays.Cut()
+
+ if(panel_open)
+ . += "[base_icon_state]_panel"
+
+ if(stat & NOPOWER)
+ if(stat & BROKEN)
+ . += "[base_icon_state]_broken"
+ return
+
if(stat & BROKEN)
- icon_state = "[initial(icon_state)]-broken"
+ . += "[base_icon_state]_broken"
+ underlays += emissive_appearance(icon, "[base_icon_state]_broken_lightmask")
+ else
+ . += "[base_icon_state]"
+ underlays += emissive_appearance(icon, "[base_icon_state]_lightmask")
+
+
+/obj/machinery/dye_generator/obj_break(damage_flag)
+ ..()
+ update_icon(UPDATE_OVERLAYS)
+
+
+/obj/machinery/dye_generator/power_change(forced = FALSE)
+ . = ..()
+ if(stat & NOPOWER)
set_light(0)
else
- if(powered())
- icon_state = initial(icon_state)
- stat &= ~NOPOWER
- set_light(2, l_color = dye_color)
- else
- spawn(rand(0, 15))
- src.icon_state = "[initial(icon_state)]-off"
- stat |= NOPOWER
- set_light(0)
+ set_light(1, LIGHTING_MINIMUM_POWER, dye_color)
+ if(.)
+ update_icon(UPDATE_OVERLAYS)
/obj/machinery/dye_generator/extinguish_light(force = FALSE)
- set_light(0)
- underlays.Cut()
+ if(light)
+ set_light(0)
+ underlays.Cut()
/obj/machinery/dye_generator/attack_hand(mob/user)
@@ -39,7 +63,8 @@
return
var/temp = input(usr, "Choose a dye color", "Dye Color") as color
dye_color = temp
- set_light(2, l_color = temp)
+ set_light(1, LIGHTING_MINIMUM_POWER, temp)
+
/obj/machinery/dye_generator/attackby(obj/item/I, mob/user, params)
@@ -52,12 +77,12 @@
var/obj/item/hair_dye_bottle/HD = I
user.visible_message(span_notice("[user] fills the [HD] up with some dye."),span_notice("You fill the [HD] up with some hair dye."))
HD.dye_color = dye_color
- HD.update_dye_overlay()
+ HD.update_icon(UPDATE_OVERLAYS)
return
return ..()
-//Hair Dye Bottle
+//Hair Dye Bottle
/obj/item/hair_dye_bottle
name = "Hair Dye Bottle"
desc = "A refillable bottle used for holding hair dyes of all sorts of colors."
@@ -70,15 +95,16 @@
w_class = WEIGHT_CLASS_TINY
var/dye_color = "#FFFFFF"
-/obj/item/hair_dye_bottle/New()
- ..()
- update_dye_overlay()
-/obj/item/hair_dye_bottle/proc/update_dye_overlay()
- overlays.Cut()
- var/image/I = new('icons/obj/items.dmi', "hairdyebottle-overlay")
- I.color = dye_color
- overlays += I
+/obj/item/hair_dye_bottle/Initialize(mapload)
+ . = ..()
+ update_icon(UPDATE_OVERLAYS)
+
+
+/obj/item/hair_dye_bottle/update_overlays()
+ . = ..()
+ . += mutable_appearance(icon, icon_state = "hairdyebottle-overlay", color = dye_color)
+
/obj/item/hair_dye_bottle/attack(mob/living/carbon/M, mob/user)
if(user.a_intent != INTENT_HELP)
diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm
index 8288cefd09b..900043238f7 100644
--- a/code/game/machinery/embedded_controller/airlock_controllers.dm
+++ b/code/game/machinery/embedded_controller/airlock_controllers.dm
@@ -74,7 +74,7 @@
name = "Access Controller"
tag_secure = 1
-/obj/machinery/embedded_controller/radio/airlock/access_controller/update_icon()
+/obj/machinery/embedded_controller/radio/airlock/access_controller/update_icon_state()
if(on && program)
if(program.memory["processing"])
icon_state = "access_control_process"
diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm
index 6a52cc19dfc..bd3005fad59 100644
--- a/code/game/machinery/embedded_controller/embedded_controller_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm
@@ -2,7 +2,7 @@
var/datum/computer/file/embedded_program/program //the currently executing program
name = "Embedded Controller"
- anchored = 1
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 10
@@ -23,8 +23,8 @@
if(program)
program.process()
- update_icon()
- src.updateDialog()
+ update_icon(UPDATE_ICON_STATE)
+ updateDialog()
/obj/machinery/embedded_controller/attack_ghost(mob/user as mob)
ui_interact(user)
@@ -61,7 +61,7 @@
radio_connection = null
return ..()
-/obj/machinery/embedded_controller/radio/update_icon()
+/obj/machinery/embedded_controller/radio/update_icon_state()
if(on && program)
if(program.memory["processing"])
icon_state = "airlock_control_process"
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 1d64aeb3b0d..2a82f6a4101 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -2,6 +2,8 @@
FIRE ALARM
*/
+GLOBAL_LIST_EMPTY(firealarms)
+
#define FIRE_ALARM_FRAME 0
#define FIRE_ALARM_UNWIRED 1
#define FIRE_ALARM_READY 2
@@ -10,13 +12,8 @@ FIRE ALARM
name = "fire alarm"
desc = "\"Pull this in case of emergency\". Thus, keep pulling it forever."
icon = 'icons/obj/machines/monitors.dmi'
- icon_state = "fire0"
- var/detecting = 1.0
- var/working = 1.0
- var/time = 10.0
- var/timing = 0.0
- var/lockdownbyai = 0
- anchored = 1.0
+ icon_state = "firealarm_on"
+ anchored = TRUE
max_integrity = 250
integrity_failure = 100
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100, fire = 90, acid = 30)
@@ -26,16 +23,44 @@ FIRE ALARM
power_channel = ENVIRON
resistance_flags = FIRE_PROOF
- light_power = 0
- light_range = 5
- light_color = COLOR_RED_LIGHT
+ light_power = LIGHTING_MINIMUM_POWER
+ light_range = 7
+ light_color = "#ff3232"
+
+ var/buildstage = FIRE_ALARM_READY
+ var/wiresexposed = FALSE
+ var/detecting = TRUE
+ var/working = TRUE
+ /// Should triggered fire alarms also trigger an actual alarm?
+ var/report_fire_alarms = TRUE
+ /// Should fire alarms display the current alert level?
+ var/show_alert_level = TRUE
+ /// Used to prevent pulling spam by same persons
+ var/last_time_pulled
+
- var/wiresexposed = 0
- var/buildstage = 2 // 2 = complete, 1 = no wires, 0 = circuit gone
+/obj/machinery/firealarm/New(location, direction, building)
+ . = ..()
+
+ GLOB.firealarms += src
+
+ if(building)
+ buildstage = FIRE_ALARM_FRAME
+ wiresexposed = TRUE
+ setDir(direction)
+ set_pixel_offsets_from_dir(26, -26, 26, -26)
+
+ myArea = get_area(src)
+ LAZYADD(myArea.firealarms, src)
+ set_light(1, LIGHTING_MINIMUM_POWER) //for emissives
+ update_icon()
+
+
+/obj/machinery/firealarm/Destroy()
+ GLOB.firealarms -= src
+ LAZYREMOVE(myArea.firealarms, src)
+ return ..()
- var/report_fire_alarms = TRUE // Should triggered fire alarms also trigger an actual alarm?
- var/show_alert_level = TRUE // Should fire alarms display the current alert level?
- var/triggered = FALSE
/obj/machinery/firealarm/no_alarm
report_fire_alarms = FALSE
@@ -48,34 +73,44 @@ FIRE ALARM
report_fire_alarms = TRUE
show_alert_level = FALSE
-/obj/machinery/firealarm/update_icon()
+/obj/machinery/firealarm/update_icon_state()
if(wiresexposed)
- switch(buildstage)
- if(2)
- icon_state="fire_b2"
- if(1)
- icon_state="fire_b1"
- if(0)
- icon_state="fire_b0"
- set_light(0)
+ icon_state = "firealarm_b[buildstage]"
return
-
if(stat & BROKEN)
- icon_state = "firex"
- set_light(0)
- else if(stat & NOPOWER)
- icon_state = "firep"
- set_light(0)
- else if(!detecting)
- icon_state = "fire1"
- set_light(2, 1, COLOR_RED)
- else if(triggered)
- set_light(5, 0.8, COLOR_RED_LIGHT)
+ icon_state = "firealarm_broken"
+ return
+ if(stat & NOPOWER)
+ icon_state = "firealarm_off"
+ return
+
+ var/area/area = get_area(src)
+ if(area.fire)
+ icon_state = "firealarm_alarming"
+ return
+ if(!detecting)
+ icon_state = "firealarm_detect"
+ return
else
- icon_state = "fire0"
- if(is_station_contact(z))
- set_light(get_security_level_l_range(), get_security_level_l_power(), get_security_level_l_color())
+ icon_state = "firealarm_on"
+
+
+/obj/machinery/firealarm/update_overlays()
+ . = ..()
+ underlays.Cut()
+
+ if(stat & (NOPOWER|BROKEN))
+ return
+
+ if(is_station_contact(z) && show_alert_level)
+
+ . += "overlay_[get_security_level()]"
+ underlays += emissive_appearance(icon, "firealarm_overlay_lightmask")
+
+ if(!wiresexposed)
+ underlays += emissive_appearance(icon, "firealarm_lightmask")
+
/obj/machinery/firealarm/emag_act(mob/user)
if(!emagged)
@@ -149,6 +184,7 @@ FIRE ALARM
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
detecting = !detecting
+ update_icon()
if(detecting)
user.visible_message(span_warning("[user] has reconnected [src]'s detecting unit!"), "You have reconnected [src]'s detecting unit.")
else
@@ -179,6 +215,7 @@ FIRE ALARM
WIRECUTTER_SNIP_MESSAGE
new /obj/item/stack/cable_coil(drop_location(), 5)
buildstage = FIRE_ALARM_UNWIRED
+ update_icon()
/obj/machinery/firealarm/wrench_act(mob/user, obj/item/I)
@@ -220,26 +257,41 @@ FIRE ALARM
qdel(src)
/obj/machinery/firealarm/proc/update_fire_light(fire)
- triggered = fire
- update_icon()
+ if(stat & NOPOWER)
+ set_light(0)
+ return
+ else if(GLOB.security_level == SEC_LEVEL_EPSILON)
+ set_light(2, 1, COLOR_WHITE)
+ return
+ else if(fire == !!light_power || fire == !!(light_power - 0.1))
+ return // do nothing if we're already active
-/obj/machinery/firealarm/power_change()
- if(powered(ENVIRON))
- stat &= ~NOPOWER
- update_icon()
+ if(fire)
+ set_light(l_power = 0.8)
else
- spawn(rand(0,15))
- stat |= NOPOWER
- update_icon()
+ set_light(l_power = LIGHTING_MINIMUM_POWER)
+
+
+/obj/machinery/firealarm/power_change()
+ if(!..())
+ return
+ update_fire_light()
+ update_icon()
+
/obj/machinery/firealarm/attack_hand(mob/user)
if(stat & (NOPOWER|BROKEN) || buildstage != 2)
- return 1
+ return TRUE
if(user.incapacitated())
- return 1
+ return TRUE
+
+ . = FALSE
+
+ if(fingerprintslast == user.ckey && world.time < last_time_pulled + 5 SECONDS) //no spamming >:C
+ to_chat(user, span_warning("[src] is still processing your earlier command."))
+ return .
- add_fingerprint(user)
toggle_alarm(user)
@@ -247,50 +299,39 @@ FIRE ALARM
var/area/A = get_area(src)
if(istype(A))
add_fingerprint(user)
+ last_time_pulled = world.time
if(A.fire)
reset()
else
alarm()
+
/obj/machinery/firealarm/examine(mob/user)
. = ..()
- . += span_notice("Текущий уровень угрозы: [capitalize(get_security_level_ru())].")
+ switch(buildstage)
+ if(FIRE_ALARM_FRAME)
+ . += "It's missing a circuit board and the bolts are exposed."
+ if(FIRE_ALARM_UNWIRED)
+ . += "The control board needs wiring and can be pried out."
+ if(FIRE_ALARM_READY)
+ if(wiresexposed)
+ . += "The fire alarm's wires are exposed by the unscrewed panel."
+ . += "The detection circuitry can be turned [detecting ? "off" : "on"] by pulsing the board."
+
+ . += "It shows the alert level as: [capitalize(get_security_level())]."
+
/obj/machinery/firealarm/proc/reset()
if(!working || !report_fire_alarms)
return
- var/area/A = get_area(src)
- A.firereset(src)
+ myArea?.firereset(src)
+
/obj/machinery/firealarm/proc/alarm()
if(!working || !report_fire_alarms)
return
- var/area/A = get_area(src)
- A.firealert(src) // Manually trigger alarms if the alarm isn't reported
- update_icon()
-
-/obj/machinery/firealarm/New(location, direction, building)
- . = ..()
+ myArea?.firealert(src)
- if(building)
- buildstage = 0
- wiresexposed = TRUE
- setDir(direction)
- set_pixel_offsets_from_dir(26, -26, 26, -26)
-
- if(is_station_contact(z) && show_alert_level)
- if(GLOB.security_level)
- overlays += image('icons/obj/machines/monitors.dmi', "overlay_[get_security_level()]")
- else
- overlays += image('icons/obj/machines/monitors.dmi', "overlay_green")
-
- myArea = get_area(src)
- LAZYADD(myArea.firealarms, src)
- update_icon()
-
-/obj/machinery/firealarm/Destroy()
- LAZYREMOVE(myArea.firealarms, src)
- return ..()
/*
FIRE ALARM CIRCUIT
@@ -307,6 +348,8 @@ Just a object used in constructing fire alarms
toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
+
#undef FIRE_ALARM_FRAME
#undef FIRE_ALARM_UNWIRED
#undef FIRE_ALARM_READY
+
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index b308bdac883..d75ddabaec0 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -147,7 +147,7 @@
icon_state = "launcherbtt"
var/id = null
var/active = 0
- anchored = 1.0
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 2
active_power_usage = 4
diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm
index 9950b3f61de..fce57b61fa9 100644
--- a/code/game/machinery/floodlight.dm
+++ b/code/game/machinery/floodlight.dm
@@ -26,132 +26,151 @@
QDEL_NULL(cell)
return ..()
-/obj/machinery/floodlight/proc/updateicon()
+
+/obj/machinery/floodlight/proc/mapVarInit()
+ if(on)
+ if(!cell)
+ return
+ if(cell.charge <= 0)
+ return
+ set_light(brightness_on)
+ update_icon(UPDATE_ICON_STATE)
+
+
+/obj/machinery/floodlight/examine(mob/user)
+ . = ..()
+ if(!unlocked)
+ . += span_notice("The panel is screwed shut.")
+ else
+ if(open)
+ . += span_notice("The panel is pried open, looks like you could fit a cell in there.")
+ else
+ . += span_notice("The panel looks like it could be pried open, or screwed shut.")
+
+
+/obj/machinery/floodlight/update_icon_state()
icon_state = "flood[open ? "o" : ""][open && cell ? "b" : ""]0[on]"
+
/obj/machinery/floodlight/process()
- if(!cell && on)
+ if(!on)
+ return
+
+ if(cell && !cell.use(use))
on = FALSE
- visible_message(span_warning("[src] shuts down due to lack of power!"))
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
set_light(0)
- if(on)
- cell.charge -= use
- if(cell.charge <= 0)
- on = FALSE
- updateicon()
- set_light(0)
- visible_message(span_warning("[src] shuts down due to lack of power!"))
+ visible_message(span_warning("[src] shuts down due to lack of power!"))
+
/obj/machinery/floodlight/attack_ai()
return
-/obj/machinery/floodlight/attack_hand(mob/user as mob)
+/obj/machinery/floodlight/attack_hand(mob/user)
+ add_fingerprint(user)
if(open && cell)
- if(ishuman(user))
- if(!user.get_active_hand())
- cell.forceMove_turf()
- user.put_in_hands(cell, ignore_anim = FALSE)
- else
- cell.loc = loc
-
- add_fingerprint(user)
+ if(user.get_active_hand())
+ to_chat(user, span_warning("Your hand is occupied!"))
+ return
+ cell.forceMove_turf()
cell.add_fingerprint(user)
- cell.update_icon()
-
+ cell.update_icon(UPDATE_OVERLAYS)
+ user.put_in_hands(cell, ignore_anim = FALSE)
cell = null
- to_chat(user, "You remove the power cell.")
+ to_chat(user, span_notice("You remove the power cell."))
if(on)
on = FALSE
visible_message(span_warning("[src] shuts down due to lack of power!"))
set_light(0)
- updateicon()
+ update_icon(UPDATE_ICON_STATE)
return
if(on)
- add_fingerprint(user)
on = FALSE
to_chat(user, span_notice("You turn off the light."))
set_light(0)
else
if(!cell)
+ to_chat(user, span_warning("You try to turn on [src] but nothing happens! Seems like it lacks a power cell."))
return
if(cell.charge <= 0)
+ to_chat(user, span_warning("[src] hardly glows at all! Seems like the power cell is empty."))
+ return
+ if(!anchored)
+ to_chat(user, span_warning("[src] must be anchored first!"))
return
- add_fingerprint(user)
on = TRUE
to_chat(user, span_notice("You turn on the light."))
set_light(brightness_on)
+ update_icon(UPDATE_ICON_STATE)
- updateicon()
-/obj/machinery/floodlight/proc/mapVarInit()
- if(on)
- if(!cell)
- return
- if(cell.charge <= 0)
- return
- set_light(brightness_on)
- updateicon()
-
-/obj/machinery/floodlight/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/wrench))
- add_fingerprint(user)
- if(!anchored && !isinspace())
- playsound(loc, W.usesound, 50, 1)
- user.visible_message( \
- "[user] tightens \the [src]'s casters.", \
- span_notice(" You have tightened \the [src]'s casters."), \
- "You hear ratchet.")
- anchored = TRUE
- else if(anchored)
- playsound(loc, W.usesound, 50, 1)
- user.visible_message( \
- "[user] loosens \the [src]'s casters.", \
- span_notice(" You have loosened \the [src]'s casters."), \
- "You hear ratchet.")
- anchored = FALSE
- updateicon()
- return
- if(istype(W, /obj/item/screwdriver))
- add_fingerprint(user)
- if(!open)
- if(unlocked)
- unlocked = FALSE
- to_chat(user, "You screw the battery panel in place.")
- else
- unlocked = TRUE
- to_chat(user, "You unscrew the battery panel.")
- updateicon()
- return
- if(istype(W, /obj/item/crowbar))
- add_fingerprint(user)
- if(unlocked)
- if(open)
- open = FALSE
- overlays = null
- to_chat(user, "You crowbar the battery panel in place.")
- else
- if(unlocked)
- open = TRUE
- to_chat(user, "You remove the battery panel.")
- updateicon()
- return
- if(istype(W, /obj/item/stock_parts/cell))
+/obj/machinery/floodlight/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/stock_parts/cell))
if(open)
if(cell)
- to_chat(user, "There is a power cell already installed.")
+ to_chat(user, span_warning("There is a power cell already installed."))
else
add_fingerprint(user)
- user.drop_transfer_item_to_loc(W, src)
- cell = W
- to_chat(user, "You insert the power cell.")
- updateicon()
+ user.drop_transfer_item_to_loc(I, src)
+ cell = I
+ to_chat(user, span_notice("You insert the power cell."))
+ update_icon(UPDATE_ICON_STATE)
return
return ..()
+
+/obj/machinery/floodlight/crowbar_act(mob/living/user, obj/item/I)
+ add_fingerprint(user)
+ if(!unlocked)
+ to_chat(user, span_warning("The cover is screwed tightly down."))
+ return TRUE
+
+ if(!I.use_tool(src, user, volume = I.tool_volume))
+ return
+
+ if(open)
+ to_chat(user, span_notice("You pry the panel closed."))
+ else
+ to_chat(user, span_notice("You pry the panel open."))
+ open = !open
+ update_icon(UPDATE_ICON_STATE)
+ return TRUE
+
+
+/obj/machinery/floodlight/screwdriver_act(mob/living/user, obj/item/I)
+ add_fingerprint(user)
+ if(open)
+ to_chat(user, span_warning("The screws can't reach while its open."))
+ return TRUE
+
+ if(!I.use_tool(src, user, volume = I.tool_volume))
+ return
+
+ if(open)
+ return
+
+ if(unlocked)
+ to_chat(user, span_notice("You screw the battery panel in place."))
+ else
+ to_chat(user, span_notice("You unscrew the battery panel."))
+ unlocked = !unlocked
+ update_icon(UPDATE_ICON_STATE)
+ return TRUE
+
+
+/obj/machinery/floodlight/wrench_act(mob/living/user, obj/item/I)
+ . = TRUE
+ if(!I.tool_use_check(user, 0))
+ return
+ if(anchored)
+ extinguish_light()
+ default_unfasten_wrench(user, I)
+
+
/obj/machinery/floodlight/extinguish_light(force = FALSE)
if(on)
on = FALSE
set_light(0)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
+
diff --git a/code/game/machinery/gameboard.dm b/code/game/machinery/gameboard.dm
index b67be897ba5..56c39b8212a 100644
--- a/code/game/machinery/gameboard.dm
+++ b/code/game/machinery/gameboard.dm
@@ -4,7 +4,7 @@
icon_state = "gboard_on"
desc = "A holographic table allowing the crew to have fun(TM) on boring shifts! One player per board."
density = 1
- anchored = 1
+ anchored = TRUE
use_power = IDLE_POWER_USE
var/cooling_down = 0
light_color = LIGHT_COLOR_LIGHTBLUE
@@ -25,15 +25,17 @@
if(get_dist(src, p) > 1 && !istype(p, /mob/living/silicon))
close_game(p)
-/obj/machinery/gameboard/power_change()
- . = ..()
- update_icon()
+/obj/machinery/gameboard/power_change(forced = FALSE)
+ if(!..())
+ return
+ update_icon(UPDATE_ICON_STATE)
if(stat & NOPOWER)
set_light(0)
else
set_light(3, 3)
-/obj/machinery/gameboard/update_icon()
+
+/obj/machinery/gameboard/update_icon_state()
if(stat & NOPOWER)
icon_state = "gboard_off"
else
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index ac2ef018553..483e4b84355 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -39,7 +39,7 @@ GLOBAL_LIST_EMPTY(holopads)
name = "holopad"
desc = "It's a floor-mounted device for projecting holographic images."
icon_state = "holopad0"
- anchored = 1
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 100
@@ -398,7 +398,7 @@ GLOBAL_LIST_EMPTY(holopads)
hologram.mouse_opacity = MOUSE_OPACITY_TRANSPARENT//So you can't click on it.
hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them.
- hologram.anchored = 1//So space wind cannot drag it.
+ hologram.anchored = TRUE//So space wind cannot drag it.
hologram.name = "[user.name] (hologram)"//If someone decides to right click.
hologram.set_light(2) //hologram lighting
move_hologram()
diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm
index c221a941426..1914a694664 100644
--- a/code/game/machinery/holosign.dm
+++ b/code/game/machinery/holosign.dm
@@ -5,8 +5,8 @@
icon = 'icons/obj/holosign.dmi'
icon_state = "sign_off"
layer = 4
- anchored = 1
- var/lit = 0
+ anchored = TRUE
+ var/lit = FALSE
var/id = null
var/on_icon = "sign_on"
@@ -14,18 +14,17 @@
if(stat & (BROKEN|NOPOWER))
return
lit = !lit
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
-/obj/machinery/holosign/update_icon()
- if(!lit)
- icon_state = "sign_off"
- else
- icon_state = on_icon
+/obj/machinery/holosign/update_icon_state()
+ icon_state = lit ? on_icon : "sign_off"
-/obj/machinery/holosign/power_change()
+/obj/machinery/holosign/power_change(forced = FALSE)
+ if(!..())
+ return
if(stat & NOPOWER)
- lit = 0
- update_icon()
+ lit = FALSE
+ update_icon(UPDATE_ICON_STATE)
/obj/machinery/holosign/surgery
name = "surgery holosign"
@@ -40,7 +39,7 @@
desc = "A remote control switch for holosign."
var/id = null
var/active = 0
- anchored = 1.0
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 2
active_power_usage = 4
@@ -62,10 +61,7 @@
use_power(5)
active = !active
- if(active)
- icon_state = "light1"
- else
- icon_state = "light0"
+ update_icon(UPDATE_ICON_STATE)
for(var/obj/machinery/holosign/M in GLOB.machines)
if(M.id == src.id)
@@ -73,4 +69,7 @@
M.toggle()
return
- return
+
+/obj/machinery/holosign_switch/update_icon_state()
+ icon_state = "light[active]"
+
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index bff3fe9b282..537c149c465 100755
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -7,18 +7,27 @@
max_integrity = 300
armor = list(melee = 50, bullet = 30, laser = 70, energy = 50, bomb = 20, bio = 0, rad = 0, fire = 100, acid = 70)
resistance_flags = FIRE_PROOF
- var/id = null
- var/on = FALSE
anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 2
active_power_usage = 4
+ /// Are we on?
+ var/on = FALSE
+ /// ID to hook buttons into
+ var/id = null
+
/obj/machinery/igniter/on
on = TRUE
+
+/obj/machinery/igniter/Initialize(mapload)
+ . = ..()
+ update_icon()
+
+
/obj/machinery/igniter/attack_ai(mob/user as mob)
- return src.attack_hand(user)
+ return attack_hand(user)
/obj/machinery/igniter/attack_hand(mob/user as mob)
@@ -27,26 +36,44 @@
add_fingerprint(user)
use_power(50)
- src.on = !( src.on )
- src.icon_state = text("igniter[]", src.on)
- return
+ on = !on
+ update_icon()
-/obj/machinery/igniter/process() //ugh why is this even in process()?
- if(src.on && !(stat & NOPOWER) )
- var/turf/location = src.loc
- if(isturf(location))
- location.hotspot_expose(1000,500,1)
- return 1
+ if(on)
+ set_light(1, 1, "#ff821c")
+ else
+ set_light(0)
-/obj/machinery/igniter/New()
- ..()
- icon_state = "igniter[on]"
-/obj/machinery/igniter/power_change()
- if(!( stat & NOPOWER) )
- icon_state = "igniter[src.on]"
- else
+/obj/machinery/igniter/update_icon_state()
+ if(stat & (NOPOWER|BROKEN))
icon_state = "igniter0"
+ return
+ icon_state = "igniter[on]"
+
+
+/obj/machinery/igniter/update_overlays()
+ . = ..()
+ underlays.Cut()
+ if(on)
+ underlays += emissive_appearance(icon, "igniter_lightmask")
+
+
+/obj/machinery/igniter/process() //ugh why is this even in process()? // AA 2022-08-02 - I guess it cant go anywhere else?
+ if(on && !(stat & NOPOWER))
+ var/turf/location = get_turf(src)
+ if(isturf(location))
+ location.hotspot_expose(1000, 500, 1)
+ return TRUE
+
+
+/obj/machinery/igniter/power_change(forced = FALSE)
+ if(!..())
+ return
+ if(stat & NOPOWER)
+ on = FALSE
+ update_icon()
+
// Wall mounted remote-control igniter.
@@ -60,63 +87,65 @@
var/disable = FALSE
var/last_spark = FALSE
var/base_state = "migniter"
- anchored = 1
+ anchored = TRUE
-/obj/machinery/sparker/New()
- ..()
-/obj/machinery/sparker/power_change()
- if( powered() && disable == 0 )
- stat &= ~NOPOWER
+/obj/machinery/sparker/update_icon_state()
+ if(disable)
+ icon_state = "[base_state]-d"
+ else if(powered())
icon_state = "[base_state]"
-// src.sd_set_light(2)
else
- stat |= ~NOPOWER
icon_state = "[base_state]-p"
-// src.sd_set_light(0)
+
+
+/obj/machinery/sparker/power_change(forced = FALSE)
+ if(!..())
+ return
+ update_icon(UPDATE_ICON_STATE)
+
/obj/machinery/sparker/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/detective_scanner))
return
return ..()
+
/obj/machinery/sparker/screwdriver_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
disable = !disable
- if(disable)
- user.visible_message(span_warning("[user] has disabled [src]!"), span_warning("You disable the connection to [src]."))
- icon_state = "[base_state]-d"
- if(!disable)
- user.visible_message(span_warning("[user] has reconnected [src]!"), span_warning("You fix the connection to [src]."))
- if(powered())
- icon_state = "[base_state]"
- else
- icon_state = "[base_state]-p"
+ user.visible_message(
+ span_warning("[user] has [disable ? "disabled" : "reconnected"] [src]!"),
+ span_warning("You [disable ? "disable" : "fix"] the connection to [src]."),
+ )
+ update_icon(UPDATE_ICON_STATE)
+
/obj/machinery/sparker/attack_ai()
- if(src.anchored)
- return src.spark()
- else
- return
+ if(anchored)
+ return spark()
+
/obj/machinery/sparker/proc/spark()
- if(!(powered()))
+ if(!powered())
return
- if((src.disable) || (src.last_spark && world.time < src.last_spark + 50))
+ if(disable || (last_spark && world.time < last_spark + 5 SECONDS))
return
-
flick("[base_state]-spark", src)
do_sparks(2, 1, src)
- src.last_spark = world.time
+ last_spark = world.time
use_power(1000)
- var/turf/location = src.loc
+
+ var/turf/location = get_turf(src)
if(isturf(location))
- location.hotspot_expose(1000,500,1)
- return 1
+ location.hotspot_expose(1000, 500, 1)
+
+ return TRUE
+
/obj/machinery/sparker/emp_act(severity)
if(stat & (BROKEN|NOPOWER))
@@ -124,3 +153,4 @@
return
spark()
..(severity)
+
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index c3698353eec..5a7281ff110 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -11,40 +11,41 @@
/obj/machinery/iv_drip/process()
if(istype(bag) && bag.injection_target)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
return
return PROCESS_KILL
-/obj/machinery/iv_drip/update_icon()
- cut_overlays()
+/obj/machinery/iv_drip/update_overlays()
+ . = ..()
if(bag)
- add_overlay("hangingbag")
+ . += "hangingbag"
if(bag.reagents.total_volume)
var/image/filling = image('icons/goonstation/objects/iv.dmi', src, "hangingbag-fluid")
filling.icon += mix_color_from_reagents(bag.reagents.reagent_list)
- add_overlay(filling)
+ . += filling
-/obj/machinery/iv_drip/MouseDrop(mob/living/target)
- if(usr.incapacitated())
- return
- if(!ishuman(usr) || !iscarbon(target))
- return
+/obj/machinery/iv_drip/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
+ if(usr.incapacitated() || !ishuman(usr) || !ishuman(over_object) || !Adjacent(over_object) || !usr.Adjacent(over_object))
+ return FALSE
+
+ add_fingerprint(usr)
+ if(!bag)
+ to_chat(usr, span_warning("There's no IV bag connected to [src]!"))
+ return FALSE
+ bag.afterattack(over_object, usr, TRUE)
+ START_PROCESSING(SSmachines, src)
- if(Adjacent(target) && usr.Adjacent(target))
- add_fingerprint(usr)
- bag.afterattack(target, usr, TRUE)
- START_PROCESSING(SSmachines, src)
/obj/machinery/iv_drip/attack_hand(mob/user)
if(bag)
add_fingerprint(user)
bag.forceMove_turf()
user.put_in_hands(bag, ignore_anim = FALSE)
- bag.update_icon()
+ bag.update_icon(UPDATE_OVERLAYS)
bag = null
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/machinery/iv_drip/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/reagent_containers/iv_bag))
@@ -57,13 +58,13 @@
add_fingerprint(user)
bag = I
to_chat(user, span_notice("You attach [I] to [src]."))
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
START_PROCESSING(SSmachines, src)
else if (bag && istype(I, /obj/item/reagent_containers))
add_fingerprint(user)
bag.attackby(I)
I.afterattack(bag, usr, TRUE)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else
return ..()
diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
index 80e4efe8f4b..9e0d3387ee5 100644
--- a/code/game/machinery/lightswitch.dm
+++ b/code/game/machinery/lightswitch.dm
@@ -6,17 +6,17 @@
desc = "It turns lights on and off. What are you, simple?"
icon = 'icons/obj/engines_and_power/power.dmi'
icon_state = "light1"
- anchored = 1.0
- var/on = 1
+ anchored = TRUE
+ var/on = TRUE
var/area/area = null
var/otherarea = null
// luminosity = 1
- var/light_connect = 1 //Allows the switch to control lights in its associated areas. When set to 0, using the switch won't affect the lights.
+ var/light_connect = TRUE //Allows the switch to control lights in its associated areas. When set to 0, using the switch won't affect the lights.
var/logic_id_tag = "default" //Defines the ID tag to send logic signals to.
var/logic_connect = 0 //Set this to allow the switch to send out logic signals.
-/obj/machinery/light_switch/New(turf/loc, var/w_dir=null)
+/obj/machinery/light_switch/New(turf/loc, w_dir)
..()
switch(w_dir)
if(NORTH)
@@ -27,29 +27,30 @@
pixel_x = 25
if(WEST)
pixel_x = -25
- if(SSradio)
- set_frequency(frequency)
- spawn(5)
- src.area = get_area(src)
- if(otherarea)
- src.area = locate(text2path("/area/[otherarea]"))
- if(!name)
- name = "light switch([area.name])"
+/obj/machinery/light_switch/Initialize(mapload)
+ . = ..()
+ set_frequency(frequency)
+
+ if(otherarea)
+ area = locate(text2path("/area/[otherarea]"))
+ else
+ area = get_area(src)
+
+ if(!name)
+ name = "light switch([area.name])"
- src.on = src.area.lightswitch
- updateicon()
+ on = area.lightswitch
+ light_switch_light()
+ update_icon()
-/obj/machinery/light_switch/Initialize()
- ..()
- set_frequency(frequency)
/obj/machinery/light_switch/set_frequency(new_frequency)
SSradio.remove_object(src, frequency)
frequency = new_frequency
radio_connection = SSradio.add_object(src, frequency, RADIO_LOGIC)
- return
+
/obj/machinery/light_switch/Destroy()
if(SSradio)
@@ -57,43 +58,62 @@
radio_connection = null
return ..()
-/obj/machinery/light_switch/proc/updateicon()
+
+/obj/machinery/light_switch/proc/light_switch_light()
if(stat & (NOPOWER|BROKEN))
- icon_state = "light-p"
set_light(0)
- else
- if(on)
- icon_state = "light1"
- else
- icon_state = "light0"
- set_light(2, 0.3, on ? COLOR_APC_GREEN : COLOR_APC_RED)
+ return
+ set_light(1, LIGHTING_MINIMUM_POWER, on ? COLOR_APC_GREEN : COLOR_APC_RED)
+
+
+/obj/machinery/light_switch/update_icon_state()
+ if(stat & NOPOWER)
+ icon_state = "light-p"
+ return
+ icon_state = "light[on]"
+
+
+/obj/machinery/light_switch/update_overlays()
+ . = ..()
+ underlays.Cut()
+
+ if(stat & NOPOWER)
+ return
+ underlays += emissive_appearance(icon, "light_lightmask")
+
/obj/machinery/light_switch/examine(mob/user)
. = ..()
. += span_notice("A light switch. It is [on? "on" : "off"].")
+
/obj/machinery/light_switch/attack_ghost(mob/user)
if(user.can_advanced_admin_interact())
return attack_hand(user)
+
/obj/machinery/light_switch/attack_hand(mob/user)
+ playsound(src, 'sound/machines/lightswitch.ogg', 10, TRUE)
add_fingerprint(user)
on = !on
- updateicon()
+ light_switch_light()
+ update_icon()
- if(light_connect)
+
+ if(light_connect && area)
area.lightswitch = on
- area.updateicon()
+ area.update_icon(UPDATE_ICON_STATE)
if(logic_connect && powered(LIGHT)) //Don't bother sending a signal if we aren't set to send them or we have no power to send with.
handle_output()
if(light_connect)
- for(var/obj/machinery/light_switch/L in area.machinery_cache)
- L.on = on
- L.updateicon()
+ for(var/obj/machinery/light_switch/light_switch in area.machinery_cache)
+ light_switch.on = on
+ light_switch.light_switch_light()
+ light_switch.update_icon()
+ area?.power_change()
- area.power_change()
/obj/machinery/light_switch/proc/handle_output()
if(!radio_connection) //can't output without this
@@ -124,14 +144,14 @@
if(on)
use_power(5, LIGHT) //Use a tiny bit of power every time we send an ON signal. Draws from the local APC's lighting circuit, since this is a LIGHT switch.
-/obj/machinery/light_switch/power_change()
- if(!otherarea)
- if(powered(LIGHT))
- stat &= ~NOPOWER
- else
- stat |= NOPOWER
- updateicon()
+/obj/machinery/light_switch/power_change(forced = FALSE)
+ if(!..() || !otherarea)
+ return
+
+ light_switch_light()
+ update_icon()
+
/obj/machinery/light_switch/emp_act(severity)
if(stat & (BROKEN|NOPOWER))
@@ -144,7 +164,7 @@
if(logic_connect && powered(LIGHT)) //We won't send signals while unpowered, but the last signal will remain valid for anything that received it before we went dark
handle_output()
-/obj/machinery/light_switch/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/machinery/light_switch/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/detective_scanner))
return
return ..()
@@ -154,7 +174,6 @@
if(!I.tool_use_check(user, 0))
return
user.visible_message(span_notice("[user] starts unwrenching [src] from the wall..."), span_notice("You are unwrenching [src] from the wall..."), span_warning("You hear ratcheting."))
- . = TRUE
if(!I.use_tool(src, user, 30, volume = I.tool_volume))
return
WRENCH_UNANCHOR_WALL_MESSAGE
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index cd4329fbde6..d9e404216a9 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -143,6 +143,7 @@ Class Procs:
/obj/machinery/proc/flicker()
return FALSE
+
/obj/machinery/Initialize(mapload)
if(!armor)
armor = list(melee = 25, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70)
@@ -151,7 +152,7 @@ Class Procs:
myArea = get_area(src)
if(myArea)
- RegisterSignal(myArea, COMSIG_AREA_EXITED, PROC_REF(onAreaExited))
+ RegisterSignal(src, COMSIG_ATOM_EXITED_AREA, PROC_REF(onAreaExited))
LAZYADD(myArea.machinery_cache, src)
if(!speed_process)
@@ -163,16 +164,17 @@ Class Procs:
init_multitool_menu()
+
/obj/machinery/proc/onAreaExited()
+ SIGNAL_HANDLER
if(myArea == get_area(src))
return
-
LAZYREMOVE(myArea.machinery_cache, src)
- UnregisterSignal(myArea, COMSIG_AREA_EXITED)
//message_admins("[src] exited [myArea]") Uncomment for debugging
myArea = get_area(src)
- RegisterSignal(myArea, COMSIG_AREA_EXITED, PROC_REF(onAreaExited))
- LAZYADDOR(myArea.machinery_cache, src)
+ if(!myArea)
+ return
+ LAZYADD(myArea.machinery_cache, src)
//message_admins("[src] entered [myArea]")
power_change()
@@ -199,6 +201,7 @@ Class Procs:
if(myArea)
LAZYREMOVE(myArea.machinery_cache, src)
myArea = null
+ UnregisterSignal(src, COMSIG_ATOM_EXITED_AREA)
GLOB.machines.Remove(src)
if(!speed_process)
STOP_PROCESSING(SSmachines, src)
@@ -289,7 +292,7 @@ Class Procs:
else
return attack_hand(user)
-/obj/machinery/attack_hand(mob/user as mob)
+/obj/machinery/attack_hand(mob/user)
if(istype(user, /mob/dead/observer))
return FALSE
@@ -351,8 +354,8 @@ Class Procs:
if(!disassembled)
M.obj_integrity = M.max_integrity * 0.5 //the frame is already half broken
transfer_fingerprints_to(M)
- M.state = 2
- M.icon_state = "box_1"
+ M.state = 2 // STATE_WIRED
+ M.update_icon(UPDATE_ICON_STATE)
/obj/machinery/obj_break(damage_flag)
if(!(flags & NODECONSTRUCT))
@@ -376,14 +379,18 @@ Class Procs:
if(!I.use_tool(src, user, 0, volume = 0))
return FALSE
if(!(flags & NODECONSTRUCT))
+ var/prev_icon_state = icon_state
if(!panel_open)
- panel_open = 1
+ panel_open = TRUE
icon_state = icon_state_open
to_chat(user, span_notice("You open the maintenance hatch of [src]."))
else
- panel_open = 0
+ panel_open = FALSE
icon_state = icon_state_closed
to_chat(user, span_notice("You close the maintenance hatch of [src]."))
+ if(prev_icon_state != icon_state)
+ SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_ICON_STATE)
+ SEND_SIGNAL(src, COMSIG_ATOM_UPDATED_ICON, UPDATE_ICON_STATE)
I.play_tool_sound(user, I.tool_volume)
return 1
return 0
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index 01995956d64..8bd5e7dc1f2 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -1,3 +1,12 @@
+#define MIN_CONTROLLER_SPEED 1
+#define MAX_CONTROLLER_SPEED 10
+#define MIN_ELECTRICITY_LEVEL 1
+#define MAX_ELECTRICITY_LEVEL 12
+#define MIN_MAGNETIC_FIELD 1
+#define MAX_MAGNETIC_FIELD 4
+#define MAX_PATH_LENGTH 50
+
+
// Magnetic attractor, creates variable magnetic fields and attraction.
// Can also be used to emit electron/proton beams to create a center of magnetism on another tile
@@ -5,62 +14,59 @@
// This was created for firing ranges, but I suppose this could have other applications - Doohl
/obj/machinery/magnetic_module
-
icon = 'icons/obj/objects.dmi'
icon_state = "floor_magnet-f"
name = "Electromagnetic Generator"
desc = "A device that uses station power to create points of magnetic energy."
level = 1 // underfloor
layer = WIRE_LAYER+0.001
- anchored = 1
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 50
-
- var/freq = AIRLOCK_FREQ // radio frequency
- var/electricity_level = 1 // intensity of the magnetic pull
- var/magnetic_field = 1 // the range of magnetic attraction
- var/code = 0 // frequency code, they should be different unless you have a group of magnets working together or something
- var/turf/center // the center of magnetic attraction
- var/on = 0
- var/magpulling = 0
+ /// Radio frequency
+ var/freq = AIRLOCK_FREQ
+ /// Intensity of the magnetic pull
+ var/electricity_level = MIN_ELECTRICITY_LEVEL
+ /// The range of magnetic attraction
+ var/magnetic_field = MIN_MAGNETIC_FIELD
+ /// Frequency code, they should be different unless you have a group of magnets working together or something
+ var/code = 0
+ /// The center of magnetic attraction
+ var/turf/center
+ var/on = FALSE
+ var/magpulling = FALSE
// x, y modifiers to the center turf; (0, 0) is centered on the magnet, whereas (1, -1) is one tile right, one tile down
var/center_x = 0
var/center_y = 0
- var/max_dist = 20 // absolute value of center_x,y cannot exceed this integer
+ /// absolute value of center_x,y cannot exceed this integer
+ var/max_dist = 20
+
-/obj/machinery/magnetic_module/New()
+/obj/machinery/magnetic_module/Initialize(mapload)
..()
var/turf/T = loc
if(!T.transparent_floor)
hide(T.intact)
- hide(T.intact)
center = T
- spawn(10) // must wait for map loading to finish
- if(SSradio)
- SSradio.add_object(src, freq, RADIO_MAGNETS)
+ SSradio.add_object(src, freq, RADIO_MAGNETS)
+
+ INVOKE_ASYNC(src, PROC_REF(magnetic_process))
- spawn()
- magnetic_process()
// update the invisibility and icon
/obj/machinery/magnetic_module/hide(intact)
- invisibility = intact ? INVISIBILITY_ABSTRACT : 0
- updateicon()
+ invisibility = intact ? INVISIBILITY_MAXIMUM : 0
+ update_icon(UPDATE_ICON_STATE)
+
// update the icon_state
-/obj/machinery/magnetic_module/proc/updateicon()
- var/state="floor_magnet"
- var/onstate=""
- if(!on)
- onstate="0"
-
- if(invisibility)
- icon_state = "[state][onstate]-f" // if invisible, set icon to faded version
- // in case of being revealed by T-scanner
- else
- icon_state = "[state][onstate]"
+/obj/machinery/magnetic_module/update_icon_state()
+ // if invisible, set icon to faded version
+ // in case of being revealed by T-scanner
+ icon_state = "floor_magnet[on ? "" : "0"][invisibility ? "-f" : ""]"
+
/obj/machinery/magnetic_module/receive_signal(datum/signal/signal)
var/command = signal.data["command"]
@@ -70,36 +76,38 @@
Cmd(command, modifier)
-
-/obj/machinery/magnetic_module/proc/Cmd(var/command, var/modifier)
+/obj/machinery/magnetic_module/proc/Cmd(command, modifier)
if(command)
switch(command)
if("set-electriclevel")
- if(modifier) electricity_level = modifier
+ if(modifier)
+ electricity_level = modifier
if("set-magneticfield")
- if(modifier) magnetic_field = modifier
-
+ if(modifier)
+ magnetic_field = modifier
if("add-elec")
electricity_level++
- if(electricity_level > 12)
- electricity_level = 12
+ if(electricity_level > MAX_ELECTRICITY_LEVEL)
+ electricity_level = MAX_ELECTRICITY_LEVEL
if("sub-elec")
electricity_level--
- if(electricity_level <= 0)
- electricity_level = 1
+ if(electricity_level < MIN_ELECTRICITY_LEVEL)
+ electricity_level = MIN_ELECTRICITY_LEVEL
if("add-mag")
magnetic_field++
- if(magnetic_field > 4)
- magnetic_field = 4
+ if(magnetic_field > MAX_MAGNETIC_FIELD)
+ magnetic_field = MAX_MAGNETIC_FIELD
if("sub-mag")
magnetic_field--
- if(magnetic_field <= 0)
- magnetic_field = 1
+ if(magnetic_field < MIN_MAGNETIC_FIELD)
+ magnetic_field = MIN_MAGNETIC_FIELD
if("set-x")
- if(modifier) center_x = modifier
+ if(modifier)
+ center_x = modifier
if("set-y")
- if(modifier) center_y = modifier
+ if(modifier)
+ center_y = modifier
if("N") // NORTH
center_y++
@@ -120,100 +128,112 @@
if(modifier) code = modifier
if("toggle-power")
on = !on
-
if(on)
- spawn()
- magnetic_process()
+ INVOKE_ASYNC(src, PROC_REF(magnetic_process))
+
/obj/machinery/magnetic_module/process()
if(stat & NOPOWER)
- on = 0
+ on = FALSE
// Sanity checks:
- if(electricity_level <= 0)
- electricity_level = 1
- if(magnetic_field <= 0)
- magnetic_field = 1
-
+ if(electricity_level < MIN_ELECTRICITY_LEVEL)
+ electricity_level = MIN_ELECTRICITY_LEVEL
+ if(magnetic_field < MIN_MAGNETIC_FIELD)
+ magnetic_field = MIN_MAGNETIC_FIELD
// Limitations:
if(abs(center_x) > max_dist)
center_x = max_dist
if(abs(center_y) > max_dist)
center_y = max_dist
- if(magnetic_field > 4)
- magnetic_field = 4
- if(electricity_level > 12)
- electricity_level = 12
+ if(magnetic_field > MAX_MAGNETIC_FIELD)
+ magnetic_field = MAX_MAGNETIC_FIELD
+ if(electricity_level > MAX_ELECTRICITY_LEVEL)
+ electricity_level = MAX_ELECTRICITY_LEVEL
// Update power usage:
if(on)
- use_power = 2
- active_power_usage = electricity_level*15
+ use_power = ACTIVE_POWER_USE
+ active_power_usage = electricity_level * 15
else
- use_power = 0
- updateicon()
+ use_power = NO_POWER_USE
+ update_icon(UPDATE_ICON_STATE)
-/obj/machinery/magnetic_module/proc/magnetic_process() // proc that actually does the pulling
- if(magpulling) return
- while(on)
+// proc that actually does the pulling
+/obj/machinery/magnetic_module/proc/magnetic_process()
+ if(magpulling)
+ return
- magpulling = 1
+ while(on)
+ magpulling = TRUE
center = locate(x+center_x, y+center_y, z)
if(center)
- for(var/obj/M in orange(magnetic_field, center))
- if(!M.anchored && (M.flags & CONDUCT))
- step_towards(M, center)
+ for(var/obj/object in orange(magnetic_field, center))
+ if(!object.anchored && (object.flags & CONDUCT))
+ step_towards(object, center)
- for(var/mob/living/silicon/S in orange(magnetic_field, center))
- if(istype(S, /mob/living/silicon/ai)) continue
- step_towards(S, center)
+ for(var/mob/living/silicon/silicon in orange(magnetic_field, center))
+ if(isAI(silicon))
+ continue
+ step_towards(silicon, center)
use_power(electricity_level * 5)
- sleep(13 - electricity_level)
+ sleep(1.3 SECONDS - electricity_level)
+
+ magpulling = FALSE
- magpulling = 0
/obj/machinery/magnetic_controller
name = "Magnetic Control Console"
icon = 'icons/obj/machines/airlock_machines.dmi' // uses an airlock machine icon, THINK GREEN HELP THE ENVIRONMENT - RECYCLING!
icon_state = "airlock_control_standby"
- density = 1
- anchored = 1.0
+ density = TRUE
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 45
frequency = AIRLOCK_FREQ
var/code = 0
var/list/magnets = list()
var/title = "Magnetic Control Console"
- var/autolink = 0 // if set to 1, can't probe for other magnets!
+ /// If set to TRUE, can't probe for other magnets!
+ var/autolink = FALSE
+ var/probing = FALSE
- var/pathpos = 1 // position in the path
- var/path = "NULL" // text path of the magnet
- var/speed = 1 // lowest = 1, highest = 10
- var/list/rpath = list() // real path of the magnet, used in iterator
+ /// Position in the path
+ var/pathpos = 1
+ /// Text path of the magnet
+ var/path = "NULL"
+ var/speed = MIN_CONTROLLER_SPEED
+ /// Real path of the magnet, used in iterator
+ var/list/rpath = list()
+ var/static/list/valid_paths = list("n", "s", "e", "w", "c", "r")
- var/moving = 0 // 1 if scheduled to loop
- var/looping = 0 // 1 if looping
+ /// TRUE if scheduled to loop
+ var/moving = FALSE
+ /// TRUE if looping
+ var/looping = FALSE
-/obj/machinery/magnetic_controller/New()
- ..()
+/obj/machinery/magnetic_controller/Initialize(mapload)
+ . = ..()
- if(autolink)
- for(var/obj/machinery/magnetic_module/M in GLOB.machines)
- if(M.freq == frequency && M.code == code)
- magnets.Add(M)
+ radio_connection = SSradio.add_object(src, frequency, RADIO_MAGNETS)
+ if(path) // check for default path
+ filter_path() // renders rpath
- spawn(45) // must wait for map loading to finish
- if(SSradio)
- radio_connection = SSradio.add_object(src, frequency, RADIO_MAGNETS)
+ if(autolink)
+ return INITIALIZE_HINT_LATELOAD
- if(path) // check for default path
- filter_path() // renders rpath
+/obj/machinery/magnetic_controller/LateInitialize()
+ ..()
+ if(autolink)
+ // GLOB.machines is populated in /machinery/Initialize
+ // so linkage gets delayed until that one finished.
+ link_magnets()
/obj/machinery/magnetic_controller/Destroy()
@@ -222,15 +242,30 @@
radio_connection = null
return ..()
+
+/obj/machinery/magnetic_controller/proc/link_magnets()
+ magnets = list()
+ for(var/obj/machinery/magnetic_module/module in GLOB.machines)
+ if(module.freq == frequency && module.code == code)
+ magnets += module
+ RegisterSignal(module, COMSIG_PARENT_QDELETING, PROC_REF(on_magnet_del), TRUE)
+
+
+/obj/machinery/magnetic_controller/proc/on_magnet_del(magnet)
+ SIGNAL_HANDLER
+ magnets -= magnet
+
+
/obj/machinery/magnetic_controller/process()
- if(magnets.len == 0 && autolink)
- for(var/obj/machinery/magnetic_module/M in GLOB.machines)
- if(M.freq == frequency && M.code == code)
- magnets.Add(M)
+ if(!length(magnets) && autolink)
+ for(var/obj/machinery/magnetic_module/module in GLOB.machines)
+ if(module.freq == frequency && module.code == code)
+ magnets += module
/obj/machinery/magnetic_controller/attack_ai(mob/user as mob)
- return src.attack_hand(user)
+ return attack_hand(user)
+
/obj/machinery/magnetic_controller/attack_hand(mob/user as mob)
if(stat & (BROKEN|NOPOWER))
@@ -244,13 +279,13 @@
Probe Generators[line2]
"} - if(magnets.len >= 1) + if(length(magnets)) dat += "Magnets confirmed:
" var/i = 0 - for(var/obj/machinery/magnetic_module/M in magnets) + for(var/obj/machinery/magnetic_module/module as anything in magnets) i++ - dat += " < \[[i]\] ([M.on ? "On":"Off"]) | Electricity level: - [M.electricity_level] +; Magnetic field: - [M.magnetic_field] +
" + dat += " < \[[i]\] ([module.on ? "On":"Off"]) | Electricity level: - [module.electricity_level] +; Magnetic field: - [module.magnetic_field] +
" add_fingerprint(user) dat += "
Speed: - [speed] +
" @@ -261,6 +296,7 @@ user << browse(dat, "window=magnet;size=400x500") onclose(user, "magnet") + /obj/machinery/magnetic_controller/Topic(href, href_list) if(stat & (BROKEN|NOPOWER)) return @@ -295,9 +331,7 @@ // Broadcast the signal radio_connection.post_signal(src, signal, filter = RADIO_MAGNETS) - - spawn(1) - updateUsrDialog() // pretty sure this increases responsiveness + addtimer(CALLBACK(src, TYPE_PROC_REF(/obj, updateUsrDialog)), 0.1 SECONDS) // pretty sure this increases responsiveness if(href_list["operation"]) switch(href_list["operation"]) @@ -312,7 +346,7 @@ if("setpath") var/newpath = sanitize(copytext_char(input(usr, "Please define a new path!",,path) as text|null,1,MAX_MESSAGE_LEN)) if(newpath && newpath != "") - moving = 0 // stop moving + moving = FALSE // stop moving path = newpath pathpos = 1 // reset position filter_path() // renders rpath @@ -320,20 +354,21 @@ if("togglemoving") moving = !moving if(moving) - spawn() MagnetMove() - + INVOKE_ASYNC(src, PROC_REF(MagnetMove)) updateUsrDialog() + /obj/machinery/magnetic_controller/proc/MagnetMove() - if(looping) return + if(looping) + return - while(moving && rpath.len >= 1) + while(moving && length(rpath) >= 1) if(stat & (BROKEN|NOPOWER)) break - looping = 1 + looping = TRUE // Prepare the radio signal var/datum/signal/signal = new @@ -342,7 +377,7 @@ signal.frequency = frequency signal.data["code"] = code - if(pathpos > rpath.len) // if the position is greater than the length, we just loop through the list! + if(pathpos > length(rpath)) // if the position is greater than the length, we just loop through the list! pathpos = 1 var/nextmove = uppertext(rpath[pathpos]) // makes it un-case-sensitive @@ -356,26 +391,24 @@ signal.data["command"] = nextmove - pathpos++ // increase iterator // Broadcast the signal - spawn() - radio_connection.post_signal(src, signal, filter = RADIO_MAGNETS) + INVOKE_ASYNC(radio_connection, TYPE_PROC_REF(/datum/radio_frequency, post_signal), src, signal, RADIO_MAGNETS) if(speed == 10) sleep(1) else sleep(12-speed) - looping = 0 + looping = FALSE /obj/machinery/magnetic_controller/proc/filter_path() // Generates the rpath variable using the path string, think of this as "string2list" // Doesn't use params2list() because of the akward way it stacks entities rpath = list() // clear rpath - var/maximum_character = min( 50, length(path) ) // chooses the maximum length of the iterator. 50 max length + var/maximum_character = min(MAX_PATH_LENGTH, length(path) ) // chooses the maximum length of the iterator. 50 max length for(var/i=1, i<=maximum_character, i++) // iterates through all characters in path @@ -385,3 +418,13 @@ rpath += copytext(path, i, i+1) // else, add to list // there doesn't HAVE to be separators but it makes paths syntatically visible + + +#undef MIN_CONTROLLER_SPEED +#undef MAX_CONTROLLER_SPEED +#undef MIN_ELECTRICITY_LEVEL +#undef MAX_ELECTRICITY_LEVEL +#undef MIN_MAGNETIC_FIELD +#undef MAX_MAGNETIC_FIELD +#undef MAX_PATH_LENGTH + diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 22405f41daf..6dd86395959 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -3,7 +3,7 @@ desc = "Shoots things into space." icon = 'icons/obj/objects.dmi' icon_state = "mass_driver" - anchored = 1.0 + anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 50 @@ -27,7 +27,7 @@ if(do_after(user, 30 * I.toolspeed * gettoolspeedmod(user), target = src)) var/obj/machinery/mass_driver_frame/F = new(get_turf(src)) F.dir = dir - F.anchored = 1 + F.anchored = TRUE F.build = 4 F.update_icon() qdel(src) @@ -90,30 +90,30 @@ icon = 'icons/obj/objects.dmi' icon_state = "mass_driver_frame" density = 0 - anchored = 0 + anchored = FALSE var/build = 0 /obj/machinery/mass_driver_frame/attackby(var/obj/item/W as obj, var/mob/user as mob) switch(build) if(0) // Loose frame - if(istype(W, /obj/item/wrench)) + if(W.tool_behaviour == TOOL_WRENCH) to_chat(user, "You begin to anchor \the [src] on the floor.") playsound(get_turf(src), W.usesound, 50, 1) if(do_after(user, 10 * W.toolspeed * gettoolspeedmod(user), target = src) && (build == 0)) add_fingerprint(user) to_chat(user, span_notice("You anchor \the [src]!")) - anchored = 1 + anchored = TRUE build++ return 1 return if(1) // Fixed to the floor - if(istype(W, /obj/item/wrench)) + if(W.tool_behaviour == TOOL_WRENCH) to_chat(user, "You begin to de-anchor \the [src] from the floor.") playsound(get_turf(src), W.usesound, 50, 1) if(do_after(user, 10 * W.toolspeed * gettoolspeedmod(user), target = src) && (build == 1)) add_fingerprint(user) build-- - anchored = 0 + anchored = FALSE to_chat(user, span_notice("You de-anchored \the [src]!")) return 1 if(2) // Welded to the floor @@ -128,7 +128,7 @@ build++ return if(3) // Wired - if(istype(W, /obj/item/wirecutters)) + if(W.tool_behaviour == TOOL_WIRECUTTER) to_chat(user, "You begin to remove the wiring from \the [src].") if(do_after(user, 10 * W.toolspeed * gettoolspeedmod(user), target = src) && (build == 3)) add_fingerprint(user) @@ -149,7 +149,7 @@ return 1 return if(4) // Grille in place - if(istype(W, /obj/item/crowbar)) + if(W.tool_behaviour == TOOL_CROWBAR) to_chat(user, "You begin to pry off the grille from \the [src]...") playsound(get_turf(src), W.usesound, 50, 1) if(do_after(user, 30 * W.toolspeed * gettoolspeedmod(user), target = src) && (build == 4)) @@ -157,7 +157,7 @@ new /obj/item/stack/rods(loc,2) build-- return 1 - if(istype(W, /obj/item/screwdriver)) + if(W.tool_behaviour == TOOL_SCREWDRIVER) add_fingerprint(user) to_chat(user, "You finalize the Mass Driver...") playsound(get_turf(src), W.usesound, 50, 1) diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 881acfeae39..dc247487346 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -10,7 +10,7 @@ level = 1 // underfloor layer = WIRE_LAYER plane = FLOOR_PLANE - anchored = 1 + anchored = TRUE max_integrity = 500 armor = list(melee = 70, bullet = 70, laser = 70, energy = 70, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80) var/open = 0 // true if cover is open @@ -76,32 +76,22 @@ // hide the object if turf is intact /obj/machinery/navbeacon/hide(intact) invisibility = intact ? INVISIBILITY_MAXIMUM : 0 - updateicon() + update_icon(UPDATE_ICON_STATE) + // update the icon_state -/obj/machinery/navbeacon/proc/updateicon() - var/state="navbeacon[open]" +/obj/machinery/navbeacon/update_icon_state() + // if invisible, set icon to faded version + // in case revealed by T-scanner + icon_state = "navbeacon[open][invisibility ? "-f" : ""]" - if(invisibility) - icon_state = "[state]-f" // if invisible, set icon to faded version - // in case revealed by T-scanner - else - icon_state = "[state]" /obj/machinery/navbeacon/attackby(obj/item/I, mob/user, params) var/turf/T = loc if(T.intact) return // prevent intraction when T-scanner revealed - if(istype(I, /obj/item/screwdriver)) - add_fingerprint(user) - open = !open - - user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", span_notice("You [open ? "open" : "close"] the beacon's cover.")) - - updateicon() - - else if(I.GetID()) + if(I.GetID()) if(open) if(allowed(user)) add_fingerprint(user) @@ -115,6 +105,20 @@ else return ..() + +/obj/machinery/navbeacon/screwdriver_act(mob/living/user, obj/item/I) + var/turf/T = get_turf(src) + if(T.intact) + return FALSE + open = !open + user.visible_message( + "[user] [open ? "opens" : "closes"] the beacon's cover.", + span_notice("You [open ? "open" : "close"] the beacon's cover."), + ) + update_icon(UPDATE_ICON_STATE) + return TRUE + + /obj/machinery/navbeacon/attack_ai(mob/user) interact(user, 1) @@ -123,7 +127,7 @@ interact(user, 0) /obj/machinery/navbeacon/interact(mob/user, ai = 0) - var/turf/T = loc + var/turf/T = get_turf(src) if(T.intact) return // prevent intraction when T-scanner revealed @@ -220,8 +224,8 @@ Transponder Codes:
- "}
/obj/machinery/navbeacon/invisible
- invisibility = INVISIBILITY_MAXIMUM
+ invisibility = INVISIBILITY_ABSTRACT
/obj/machinery/navbeacon/invisible/hide(intact)
- invisibility = INVISIBILITY_MAXIMUM
- updateicon()
+ invisibility = INVISIBILITY_ABSTRACT
+ update_icon(UPDATE_ICON_STATE)
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index e5c4a71290d..7e842e4225c 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -522,7 +522,7 @@
w_class = WEIGHT_CLASS_BULKY
/obj/item/pipe_meter/attackby(var/obj/item/W as obj, var/mob/user as mob, params)
- if(!istype(W, /obj/item/wrench))
+ if(W.tool_behaviour != TOOL_WRENCH)
return ..()
if(!locate(/obj/machinery/atmospherics/pipe, src.loc))
to_chat(user, span_warning("You need to fasten it to a pipe"))
@@ -548,7 +548,7 @@
w_class = WEIGHT_CLASS_BULKY
/obj/item/pipe_gsensor/attackby(var/obj/item/W as obj, var/mob/user as mob)
- if(!istype(W, /obj/item/wrench))
+ if(!W.tool_behaviour == TOOL_WRENCH)
return ..()
var/obj/machinery/atmospherics/air_sensor/sensor = new(loc)
sensor.add_fingerprint(user)
diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
index 14cf12c074f..b3231773dbb 100644
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -102,7 +102,7 @@
user.drop_transfer_item_to_loc(W, src)
qdel(W)
return
- else if(istype(W, /obj/item/wrench))
+ else if(W.tool_behaviour == TOOL_WRENCH)
if(unwrenched==0)
playsound(loc, W.usesound, 50, 1)
to_chat(user, span_notice("You begin to unfasten \the [src] from the floor..."))
@@ -111,7 +111,7 @@
"[user] unfastens \the [src].", \
span_notice("You have unfastened \the [src]. Now it can be pulled somewhere else."), \
"You hear ratchet.")
- anchored = 0
+ anchored = FALSE
stat |= MAINT
unwrenched = 1
if(usr.machine==src)
@@ -124,7 +124,7 @@
"[user] fastens \the [src].", \
span_notice("You have fastened \the [src]. Now it can dispense pipes."), \
"You hear ratchet.")
- anchored = 1
+ anchored = TRUE
stat &= ~MAINT
unwrenched = 0
power_change()
@@ -138,17 +138,18 @@
icon_state = "pipe_d"
//Allow you to drag-drop disposal pipes into it
-/obj/machinery/pipedispenser/disposal/MouseDrop_T(var/obj/structure/disposalconstruct/pipe, mob/usr)
- if(usr.incapacitated())
+/obj/machinery/pipedispenser/disposal/MouseDrop_T(obj/structure/disposalconstruct/pipe, mob/user, params)
+ if(user.incapacitated())
return
- if(!istype(pipe) || get_dist(usr, src) > 1 || get_dist(src, pipe) > 1 )
+ if(!istype(pipe) || get_dist(user, src) > 1 || get_dist(src, pipe) > 1 )
return
if(pipe.anchored)
return
qdel(pipe)
+ return TRUE
/obj/machinery/pipedispenser/disposal/attack_hand(mob/user)
if(..())
diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm
index db8c24b2fbc..26fae76f1c3 100644
--- a/code/game/machinery/poolcontroller.dm
+++ b/code/game/machinery/poolcontroller.dm
@@ -9,7 +9,7 @@
desc = "A controller for the nearby pool."
icon = 'icons/obj/machines/airlock_machines.dmi'
icon_state = "airlock_control_standby"
- anchored = 1 //this is what I get for assuming /obj/machinery has anchored set to 1 by default
+ anchored = TRUE //this is what I get for assuming /obj/machinery has anchored set to 1 by default
var/list/linkedturfs = list() //List contains all of the linked pool turfs to this controller, assignment happens on New()
var/mobinpool = list() //List contains all of the mob in the pool, to prevent looping through the entire area to find mobs inside..
var/decalinpool = list() // List containing all of the cleanable decals in pool
@@ -20,7 +20,7 @@
var/deep_water = FALSE //set to 1 to drown even standing people
/obj/machinery/poolcontroller/invisible
- invisibility = INVISIBILITY_MAXIMUM
+ invisibility = INVISIBILITY_ABSTRACT
name = "Water Controller"
desc = "An invisible water controller. Players shouldn't see this."
diff --git a/code/game/machinery/portable_tag_turret.dm b/code/game/machinery/portable_tag_turret.dm
index 562db4074f3..4edc5fc4162 100644
--- a/code/game/machinery/portable_tag_turret.dm
+++ b/code/game/machinery/portable_tag_turret.dm
@@ -37,7 +37,7 @@
)
return data
-/obj/machinery/porta_turret/tag/update_icon()
+/obj/machinery/porta_turret/tag/update_icon_state()
if(!anchored)
icon_state = "turretCover"
return
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index e2774ae3aef..18c3e40fb49 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -153,8 +153,10 @@
eprojectile = /obj/item/projectile/beam/pulse
eshot_sound = 'sound/weapons/pulse.ogg'
+
GLOBAL_LIST_EMPTY(turret_icons)
-/obj/machinery/porta_turret/update_icon()
+
+/obj/machinery/porta_turret/update_icon_state()
if(!GLOB.turret_icons)
GLOB.turret_icons = list()
GLOB.turret_icons["open"] = image(icon, "openTurretCover")
@@ -303,19 +305,16 @@ GLOBAL_LIST_EMPTY(turret_icons)
req_access = list()
check_one_access = !check_one_access
-/obj/machinery/porta_turret/power_change()
- if(powered() || !use_power)
- stat &= ~NOPOWER
- update_icon()
- else
- spawn(rand(0, 15))
- stat |= NOPOWER
- update_icon()
+
+/obj/machinery/porta_turret/power_change(forced = FALSE)
+ if(!..())
+ return
+ update_icon(UPDATE_ICON_STATE)
/obj/machinery/porta_turret/attackby(obj/item/I, mob/user)
if((stat & BROKEN) && !syndicate)
- if(istype(I, /obj/item/crowbar))
+ if(I.tool_behaviour == TOOL_CROWBAR)
//If the turret is destroyed, you can remove it with a crowbar to
//try and salvage its components
to_chat(user, span_notice("You begin prying the metal coverings off."))
@@ -334,7 +333,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
to_chat(user, span_notice("You remove the turret but did not manage to salvage anything."))
qdel(src) // qdel
- else if((istype(I, /obj/item/wrench)))
+ else if(I.tool_behaviour == TOOL_WRENCH)
if(enabled || raised)
to_chat(user, span_warning("You cannot unsecure an active turret!"))
return
@@ -352,18 +351,12 @@ GLOBAL_LIST_EMPTY(turret_icons)
wrenching = TRUE
if(do_after(user, 50 * I.toolspeed * gettoolspeedmod(user), target = src))
- add_fingerprint(user)
//This code handles moving the turret around. After all, it's a portable turret!
- if(!anchored)
- playsound(loc, I.usesound, 100, 1)
- anchored = TRUE
- update_icon()
- to_chat(user, span_notice("You secure the exterior bolts on the turret."))
- else if(anchored)
- playsound(loc, I.usesound, 100, 1)
- anchored = FALSE
- to_chat(user, span_notice("You unsecure the exterior bolts on the turret."))
- update_icon()
+ add_fingerprint(user)
+ playsound(loc, I.usesound, 100, TRUE)
+ anchored = !anchored
+ update_icon(UPDATE_ICON_STATE)
+ to_chat(user, "You [anchored ? "" : "un"]secure the exterior bolts on the turret.")
wrenching = FALSE
else if(I.GetID() || ispda(I))
@@ -490,7 +483,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
stat |= BROKEN //enables the BROKEN bit
if(spark_system)
spark_system.start() //creates some sparks because they look cool
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/machinery/porta_turret/process()
//the main machinery process
@@ -640,7 +633,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
return
set_raised_raising(raised, TRUE)
playsound(get_turf(src), 'sound/effects/turret/open.wav', 60, 1)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
var/atom/flick_holder = new /atom/movable/porta_turret_cover(loc)
flick_holder.layer = layer + 0.1
@@ -649,7 +642,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
qdel(flick_holder)
set_raised_raising(TRUE, FALSE)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/machinery/porta_turret/proc/popDown() //pops the turret down
last_target = null
@@ -661,7 +654,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
return
set_raised_raising(raised, TRUE)
playsound(get_turf(src), 'sound/effects/turret/open.wav', 60, 1)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
var/atom/flick_holder = new /atom/movable/porta_turret_cover(loc)
flick_holder.layer = layer + 0.1
@@ -670,7 +663,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
qdel(flick_holder)
set_raised_raising(FALSE, FALSE)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/machinery/porta_turret/on_assess_perp(mob/living/carbon/human/perp)
if((check_access || attacked) && !allowed(perp))
@@ -709,7 +702,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
if(!istype(T) || !istype(U))
return
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
var/obj/item/projectile/A
if(emagged || lethal)
if(eprojectile)
@@ -807,7 +800,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
//this is a bit unwieldy but self-explanatory
switch(build_step)
if(0) //first step
- if(istype(I, /obj/item/wrench) && !anchored)
+ if(I.tool_behaviour == TOOL_WRENCH && !anchored)
add_fingerprint(user)
playsound(loc, I.usesound, 100, 1)
to_chat(user, span_notice("You secure the external bolts."))
@@ -815,7 +808,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
build_step = 1
return
- else if(istype(I, /obj/item/crowbar) && !anchored)
+ else if(I.tool_behaviour == TOOL_CROWBAR && !anchored)
playsound(loc, I.usesound, 75, 1)
to_chat(user, span_notice("You dismantle the turret construction."))
new /obj/item/stack/sheet/metal( loc, 5)
@@ -834,7 +827,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
to_chat(user, span_warning("You need two sheets of metal to continue construction."))
return
- else if(istype(I, /obj/item/wrench))
+ else if(I.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
playsound(loc, I.usesound, 75, 1)
to_chat(user, span_notice("You unfasten the external bolts."))
@@ -844,7 +837,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
if(2)
- if(istype(I, /obj/item/wrench))
+ if(I.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
playsound(loc, I.usesound, 100, 1)
to_chat(user, span_notice("You bolt the metal armor into place."))
@@ -876,7 +869,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
qdel(I) //delete the gun :( qdel
return
- else if(istype(I, /obj/item/wrench))
+ else if(I.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
playsound(loc, I.usesound, 100, 1)
to_chat(user, span_notice("You remove the turret's metal armor bolts."))
@@ -897,7 +890,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
//attack_hand() removes the gun
if(5)
- if(istype(I, /obj/item/screwdriver))
+ if(I.tool_behaviour == TOOL_SCREWDRIVER)
add_fingerprint(user)
playsound(loc, I.usesound, 100, 1)
build_step = 6
@@ -917,13 +910,13 @@ GLOBAL_LIST_EMPTY(turret_icons)
to_chat(user, span_warning("You need two sheets of metal to continue construction."))
return
- else if(istype(I, /obj/item/screwdriver))
+ else if(I.tool_behaviour == TOOL_SCREWDRIVER)
add_fingerprint(user)
playsound(loc, I.usesound, 100, 1)
build_step = 5
to_chat(user, span_notice("You open the internal access hatch."))
return
- else if(istype(I, /obj/item/crowbar))
+ else if(I.tool_behaviour == TOOL_CROWBAR)
add_fingerprint(user)
playsound(loc, I.usesound, 75, 1)
to_chat(user, span_notice("You pry off the turret's exterior armor."))
@@ -1055,7 +1048,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
depotarea.declare_started()
return ..(target)
-/obj/machinery/porta_turret/syndicate/update_icon()
+/obj/machinery/porta_turret/syndicate/update_icon_state()
if(stat & BROKEN)
icon_state = icon_state_destroyed
else if(enabled)
diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm
index a5a5476170e..bbe4830223c 100644
--- a/code/game/machinery/quantum_pad.dm
+++ b/code/game/machinery/quantum_pad.dm
@@ -3,7 +3,7 @@
desc = "A bluespace quantum-linked telepad used for teleporting objects to other quantum pads."
icon = 'icons/obj/telescience.dmi'
icon_state = "qpad-idle"
- anchored = 1
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 200
active_power_usage = 5000
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 7fd72aa7e93..6b729917c26 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -3,7 +3,7 @@
icon = 'icons/obj/objects.dmi'
icon_state = "borgcharger0"
density = 1
- anchored = 1.0
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 1000
@@ -26,7 +26,7 @@
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/cell/high(null)
RefreshParts()
- build_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/machinery/recharge_station/ert/New()
..()
@@ -86,7 +86,7 @@
if(A == occupant)
occupant = null
updateUsrDialog()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/machinery/recharge_station/narsie_act()
go_out()
@@ -124,15 +124,17 @@
go_out()
..(severity)
-/obj/machinery/recharge_station/proc/build_icon()
- if(NOPOWER|BROKEN)
- if(src.occupant)
- icon_state = "borgcharger1"
+
+/obj/machinery/recharge_station/update_icon_state()
+ if(occupant)
+ if(stat & (NOPOWER|BROKEN))
+ icon_state = "borgcharger2"
else
- icon_state = "borgcharger0"
+ icon_state = "borgcharger1"
else
icon_state = "borgcharger0"
+
/obj/machinery/recharge_station/attackby(obj/item/I, mob/user, params)
if(exchange_parts(user, I))
return
@@ -167,14 +169,16 @@
if(repairs)
H.heal_overall_damage(repairs, repairs, TRUE, 0, 1)
-/obj/machinery/recharge_station/proc/go_out()
+/obj/machinery/recharge_station/proc/go_out(mob/user = usr)
if(!occupant)
return
+ if(user?.incapacitated() || user?.restrained())
+ return
occupant.forceMove(loc)
occupant = null
- build_icon()
+ update_icon(UPDATE_ICON_STATE)
use_power = IDLE_POWER_USE
- return
+
/obj/machinery/recharge_station/proc/restock_modules()
if(src.occupant)
@@ -242,13 +246,16 @@
/obj/machinery/recharge_station/verb/move_eject()
set category = "Object"
set src in oview(1)
- if(usr.stat != 0)
- return
- src.go_out()
- add_fingerprint(usr)
- return
+ go_out(usr)
+
-/obj/machinery/recharge_station/verb/move_inside(var/mob/user = usr)
+/obj/machinery/recharge_station/verb/move_inside_verb()
+ set category = "Object"
+ set src in oview(1)
+ move_inside(usr)
+
+
+/obj/machinery/recharge_station/proc/move_inside(mob/user = usr)
set category = "Object"
set src in oview(1)
if(!user || !usr)
@@ -302,6 +309,6 @@
occupant = user
add_fingerprint(user)
- build_icon()
+ update_icon(UPDATE_ICON_STATE)
update_use_power(1)
- return
+
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index edcc5ee16b4..590147d275c 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -6,7 +6,7 @@
icon = 'icons/obj/machines/recycling.dmi'
icon_state = "grinder-o0"
layer = MOB_LAYER+1 // Overhead
- anchored = 1
+ anchored = TRUE
density = 1
damage_deflection = 15
var/emergency_mode = FALSE // Temporarily stops machine if it detects a mob
@@ -26,7 +26,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
RefreshParts()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/machinery/recycler/RefreshParts()
var/amt_made = 0
@@ -46,9 +46,10 @@
. += "The operation light is [emergency_mode ? "off. [src] has detected a forbidden object with its sensors, and has shut down temporarily." : "on. [src] is active."]"
. += "The safety sensor light is [emagged ? "off!" : "on."]
[line1]
[line2]
"}
+ var/new_text = {"[line2]
[line1]
[line2]
"}
if(maptext != new_text)
maptext = new_text
- var/lum = 0.5
- if(line1)
- lum += 0.5
- if(line2)
- lum += 0.5
- set_light(1.5, lum, warning ? COLOR_SUN : COLOR_LIGHT_CYAN)
+ update_display_light()
-/obj/machinery/status_display/proc/remove_display()
- if(overlays.len)
- overlays.Cut()
- if(maptext)
- maptext = ""
- if(mode != STATUS_DISPLAY_ALERT && picture_state)
- picture_state = ""
+
+/obj/machinery/status_display/proc/update_display_light()
if(light)
set_light(0)
-
-/obj/machinery/status_display/receive_signal(datum/signal/signal)
- if(stat & (BROKEN|NOPOWER))
+ if(stat & (NOPOWER|BROKEN))
return
- switch(signal.data["command"])
- if("blank")
- mode = STATUS_DISPLAY_BLANK
- if("shuttle")
- remove_display()
- mode = STATUS_DISPLAY_TRANSFER_SHUTTLE_TIME
-
- if("message")
- remove_display()
- mode = STATUS_DISPLAY_MESSAGE
- set_message(signal.data["msg1"], signal.data["msg2"])
+ if(mode == STATUS_DISPLAY_ALERT)
+ set_light(1, 1, GLOB.statdisp_picture_colors[picture_state])
+ else
+ var/lum = 0.4
+ if(index1)
+ lum += 0.4
+ if(index2)
+ lum += 0.4
+ set_light(1, lum, (SSshuttle.emergency && SSshuttle.emergency.timer) ? COLOR_SUN : COLOR_LIGHT_CYAN)
- if("alert")
- mode = STATUS_DISPLAY_ALERT
- set_picture(signal.data["picture_state"])
- if("time")
- remove_display()
- mode = STATUS_DISPLAY_TIME
+GLOBAL_LIST_EMPTY(ai_displays)
/obj/machinery/ai_status_display
icon = 'icons/obj/status_display.dmi'
icon_state = "frame"
name = "AI display"
- anchored = 1
- density = 0
+ anchored = TRUE
+ density = FALSE
+ /// Current mode
+ var/mode = AI_DISPLAY_MODE_BLANK
+ /// Target icon state
+ var/picture_state
+ /// Current emotion, used to calculate an icon state
+ var/emotion = "Neutral"
+
+/obj/machinery/ai_status_display/Initialize(mapload)
+ . = ..()
+ GLOB.ai_displays |= src
- var/mode = 0 // 0 = Blank
- // 1 = AI emoticon
- // 2 = Blue screen of death
- var/picture_state // icon_state of ai picture
+/obj/machinery/ai_status_display/Destroy()
+ GLOB.ai_displays -= src
+ return ..()
- var/emotion = "Neutral"
/obj/machinery/ai_status_display/attack_ai(mob/living/silicon/ai/user)
if(isAI(user))
user.ai_statuschange()
-/obj/machinery/ai_status_display/process()
- if(stat & (BROKEN|NOPOWER))
- return
- update()
-
-/obj/machinery/ai_status_display/proc/remove_display()
- if(light)
- set_light(0)
- if(!mode && picture_state)
- picture_state = ""
- if(overlays.len)
- overlays.Cut()
-
-/obj/machinery/ai_status_display/power_change()
- ..()
- if(stat & (BROKEN|NOPOWER))
- remove_display()
- else if(picture_state)
- set_picture(picture_state)
/obj/machinery/ai_status_display/emp_act(severity)
if(stat & (BROKEN|NOPOWER))
..(severity)
return
- set_picture("ai_bsod")
+ mode = AI_DISPLAY_MODE_BSOD
+ update_icon()
..(severity)
+
+/obj/machinery/ai_status_display/power_change(forced = FALSE)
+ if(!..())
+ return
+ if(stat & NOPOWER)
+ set_light(0)
+ else
+ set_light(1, LIGHTING_MINIMUM_POWER, GLOB.statdisp_picture_colors[picture_state])
+
+
/obj/machinery/ai_status_display/flicker()
- if(stat & (NOPOWER | BROKEN))
+ if(stat & (NOPOWER|BROKEN))
return FALSE
- remove_display()
- set_picture("ai_tribunal_malf")
+ emotion = "Tribunal Malf"
+ update_icon()
return TRUE
-/obj/machinery/ai_status_display/proc/update()
- if(mode==0) //Blank
- remove_display()
- return
- if(mode==1) // AI emoticon
- switch(emotion)
- if("Very Happy")
- set_picture("ai_veryhappy")
- if("Happy")
- set_picture("ai_happy")
- if("Neutral")
- set_picture("ai_neutral")
- if("Unsure")
- set_picture("ai_unsure")
- if("Confused")
- set_picture("ai_confused")
- if("Sad")
- set_picture("ai_sad")
- if("Surprised")
- set_picture("ai_surprised")
- if("Upset")
- set_picture("ai_upset")
- if("Angry")
- set_picture("ai_angry")
- if("BSOD")
- set_picture("ai_bsod")
- if("Blank")
- set_picture("ai_off")
- if("Problems?")
- set_picture("ai_trollface")
- if("Awesome")
- set_picture("ai_awesome")
- if("Dorfy")
- set_picture("ai_urist")
- if("Facepalm")
- set_picture("ai_facepalm")
- if("Friend Computer")
- set_picture("ai_friend")
- if("Beer")
- set_picture("ai_beer")
- if("Dwarf")
- set_picture("ai_dwarf")
- if("Fish Tank")
- set_picture("ai_fishtank")
- if("Plump")
- set_picture("ai_plump")
- if("Tribunal")
- set_picture("ai_tribunal")
- if("Tribunal Malf")
- set_picture("ai_tribunal_malf")
- return
+/obj/machinery/ai_status_display/update_overlays()
+ . = ..()
- if(mode==2) // BSOD
- set_picture("ai_bsod")
- return
+ var/new_display
+ underlays.Cut()
-/obj/machinery/ai_status_display/proc/set_picture(state)
- if(picture_state == state)
+ if(stat & NOPOWER)
return
- picture_state = state
- if(overlays.len)
- overlays.Cut()
- overlays += image('icons/obj/status_display.dmi', icon_state=picture_state)
- set_light(1.5, 2, GLOB.statdisp_picture_colors[picture_state])
-
-#undef FONT_SIZE
-#undef FONT_COLOR
-#undef WARNING_FONT_COLOR
-#undef FONT_STYLE
-#undef SCROLL_SPEED
-
-#undef STATUS_DISPLAY_BLANK
-#undef STATUS_DISPLAY_TRANSFER_SHUTTLE_TIME
-#undef STATUS_DISPLAY_MESSAGE
-#undef STATUS_DISPLAY_ALERT
-#undef STATUS_DISPLAY_TIME
+
+ switch(mode)
+ // Blank
+ if(AI_DISPLAY_MODE_BLANK)
+ new_display = "ai_off"
+
+ // AI emoticon
+ if(AI_DISPLAY_MODE_EMOTE)
+ switch(emotion)
+ if("Very Happy")
+ new_display = "ai_veryhappy"
+ if("Happy")
+ new_display = "ai_happy"
+ if("Neutral")
+ new_display = "ai_neutral"
+ if("Unsure")
+ new_display = "ai_unsure"
+ if("Confused")
+ new_display = "ai_confused"
+ if("Sad")
+ new_display = "ai_sad"
+ if("Surprised")
+ new_display = "ai_surprised"
+ if("Upset")
+ new_display = "ai_upset"
+ if("Angry")
+ new_display = "ai_angry"
+ if("BSOD")
+ new_display = "ai_bsod"
+ if("Blank")
+ new_display = "ai_off"
+ if("Problems?")
+ new_display = "ai_trollface"
+ if("Awesome")
+ new_display = "ai_awesome"
+ if("Dorfy")
+ new_display = "ai_urist"
+ if("Facepalm")
+ new_display = "ai_facepalm"
+ if("Friend Computer")
+ new_display = "ai_friend"
+ if("Beer")
+ new_display = "ai_beer"
+ if("Dwarf")
+ new_display = "ai_dwarf"
+ if("Fish Tank")
+ new_display = "ai_fishtank"
+ if("Plump")
+ new_display = "ai_plump"
+ if("Tribunal")
+ new_display = "ai_tribunal"
+ if("Tribunal Malf")
+ new_display = "ai_tribunal_malf"
+
+ // BSOD
+ if(AI_DISPLAY_MODE_BSOD)
+ new_display = "ai_bsod"
+
+ . += new_display
+ underlays += emissive_appearance(icon, "lightmask")
+
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 136a4d1a5ef..3f58fa3101e 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -258,7 +258,7 @@
magboots = new magboots_type(src)
if(storage_type)
storage = new storage_type(src)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
//move this into machinery eventually...
if(occupant_typecache)
@@ -273,31 +273,33 @@
. = ..()
. += " There's a warning label dangling from the control pad that reads:[line2]
[span_danger("\"BIOLOGICAL SUBJECTS ARE STRICTLY PROHIBITED IN THE CONFINES OF THE UNIT.\"")]" -/obj/machinery/suit_storage_unit/update_icon() - cut_overlays() + +/obj/machinery/suit_storage_unit/update_overlays() + . = ..() if(uv) if(uv_super) - add_overlay("[icon_state]_super") + . += "[icon_state]_super" else if(occupant) - add_overlay("[icon_state]_uvhuman") + . += "[icon_state]_uvhuman" else - add_overlay("[icon_state]_uv") + . += "[icon_state]_uv" else if(state_open) if(stat & BROKEN) - add_overlay("[icon_state]_broken") + . += "[icon_state]_broken" else - add_overlay("[icon_state]_open") + . += "[icon_state]_open" if(suit) - add_overlay("[icon_state]_suit") + . += "[icon_state]_suit" if(helmet) - add_overlay("[icon_state]_helm") + . += "[icon_state]_helm" if(storage) - add_overlay("[icon_state]_storage") + . += "[icon_state]_storage" else if(occupant) - add_overlay("[icon_state]_human") + . += "[icon_state]_human" if(!locked) - add_overlay("[icon_state]_unlocked") + . += "[icon_state]_unlocked" + /obj/machinery/suit_storage_unit/attackby(obj/item/I, mob/user, params) if(shocked) @@ -318,7 +320,7 @@ if(state_open) add_fingerprint(user) if(store_item(I, user)) - update_icon() + update_icon(UPDATE_OVERLAYS) SStgui.update_uis(src) to_chat(user, span_notice("You load the [I] into the storage compartment.")) else @@ -356,12 +358,12 @@ user.drop_transfer_item_to_loc(I, src) -/obj/machinery/suit_storage_unit/power_change() - ..() +/obj/machinery/suit_storage_unit/power_change(forced = FALSE) + ..() //we don't check parent return here because `is_operational` cares about other flags in stat if(!is_operational() && state_open) open_machine() dump_contents() - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/machinery/suit_storage_unit/proc/dump_contents() @@ -380,9 +382,10 @@ new /obj/item/stack/sheet/metal (loc, 2) qdel(src) -/obj/machinery/suit_storage_unit/MouseDrop_T(atom/A, mob/user) +/obj/machinery/suit_storage_unit/MouseDrop_T(atom/A, mob/user, params) if(user.stat || user.lying || !Adjacent(user) || !Adjacent(A) || !isliving(A)) return + . = TRUE var/mob/living/target = A if(!state_open) to_chat(user, span_warning("The [src]'s doors are shut!")) @@ -399,15 +402,19 @@ else target.visible_message(span_warning("[user] starts shoving [target] into [src]!"), span_userdanger("[user] starts shoving you into [src]!")) - if(do_mob(user, target, 30)) - if(occupant || helmet || suit || storage) - return - if(target == user) - user.visible_message(span_warning("[user] slips into [src] and closes the door behind [user.p_them()]!"), span_notice("You slip into [src]'s cramped space and shut its door.")) - else - target.visible_message(span_warning("[user] pushes [target] into [src] and shuts its door!"), span_userdanger("[user] shoves you into [src] and shuts the door!")) - close_machine(target) - add_fingerprint(user) + if(!do_mob(user, target, 3 SECONDS)) + return + + if(occupant || helmet || suit || storage) + return + + if(target == user) + user.visible_message(span_warning("[user] slips into [src] and closes the door behind [user.p_them()]!"), span_notice("You slip into [src]'s cramped space and shut its door.")) + else + target.visible_message(span_warning("[user] pushes [target] into [src] and shuts its door!"), span_userdanger("[user] shoves you into [src] and shuts the door!")) + close_machine(target) + add_fingerprint(user) + /obj/machinery/suit_storage_unit/proc/cook() if(uv_cycles) @@ -447,7 +454,7 @@ playsound(src, 'sound/machines/airlock_close.ogg', 25, 1) if(occupant) dump_contents() - update_icon() + update_icon(UPDATE_OVERLAYS) SStgui.update_uis(src) /obj/machinery/suit_storage_unit/relaymove(mob/user) @@ -496,7 +503,7 @@ state_open = TRUE if(drop) dropContents() - update_icon() + update_icon(UPDATE_OVERLAYS) SStgui.update_uis(src) /obj/machinery/suit_storage_unit/dropContents() @@ -528,7 +535,7 @@ occupant = target target.forceMove(src) SStgui.update_uis(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/machinery/suit_storage_unit/attack_hand(mob/user) if(..() || (stat & NOPOWER)) @@ -591,7 +598,7 @@ cook() if("eject_occupant") eject_occupant(usr) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/machinery/suit_storage_unit/proc/dispense_helmet() if(!helmet) @@ -677,7 +684,7 @@ occupant = null if(!state_open) state_open = TRUE - update_icon() + update_icon(UPDATE_OVERLAYS) return /obj/machinery/suit_storage_unit/force_eject_occupant(mob/target) @@ -693,7 +700,7 @@ eject_occupant(usr) add_fingerprint(usr) SStgui.update_uis(src) - update_icon() + update_icon(UPDATE_OVERLAYS) return /obj/machinery/suit_storage_unit/verb/move_inside() @@ -720,7 +727,7 @@ usr.forceMove(src) occupant = usr state_open = FALSE //Close the thing after the guy gets inside - update_icon() + update_icon(UPDATE_OVERLAYS) add_fingerprint(usr) SStgui.update_uis(src) @@ -742,7 +749,7 @@ add_attack_logs(user, src, "emagged") locked = FALSE emagged = TRUE - update_icon() + update_icon(UPDATE_OVERLAYS) SStgui.update_uis(src) if(user) to_chat(user, span_warning("You burn the locking mechanism, unlocking it forever.")) diff --git a/code/game/machinery/supply_display.dm b/code/game/machinery/supply_display.dm index 5cddc4b09ce..21d95579cc9 100644 --- a/code/game/machinery/supply_display.dm +++ b/code/game/machinery/supply_display.dm @@ -1,29 +1,21 @@ /obj/machinery/status_display/supply_display name = "дисплей статуса доставки" - ignore_friendc = 1 + is_supply = TRUE + /obj/machinery/status_display/supply_display/update() - if(!..() && mode == STATUS_DISPLAY_CUSTOM) - if(SSshuttle.supply.mode == SHUTTLE_IDLE) - if(is_station_level(SSshuttle.supply.z)) - message1 = "ГРУЗ" - message2 = "ГОТОВ" - else - message1 = "ВРЕМЯ" - message2 = station_time_timestamp("hh:mm") - else + if(SSshuttle.supply.mode == SHUTTLE_IDLE) + if(is_station_level(SSshuttle.supply.z)) message1 = "ГРУЗ" - message2 = SSshuttle.supply.getTimerStr() - if(length(message2) > DISPLAY_CHARS_PER_LINE) - message2 = "Error" - - update_display(message1, message2) - return 1 - return 0 - -/obj/machinery/status_display/supply_display/receive_signal/(datum/signal/signal) - if(signal.data["command"] == "supply") - mode = STATUS_DISPLAY_CUSTOM + message2 = "ГОТОВ" + else + message1 = "ВРЕМЯ" + message2 = station_time_timestamp("hh:mm") else - return + message1 = "ГРУЗ" + message2 = SSshuttle.supply.getTimerStr() + if(length(message2) > DISPLAY_CHARS_PER_LINE) + message2 = "Error" + + update_display(message1, message2) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index c9c12651304..d230bb618f5 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -10,7 +10,7 @@ icon = 'icons/obj/device.dmi' icon_state = "syndbeacon" - anchored = 1 + anchored = TRUE density = 1 var/temptext = "" @@ -108,7 +108,7 @@ icon = 'icons/obj/engines_and_power/singularity.dmi' icon_state = "beacon" - anchored = 0 + anchored = FALSE density = 1 layer = MOB_LAYER - 0.2 //so people can't hide it and it's REALLY OBVIOUS stat = 0 diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 24a33fc43b0..6a21f1fbabc 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -7,7 +7,7 @@ icon_state = "syndicate-bomb" desc = "A large and menacing device. Can be bolted down with a wrench." - anchored = 0 + anchored = FALSE density = 0 layer = BELOW_MOB_LAYER //so people can't hide it and it's REALLY OBVIOUS resistance_flags = FIRE_PROOF | ACID_PROOF @@ -74,7 +74,7 @@ if(active && !defused && ((detonation_timer <= world.time) || explode_now)) active = FALSE timer_set = initial(timer_set) - update_icon() + update_icon(UPDATE_ICON_STATE) try_detonate(TRUE) //Counter terrorists win else if(defused) @@ -86,7 +86,7 @@ wires = new(src) if(payload) payload = new payload(src) - update_icon() + update_icon(UPDATE_ICON_STATE) countdown = new(src) ..() @@ -101,7 +101,7 @@ . = ..() . += span_warning("A digital display on it reads \"[seconds_remaining()]\".") -/obj/machinery/syndicatebomb/update_icon() +/obj/machinery/syndicatebomb/update_icon_state() icon_state = "[initial(icon_state)][active ? "-active" : "-inactive"][open_panel ? "-wires" : ""]" /obj/machinery/syndicatebomb/proc/seconds_remaining() @@ -153,7 +153,7 @@ if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return open_panel = !open_panel - update_icon() + update_icon(UPDATE_ICON_STATE) to_chat(user, span_notice("You [open_panel ? "open" : "close"] the wire panel.")) /obj/machinery/syndicatebomb/wirecutter_act(mob/user, obj/item/I) @@ -259,7 +259,7 @@ else loc.visible_message(span_danger("[bicon(src)] [timer_set] seconds until detonation, please clear the area.")) activate() - update_icon() + update_icon(UPDATE_ICON_STATE) add_fingerprint(user) var/turf/bombturf = get_turf(src) @@ -381,7 +381,7 @@ holder.delayedbig = FALSE holder.delayedlittle = FALSE holder.explode_now = FALSE - holder.update_icon() + holder.update_icon(UPDATE_ICON_STATE) holder.updateDialog() /obj/item/bombcore/training/detonate() diff --git a/code/game/machinery/syndiepad.dm b/code/game/machinery/syndiepad.dm index 5e5eb97673d..9e2b3165e14 100644 --- a/code/game/machinery/syndiepad.dm +++ b/code/game/machinery/syndiepad.dm @@ -3,7 +3,7 @@ desc = "Syndicate redspace quantumpads! Can transport goods through galaxies and completely ignores bluespace interference!" icon = 'icons/obj/telescience.dmi' icon_state = "sqpad-idle" - anchored = 1 + anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 200 active_power_usage = 5000 diff --git a/code/game/machinery/tcomms/_base.dm b/code/game/machinery/tcomms/_base.dm index febdb9283d3..8dadfd7cad0 100644 --- a/code/game/machinery/tcomms/_base.dm +++ b/code/game/machinery/tcomms/_base.dm @@ -51,7 +51,7 @@ GLOBAL_LIST_EMPTY(tcomms_machines) /obj/machinery/tcomms/Initialize(mapload) . = ..() GLOB.tcomms_machines += src - update_icon() + update_icon(UPDATE_ICON_STATE) if((!mapload) && (usr)) // To the person who asks "Hey affected, why are you using this massive operator when you can use AREACOORD?" Well, ill tell you // get_area_name is fucking broken and uses a for(x in world) search @@ -82,8 +82,7 @@ GLOBAL_LIST_EMPTY(tcomms_machines) * * Ensures that the icon updates properly based on if the machine is active or not. This removes the need for this check in many other places. */ -/obj/machinery/tcomms/update_icon() - . = ..() +/obj/machinery/tcomms/update_icon_state() // Show the off sprite if were inactive, ion'd or unpowered if(!active || (stat & NOPOWER) || ion) icon_state = "[initial(icon_state)]_off" @@ -116,7 +115,7 @@ GLOBAL_LIST_EMPTY(tcomms_machines) */ /obj/machinery/tcomms/proc/start_ion() ion = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) /** * End of Ion Anomaly Event @@ -125,7 +124,7 @@ GLOBAL_LIST_EMPTY(tcomms_machines) */ /obj/machinery/tcomms/proc/end_ion() ion = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) /** * Z-Level transit change helper @@ -138,7 +137,7 @@ GLOBAL_LIST_EMPTY(tcomms_machines) active = FALSE // This needs a timer because otherwise its on the shuttle Z and the message is missed addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, visible_message), span_warning("Radio equipment on [src] has been overloaded by heavy bluespace interference. Please restart the machine.")), 5) - update_icon() + update_icon(UPDATE_ICON_STATE) /** @@ -159,9 +158,10 @@ GLOBAL_LIST_EMPTY(tcomms_machines) * * Proc which ensures icons are updated when machines lose power */ -/obj/machinery/tcomms/power_change() - ..() - update_icon() +/obj/machinery/tcomms/power_change(forced = FALSE) + if(!..()) + return + update_icon(UPDATE_ICON_STATE) /** * # Telecommunications Message @@ -451,7 +451,7 @@ GLOBAL_LIST_EMPTY(tcomms_machines) if(C.network_id == "STATION-CORE") info = "
Telecommunications Key
The station core linkage password is '[C.link_password]'.
Should this paper be misplaced or destroyed, fear not, as the password is visible under the core linkage section. Should you wish to modify this password, it can be modified from the core." info_links = info - update_icon() + update_icon(UPDATE_ICON_STATE) // Save time, even though there should only be one STATION-CORE in the world break return ..() diff --git a/code/game/machinery/tcomms/core.dm b/code/game/machinery/tcomms/core.dm index dd4dfc20237..5a7570a6d7e 100644 --- a/code/game/machinery/tcomms/core.dm +++ b/code/game/machinery/tcomms/core.dm @@ -41,7 +41,7 @@ active = TRUE else visible_message(span_warning("Error: Another core is already active in this sector. Power-up cancelled due to radio interference.")) - update_icon() + update_icon(UPDATE_ICON_STATE) /** * Destructor for the core. @@ -158,7 +158,7 @@ if(C.active) if(C.stat & NOPOWER) // If another core has no power but is supposed to be on, we shut it down so we can continue. C.active = FALSE // Since only one active core is allowed per z level, give priority to the one actually working. - C.update_icon() + C.update_icon(UPDATE_ICON_STATE) else return FALSE // If we got here there isnt an active core on this Z-level. So return true @@ -231,7 +231,7 @@ if("toggle_active") if(check_power_on()) active = !active - update_icon() + update_icon(UPDATE_ICON_STATE) else to_chat(usr, span_warning("Error: Another core is already active in this sector. Power-up cancelled due to radio interference.")) @@ -265,7 +265,7 @@ if(!new_language) return if(new_language == "--DISABLE--") - nttc.setting_language = null + nttc.setting_language = LANGUAGE_NONE to_chat(usr, span_notice("Language conversion disabled.")) else nttc.setting_language = new_language diff --git a/code/game/machinery/tcomms/nttc.dm b/code/game/machinery/tcomms/nttc.dm index d1b519e827d..c069a0cfc77 100644 --- a/code/game/machinery/tcomms/nttc.dm +++ b/code/game/machinery/tcomms/nttc.dm @@ -107,7 +107,7 @@ var/toggle_command_bold = FALSE /* Strings */ - var/setting_language = null + var/setting_language = LANGUAGE_NONE var/job_indicator_type = null // This tells the datum what is safe to serialize and what's not. It also applies to deserialization. @@ -151,9 +151,9 @@ job_indicator_type = initial(job_indicator_type) /datum/nttc_configuration/proc/update_languages() - for(var/language in GLOB.all_languages) - var/datum/language/L = GLOB.all_languages[language] - if(L.flags & HIVEMIND) + for(var/language_name in GLOB.all_languages) + var/datum/language/language = GLOB.all_languages[language_name] + if(language.flags & (HIVEMIND|NONGLOBAL)) continue valid_languages[language] = TRUE @@ -260,18 +260,18 @@ var/datum/multilingual_say_piece/S = message_pieces[I] if(!S.message) continue - if(I == 1 && !istype(S.speaking, /datum/language/noise)) // Capitalise the first section only, unless it's an emote. + if(I == 1 && S.speaking != GLOB.all_languages[LANGUAGE_NOISE]) // Capitalise the first section only, unless it's an emote. S.message = "[capitalize(S.message)]" S.message = "[S.message]" // Make everything bolded // Language Conversion if(setting_language && valid_languages[setting_language]) if(setting_language == "--DISABLE--") - setting_language = null + setting_language = LANGUAGE_NONE else for(var/datum/multilingual_say_piece/S in message_pieces) - if(S.speaking != GLOB.all_languages["Noise"]) // check if they are emoting, these do not need to be translated - S.speaking = GLOB.all_languages[setting_language] + if(S.speaking != GLOB.all_languages[LANGUAGE_NOISE]) // check if they are emoting, these do not need to be translated + S.speaking = setting_language return tcm diff --git a/code/game/machinery/tcomms/relay.dm b/code/game/machinery/tcomms/relay.dm index 0b1b32c9889..04072589fe0 100644 --- a/code/game/machinery/tcomms/relay.dm +++ b/code/game/machinery/tcomms/relay.dm @@ -32,7 +32,7 @@ active = TRUE else visible_message(span_warning("Error: Another relay is already active in this sector. Power-up cancelled due to radio interference.")) - update_icon() + update_icon(UPDATE_ICON_STATE) if(mapload && autolink_id) return INITIALIZE_HINT_LATELOAD @@ -90,7 +90,7 @@ if(R.active) if(R.stat & NOPOWER) // If another relay has no power but is supposed to be on, we shut it down so we can continue. R.active = FALSE // Since only one active relay is allowed per z level, give priority to the one that's actually working. - R.update_icon() + R.update_icon(UPDATE_ICON_STATE) else return FALSE // If we got here there isnt an active relay on this Z-level. So return TRUE @@ -127,8 +127,9 @@ * * Proc which ensures the host core has its zlevels updated (icons are updated by parent call) */ -/obj/machinery/tcomms/relay/power_change() - ..() +/obj/machinery/tcomms/relay/power_change(forced = FALSE) + if(!..()) + return if(linked_core) linked_core.refresh_zlevels() @@ -176,7 +177,7 @@ if("toggle_active") if(check_power_on()) active = !active - update_icon() + update_icon(UPDATE_ICON_STATE) if(linked_core) linked_core.refresh_zlevels() else diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index fb99f983d5f..2fa2ddd13e9 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/machines/recycling.dmi' icon_state = "separator-AO1" layer = MOB_LAYER+1 // Overhead - anchored = 1 + anchored = TRUE density = 1 /// TRUE if the factory can transform dead mobs. var/transform_dead = TRUE @@ -47,12 +47,12 @@ if(istype(west, /turf/simulated/floor)) new /obj/machinery/conveyor/auto(west, WEST) -/obj/machinery/transformer/power_change() - ..() - update_icon() +/obj/machinery/transformer/power_change(forced = FALSE) + if(!..()) + return + update_icon(UPDATE_ICON_STATE) -/obj/machinery/transformer/update_icon() - ..() +/obj/machinery/transformer/update_icon_state() if(is_on_cooldown || stat & (BROKEN|NOPOWER)) icon_state = "separator-AO0" else @@ -67,7 +67,7 @@ /// Resets `is_on_cooldown` to `FALSE` and updates our icon. Used in a callback after the transformer does a transformation. /obj/machinery/transformer/proc/reset_cooldown() is_on_cooldown = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/transformer/Bumped(atom/movable/moving_atom) ..() @@ -97,7 +97,7 @@ // Activate the cooldown is_on_cooldown = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, PROC_REF(reset_cooldown)), cooldown_duration) addtimer(CALLBACK(null, PROC_REF(playsound), loc, 'sound/machines/ping.ogg', 50, 0), 3 SECONDS) @@ -152,7 +152,7 @@ // Activate the cooldown is_on_cooldown = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, PROC_REF(reset_cooldown)), cooldown_duration) /obj/machinery/transformer/xray @@ -176,12 +176,12 @@ if(istype(west2, /turf/simulated/floor)) new /obj/machinery/conveyor/auto(west2, EAST) -/obj/machinery/transformer/xray/power_change() - ..() - update_icon() +/obj/machinery/transformer/xray/power_change(forced = FALSE) + if(!..()) + return + update_icon(UPDATE_ICON_STATE) -/obj/machinery/transformer/xray/update_icon() - ..() +/obj/machinery/transformer/xray/update_icon_state() if(stat & (BROKEN|NOPOWER)) icon_state = "separator-AO0" else diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index ec6e73fca91..ea8a9be1709 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -88,8 +88,10 @@ else control_area = null - power_change() //Checks power and initial settings - return + updateTurrets() + update_icon(UPDATE_ICON_STATE) + update_turret_light() + /obj/machinery/turretid/proc/isLocked(mob/user) if(isrobot(user) && !iscogscarab(user) || isAI(user)) @@ -219,28 +221,46 @@ if(faction == aTurret.faction) aTurret.setState(TC) - update_icon() + update_icon(UPDATE_ICON_STATE) + update_turret_light() -/obj/machinery/turretid/power_change() - ..() + +/obj/machinery/turretid/power_change(forced = FALSE) + if(!..()) + return updateTurrets() - update_icon() + update_icon(UPDATE_ICON_STATE) + update_turret_light() -/obj/machinery/turretid/update_icon() - ..() + +/obj/machinery/turretid/proc/update_turret_light() if(stat & NOPOWER) - icon_state = "control_off" set_light(0) - else if(enabled) + return + + if(enabled) if(lethal) - icon_state = "control_kill" set_light(1.5, 1,"#990000") else - icon_state = "control_stun" set_light(1.5, 1,"#FF9900") - else - icon_state = "control_standby" - set_light(1.5, 1,"#003300") + return + + set_light(1.5, 1,"#003300") + + +/obj/machinery/turretid/update_icon_state() + if(stat & NOPOWER) + icon_state = "control_off" + return + if(enabled) + if(lethal) + icon_state = "control_kill" + else + icon_state = "control_stun" + return + + icon_state = "control_standby" + /obj/machinery/turretid/emp_act(severity) if(enabled) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 9ee654e226a..185399e5027 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1,3 +1,12 @@ +// Vendor flick sequence bitflags +/// Machine is not using vending/denying overlays +#define FLICK_NONE 0 +/// Machine is currently vending wares, and will not update its icon, unless its stat change. +#define FLICK_VEND 1 +/// Machine is currently denying wares, and will not update its icon, unless its stat change. +#define FLICK_DENY 2 + + /** * Datum used to hold information about a product in a vending machine */ @@ -15,17 +24,41 @@ name = "\improper Vendomat" desc = "A generic vending machine." icon = 'icons/obj/machines/vending.dmi' - icon_state = "generic" - layer = 2.9 - anchored = 1 - density = 1 + icon_state = "generic_off" + layer = BELOW_OBJ_LAYER + anchored = TRUE + density = TRUE 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) - /// Icon_state when vending - var/icon_vend - /// Icon_state when denying access - var/icon_deny + + // All the overlay controlling variables + /// Overlay of vendor maintenance panel. + var/panel_overlay = "" + /// Overlay of a vendor screen, will not apply of stat is NOPOWER. + var/screen_overlay = "" + /// Lightmask used when vendor is working properly. + var/lightmask_overlay = "" + /// Damage overlay applied if vendor is damaged enough. + var/broken_overlay = "" + /// Special lightmask for broken overlay. If vendor is BROKEN, but not dePOWERED we will see this, instead of `lightmask_overlay`. + var/broken_lightmask_overlay = "" + /// Overlay applied when machine is vending goods. + var/vend_overlay = "" + /// Special lightmask that will override default `lightmask_overlay`, while machine is vending goods. + var/vend_lightmask = "" + /// Amount of time until vending sequence is reseted. + var/vend_overlay_time = 5 SECONDS + /// Overlay applied when machine is denying its wares. + var/deny_overlay = "" + /// Special lightmask that will override default `lightmask_overlay`, while machine is denying its wares. + var/deny_lightmask = "" + /// Amount of time until denying sequence is reseted. + var/deny_overlay_time = 1.5 SECONDS + /// Flags used to correctly manipulate with vend/deny sequences. + var/flick_sequence = FLICK_NONE + /// If `TRUE` machine will only react to BROKEN/NOPOWER stat, when updating overlays. + var/skip_non_primary_icon_updates = FALSE // Power use_power = IDLE_POWER_USE @@ -34,11 +67,11 @@ // Vending-related /// No sales pitches if off - var/active = 1 + var/active = TRUE /// If off, vendor is busy and unusable until current action finishes var/vend_ready = TRUE /// How long vendor takes to vend one item. - var/vend_delay = 10 + var/vend_delay = 1 SECONDS /// Item currently being bought var/datum/data/vending_product/currently_vending = null @@ -100,6 +133,9 @@ /// do I look unpowered, even when powered? var/force_no_power_icon_state = FALSE + var/light_range_on = 1 + var/light_power_on = 0.5 + /obj/machinery/vending/Initialize(mapload) . = ..() var/build_inv = FALSE @@ -128,7 +164,8 @@ // so if slogantime is 10 minutes, it will say it at somewhere between 10 and 20 minutes after the machine is created. last_slogan = world.time + rand(0, slogan_delay) - power_change() + update_icon(UPDATE_OVERLAYS) + /obj/machinery/vending/Destroy() SStgui.close_uis(wires) @@ -151,28 +188,88 @@ for(var/obj/item/vending_refill/VR in component_parts) restock(VR) -/obj/machinery/vending/update_icon() - cut_overlays() - if(panel_open) - add_overlay(image(icon, "[initial(icon_state)]-panel")) + +/obj/machinery/vending/update_icon(updates = ALL) + if(skip_non_primary_icon_updates && !(stat & (NOPOWER|BROKEN))) + return ..(NONE) + return ..() + + +/obj/machinery/vending/update_overlays() + . = ..() + + underlays.Cut() + + if(panel_overlay && panel_open) + . += panel_overlay + + if((stat & NOPOWER) || force_no_power_icon_state) + if(broken_overlay && (stat & BROKEN)) + . += broken_overlay + return if(stat & BROKEN) + if(broken_overlay) + . += broken_overlay + if(broken_lightmask_overlay) + underlays += emissive_appearance(icon, broken_lightmask_overlay) + else + if(screen_overlay) + . += screen_overlay + + var/lightmask_used = FALSE + if(vend_overlay && (flick_sequence & FLICK_VEND)) + . += vend_overlay + if(vend_lightmask) + lightmask_used = TRUE + . += vend_lightmask + + else if(deny_overlay && (flick_sequence & FLICK_DENY)) + . += deny_overlay + if(deny_lightmask) + lightmask_used = TRUE + . += deny_lightmask + + if(!lightmask_used && lightmask_overlay) + underlays += emissive_appearance(icon, lightmask_overlay) + + +/obj/machinery/vending/power_change(forced = FALSE) + . = ..() + if(stat & NOPOWER) set_light(0) - icon_state = "[initial(icon_state)]-broken" - else if (stat & NOPOWER || force_no_power_icon_state) - set_light(0) - icon_state = "[initial(icon_state)]-off" else - set_light(1, 1, COLOR_WHITE) - icon_state = initial(icon_state) + set_light(light_range_on, light_power_on) + if(.) + update_icon(UPDATE_OVERLAYS) /obj/machinery/vending/extinguish_light(force = FALSE) - if(light_range) + if(light) set_light(0) underlays.Cut() +/obj/machinery/vending/proc/flick_vendor_overlay(flick_flag = FLICK_NONE) + if(flick_sequence & (FLICK_VEND|FLICK_DENY)) + return + if((flick_flag & FLICK_VEND) && !vend_overlay) + return + if((flick_flag & FLICK_DENY) && !deny_overlay) + return + flick_sequence = flick_flag + update_icon(UPDATE_OVERLAYS) + skip_non_primary_icon_updates = TRUE + var/flick_time = (flick_flag & FLICK_VEND) ? vend_overlay_time : (flick_flag & FLICK_DENY) ? deny_overlay_time : 0 + addtimer(CALLBACK(src, PROC_REF(flick_reset)), flick_time) + + +/obj/machinery/vending/proc/flick_reset() + skip_non_primary_icon_updates = FALSE + flick_sequence = FLICK_NONE + update_icon(UPDATE_OVERLAYS) + + /* * Reimp, flash the screen on and off repeatedly. */ @@ -196,13 +293,13 @@ for(var/i in 1 to amount) force_no_power_icon_state = TRUE - update_icon() + update_icon(UPDATE_OVERLAYS) sleep(rand(1, 3)) force_no_power_icon_state = FALSE - update_icon() + update_icon(UPDATE_OVERLAYS) sleep(rand(1, 10)) - update_icon() + update_icon(UPDATE_OVERLAYS) flickering = FALSE /** @@ -337,7 +434,6 @@ return ..() - /obj/machinery/vending/crowbar_act(mob/user, obj/item/I) if(!component_parts) return @@ -627,7 +723,7 @@ return if (R.amount <= 0) to_chat(usr, "Sold out of [R.name].") - flick(icon_deny, src) + flick_vendor_overlay(FLICK_VEND) return vend_ready = FALSE // From this point onwards, vendor is locked to performing this transaction only, until it is resolved. @@ -644,7 +740,7 @@ // --- THE REST OF THIS PROC IS JUST PAYMENT LOGIC --- if(!GLOB.vendor_account || GLOB.vendor_account.suspended) to_chat(usr, "Vendor account offline. Unable to process transaction.") - flick(icon_deny, src) + flick_vendor_overlay(FLICK_DENY) vend_ready = TRUE return @@ -665,7 +761,7 @@ else to_chat(usr, span_warning("Payment failure: you have no ID or other method of payment.")) vend_ready = TRUE - flick(icon_deny, src) + flick_vendor_overlay(FLICK_DENY) . = TRUE // we set this because they shouldn't even be able to get this far, and we want the UI to update. return if(paid) @@ -683,7 +779,7 @@ /obj/machinery/vending/proc/vend(datum/data/vending_product/R, mob/user) if(!allowed(user) && !user.can_admin_interact() && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH to_chat(user, span_warning("Access denied."))//Unless emagged of course - flick(icon_deny, src) + flick_vendor_overlay(FLICK_DENY) vend_ready = TRUE return @@ -715,17 +811,21 @@ last_reply = world.time use_power(vend_power_usage) //actuators and stuff - if(icon_vend) //Show the vending animation if needed - flick(icon_vend, src) + flick_vendor_overlay(FLICK_VEND) //Show the vending animation if needed playsound(get_turf(src), 'sound/machines/machine_vend.ogg', 50, TRUE) addtimer(CALLBACK(src, PROC_REF(delayed_vend), R, user), vend_delay) + /obj/machinery/vending/proc/delayed_vend(datum/data/vending_product/R, mob/user) do_vend(R, user) vend_ready = TRUE currently_vending = null -//override this proc to add handling for what to do with the vended product when you have a inserted item and remember to include a parent call for this generic handling + +/** + * Override this proc to add handling for what to do with the vended product + * when you have a inserted item and remember to include a parent call for this generic handling + */ /obj/machinery/vending/proc/do_vend(datum/data/vending_product/R, mob/user) if(!item_slot || !inserted_item) var/put_on_turf = TRUE @@ -769,6 +869,7 @@ if(shoot_inventory && prob(shoot_chance)) throw_item() + /obj/machinery/vending/proc/speak(message) if(stat & NOPOWER) return @@ -777,42 +878,37 @@ atom_say(message) -/obj/machinery/vending/power_change() - if(powered()) - stat &= ~NOPOWER - update_icon() - else - spawn(rand(0, 15)) - stat |= NOPOWER - update_icon() /obj/machinery/vending/obj_break(damage_flag) - if(!(stat & BROKEN)) - stat |= BROKEN - update_icon() + if(stat & BROKEN) + return + + stat |= BROKEN + update_icon(UPDATE_OVERLAYS) + + var/dump_amount = 0 + var/found_anything = TRUE + while (found_anything) + found_anything = FALSE + for(var/record in shuffle(product_records)) + var/datum/data/vending_product/R = record + if(R.amount <= 0) //Try to use a record that actually has something to dump. + continue + var/dump_path = R.product_path + if(!dump_path) + continue + R.amount-- + // busting open a vendor will destroy some of the contents + if(found_anything && prob(80)) + continue + + var/obj/O = new dump_path(loc) + step(O, pick(GLOB.alldirs)) + found_anything = TRUE + dump_amount++ + if(dump_amount >= 16) + return - var/dump_amount = 0 - var/found_anything = TRUE - while (found_anything) - found_anything = FALSE - for(var/record in shuffle(product_records)) - var/datum/data/vending_product/R = record - if(R.amount <= 0) //Try to use a record that actually has something to dump. - continue - var/dump_path = R.product_path - if(!dump_path) - continue - R.amount-- - // busting open a vendor will destroy some of the contents - if(found_anything && prob(80)) - continue - - var/obj/O = new dump_path(loc) - step(O, pick(GLOB.alldirs)) - found_anything = TRUE - dump_amount++ - if(dump_amount >= 16) - return //Somebody cut an important wire and now we're following a new definition of "pitch." /obj/machinery/vending/proc/throw_item() @@ -856,7 +952,16 @@ */ + /obj/machinery/vending/assist + + icon_state = "generic_off" + panel_overlay = "generic_panel" + screen_overlay = "generic" + lightmask_overlay = "generic_lightmask" + broken_overlay = "generic_broken" + broken_lightmask_overlay = "generic_broken_lightmask" + products = list( /obj/item/assembly/prox_sensor = 5,/obj/item/assembly/igniter = 3,/obj/item/assembly/signaler = 4, /obj/item/wirecutters = 1, /obj/item/cartridge/signal = 4) contraband = list(/obj/item/flashlight = 5,/obj/item/assembly/timer = 2, /obj/item/assembly/voice = 2, /obj/item/assembly/health = 2) @@ -866,8 +971,15 @@ /obj/machinery/vending/boozeomat name = "\improper Booze-O-Mat" desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." - icon_state = "boozeomat" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles - icon_deny = "boozeomat-deny" + + icon_state = "boozeomat_off" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles + panel_overlay = "boozeomat_panel" + screen_overlay = "boozeomat" + lightmask_overlay = "boozeomat_lightmask" + broken_overlay = "boozeomat_broken" + broken_lightmask_overlay = "boozeomat_broken_lightmask" + deny_overlay = "boozeomat_deny" + products = list(/obj/item/reagent_containers/food/drinks/bottle/gin = 5, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 5, /obj/item/reagent_containers/food/drinks/bottle/tequila = 5, @@ -914,8 +1026,16 @@ name = "\improper Solar's Best Hot Drinks" desc = "A vending machine which dispenses hot drinks." ads_list = list("Выпейте!","Выпьем!","На здоровье!","Не хотите горячего супчику?","Я бы убил за чашечку кофе!","Лучшие зёрна в галактике","Для Вас — только лучшие напитки","М-м-м-м… Ничто не сравнится с кофе","Я люблю кофе, а Вы?","Кофе помогает работать!","Возьмите немного чайку","Надеемся, Вы предпочитаете лучшее!","Отведайте наш новый шоколад!","Admin conspiracies") - icon_state = "coffee" - icon_vend = "coffee-vend" + + icon_state = "coffee_off" + panel_overlay = "coffee_panel" + screen_overlay = "coffee" + lightmask_overlay = "coffee_lightmask" + broken_overlay = "coffee_broken" + broken_lightmask_overlay = "coffee_broken_lightmask" + vend_overlay = "coffee_vend" + vend_lightmask = "coffee_vend_lightmask" + item_slot = TRUE vend_delay = 34 products = list(/obj/item/reagent_containers/food/drinks/coffee = 25,/obj/item/reagent_containers/food/drinks/tea = 25,/obj/item/reagent_containers/food/drinks/h_chocolate = 25, @@ -975,7 +1095,14 @@ desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars." slogan_list = list("Попробуйте наш новый батончик с нугой!","Вдвое больше калорий за полцены!") ads_list = list("The healthiest!","Award-winning chocolate bars!","Mmm! So good!","Oh my god it's so juicy!","Have a snack.","Snacks are good for you!","Have some more Getmore!","Best quality snacks straight from mars.","We love chocolate!","Try our new jerky!") - icon_state = "snack" + + icon_state = "snack_off" + panel_overlay = "snack_panel" + screen_overlay = "snack" + lightmask_overlay = "snack_lightmask" + broken_overlay = "snack_broken" + broken_lightmask_overlay = "snack_broken_lightmask" + products = list(/obj/item/reagent_containers/food/snacks/candy/candybar = 6,/obj/item/reagent_containers/food/drinks/dry_ramen = 6,/obj/item/reagent_containers/food/snacks/doshik = 6,/obj/item/reagent_containers/food/snacks/doshik_spicy = 6,/obj/item/reagent_containers/food/snacks/chips =6, /obj/item/reagent_containers/food/snacks/sosjerky = 6,/obj/item/reagent_containers/food/snacks/no_raisin = 6,/obj/item/reagent_containers/food/snacks/pistachios =6, /obj/item/reagent_containers/food/snacks/spacetwinkie = 6,/obj/item/reagent_containers/food/snacks/cheesiehonkers = 6,/obj/item/reagent_containers/food/snacks/tastybread = 6) @@ -992,7 +1119,14 @@ name = "\improper Mr. Chang" desc = "A self-serving Chinese food machine, for all your Chinese food needs." slogan_list = list("Попробуйте 5000 лет культуры!","Мистер Чанг, одобрен для безопасного потребления в более чем 10 секторах!","Китайская кухня отлично подходит для вечернего свидания или одинокого вечера!","Вы не ошибетесь, если попробуете настоящую китайскую кухню от мистера Чанга.!") - icon_state = "chang" + + icon_state = "chang_off" + panel_overlay = "chang_panel" + screen_overlay = "chang" + lightmask_overlay = "chang_lightmask" + broken_overlay = "chang_broken" + broken_lightmask_overlay = "chang_broken_lightmask" + products = list(/obj/item/reagent_containers/food/snacks/chinese/chowmein = 6, /obj/item/reagent_containers/food/snacks/chinese/tao = 6, /obj/item/reagent_containers/food/snacks/chinese/sweetsourchickenball = 6, /obj/item/reagent_containers/food/snacks/chinese/newdles = 6, /obj/item/reagent_containers/food/snacks/chinese/rice = 6, /obj/item/reagent_containers/food/snacks/fortunecookie = 6) prices = list(/obj/item/reagent_containers/food/snacks/chinese/chowmein = 50, /obj/item/reagent_containers/food/snacks/chinese/tao = 50, /obj/item/reagent_containers/food/snacks/chinese/sweetsourchickenball = 50, /obj/item/reagent_containers/food/snacks/chinese/newdles = 50, @@ -1005,16 +1139,24 @@ /obj/machinery/vending/cola name = "\improper Robust Softdrinks" desc = "A soft drink vendor provided by Robust Industries, LLC." - icon_state = "Cola_Machine" + + icon_state = "cola-machine_off" + panel_overlay = "cola-machine_panel" + screen_overlay = "cola-machine" + lightmask_overlay = "cola-machine_lightmask" + broken_overlay = "cola-machine_broken" + broken_lightmask_overlay = "cola-machine_broken_lightmask" + slogan_list = list("Роб+аст с+офтдринкс: крепче, чем тулбоксом по голове!") ads_list = list("Освежает!","Надеюсь, вас одолела жажда!","Продано больше миллиона бутылок!","Хотите пить? Почему бы не взять колы?","Пожалуйста, купите напиток","Выпьем!","Лучшие напитки во всём космосе") products = list(/obj/item/reagent_containers/food/drinks/cans/cola = 10,/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 10, /obj/item/reagent_containers/food/drinks/cans/dr_gibb = 10,/obj/item/reagent_containers/food/drinks/cans/starkist = 10, /obj/item/reagent_containers/food/drinks/cans/space_up = 10,/obj/item/reagent_containers/food/drinks/cans/grape_juice = 10) - contraband = list(/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 5) + contraband = list(/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 5, /obj/item/reagent_containers/food/drinks/zaza = 1) prices = list(/obj/item/reagent_containers/food/drinks/cans/cola = 20,/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 20, /obj/item/reagent_containers/food/drinks/cans/dr_gibb = 20,/obj/item/reagent_containers/food/drinks/cans/starkist = 20, - /obj/item/reagent_containers/food/drinks/cans/space_up = 20,/obj/item/reagent_containers/food/drinks/cans/grape_juice = 20) + /obj/item/reagent_containers/food/drinks/cans/space_up = 20,/obj/item/reagent_containers/food/drinks/cans/grape_juice = 20, + /obj/item/reagent_containers/food/drinks/zaza = 200) refill_canister = /obj/item/vending_refill/cola /obj/machinery/vending/cola/free @@ -1024,8 +1166,15 @@ name = "\improper PTech" desc = "Cartridges for PDA's." slogan_list = list("Карточки в дорогу!") - icon_state = "cart" - icon_deny = "cart-deny" + + icon_state = "cart_off" + panel_overlay = "cart_panel" + screen_overlay = "cart" + lightmask_overlay = "cart_lightmask" + broken_overlay = "cart_broken" + broken_lightmask_overlay = "cart_broken_lightmask" + deny_overlay = "cart_deny" + products = list(/obj/item/pda =10,/obj/item/eftpos = 6,/obj/item/cartridge/mob_hunt_game = 25,/obj/item/cartridge/medical = 10,/obj/item/cartridge/chemistry = 10, /obj/item/cartridge/engineering = 10,/obj/item/cartridge/atmos = 10,/obj/item/cartridge/janitor = 10, /obj/item/cartridge/signal/toxins = 10,/obj/item/cartridge/signal = 10) @@ -1041,7 +1190,14 @@ /obj/machinery/vending/liberationstation name = "\improper Liberation Station" desc = "An overwhelming amount of ancient patriotism washes over you just by looking at the machine." - icon_state = "liberationstation" + + icon_state = "liberationstation_off" + panel_overlay = "liberationstation_panel" + screen_overlay = "liberationstation" + lightmask_overlay = "liberationstation_lightmask" + broken_overlay = "liberationstation_broken" + broken_lightmask_overlay = "liberationstation_broken_lightmask" + req_access = list(ACCESS_SECURITY) slogan_list = list("Liberation Station: Your one-stop shop for all things second amendment!","Be a patriot today, pick up a gun!","Quality weapons for cheap prices!","Better dead than red!") ads_list = list("Float like an astronaut, sting like a bullet!","Express your second amendment today!","Guns don't kill people, but you can!","Who needs responsibilities when you have guns?") @@ -1059,7 +1215,14 @@ /obj/machinery/vending/toyliberationstation name = "\improper Syndicate Donksoft Toy Vendor" desc = "An ages 8 and up approved vendor that dispenses toys. If you were to find the right wires, you can unlock the adult mode setting!" - icon_state = "syndi" + + icon_state = "syndi_off" + panel_overlay = "syndi_panel" + screen_overlay = "syndi" + lightmask_overlay = "syndi_lightmask" + broken_overlay = "syndi_broken" + broken_lightmask_overlay = "syndi_broken_lightmask" + slogan_list = list("Get your cool toys today!","Trigger a valid hunter today!","Quality toy weapons for cheap prices!","Give them to HoPs for all access!","Give them to HoS to get permabrigged!") ads_list = list("Feel robust with your toys!","Express your inner child today!","Toy weapons don't kill people, but valid hunters do!","Who needs responsibilities when you have toy weapons?","Make your next murder FUN!") vend_reply = "Come back for more!" @@ -1090,7 +1253,14 @@ slogan_list = list("Космосигареты весьма хороши на вкус, какими они и должны быть","I'd rather toolbox than switch.","Затянитесь!","Не верьте исследованиям — курите!") ads_list = list("Наверняка не очень-то и вредно для Вас!","Не верьте учёным!","На здоровье!","Не бросайте курить, купите ещё!","Затянитесь!","Никотиновый рай","Лучшие сигареты с 2150 года","Сигареты с множеством наград") vend_delay = 34 - icon_state = "cigs" + + icon_state = "cigs_off" + panel_overlay = "cigs_panel" + screen_overlay = "cigs" + lightmask_overlay = "cigs_lightmask" + broken_overlay = "cigs_broken" + broken_lightmask_overlay = "cigs_broken_lightmask" + products = list(/obj/item/storage/fancy/cigarettes/cigpack_robust = 12, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 6, /obj/item/storage/fancy/cigarettes/cigpack_random = 6, /obj/item/reagent_containers/food/pill/patch/nicotine = 10, /obj/item/storage/box/matches = 10,/obj/item/lighter/random = 4,/obj/item/storage/fancy/rollingpapers = 5) contraband = list(/obj/item/lighter/zippo = 4, /obj/item/clothing/mask/cigarette/pipe/oldpipe = 3) premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2, /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1) @@ -1135,8 +1305,15 @@ /obj/machinery/vending/medical name = "\improper NanoMed Plus" desc = "Medical drug dispenser." - icon_state = "med" - icon_deny = "med-deny" + + icon_state = "med_off" + panel_overlay = "med_panel" + screen_overlay = "med" + lightmask_overlay = "med_lightmask" + broken_overlay = "med_broken" + broken_lightmask_overlay = "med_broken_lightmask" + deny_overlay = "med_deny" + ads_list = list("Иди и спаси несколько жизней!","Лучшее снаряжение для вашего медотдела","Только лучшие инструменты","Натуральные химикаты!","Эта штука спасает жизни","Может сами примете?","Пинг!") req_access = list(ACCESS_MEDICAL) products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/food/pill/patch/styptic = 4, /obj/item/reagent_containers/food/pill/patch/silver_sulf = 4, /obj/item/reagent_containers/applicator/brute = 3, /obj/item/reagent_containers/applicator/burn = 3, @@ -1155,8 +1332,15 @@ /obj/machinery/vending/medical/syndicate_access name = "\improper SyndiMed Plus" - icon_state = "syndi-big-med" - icon_deny = "syndi-big-med-deny" + + icon_state = "syndi-big-med_off" + panel_overlay = "syndi-big-med_panel" + screen_overlay = "syndi-big-med" + lightmask_overlay = "med_lightmask" + broken_overlay = "med_broken" + broken_lightmask_overlay = "med_broken_lightmask" + deny_overlay = "syndi-big-med_deny" + req_access = list(ACCESS_SYNDICATE) /obj/machinery/vending/medical/syndicate_access/beamgun @@ -1165,6 +1349,14 @@ /obj/machinery/vending/plasmaresearch name = "\improper Toximate 3000" desc = "All the fine parts you need in one vending machine!" + + icon_state = "generic_off" + panel_overlay = "generic_panel" + screen_overlay = "generic" + lightmask_overlay = "generic_lightmask" + broken_overlay = "generic_broken" + broken_lightmask_overlay = "generic_broken_lightmask" + products = list(/obj/item/assembly/prox_sensor = 8, /obj/item/assembly/igniter = 8, /obj/item/assembly/signaler = 8, /obj/item/wirecutters = 1, /obj/item/assembly/timer = 8) contraband = list(/obj/item/flashlight = 5, /obj/item/assembly/voice = 3, /obj/item/assembly/health = 3, /obj/item/assembly/infra = 3) @@ -1174,8 +1366,15 @@ name = "\improper NanoMed" desc = "Wall-mounted Medical Equipment dispenser." ads_list = list("Иди и спаси несколько жизней!","Лучшее снаряжение для вашего медотдела","Только лучшие инструменты","Натуральные химикаты!","Эта штука спасает жизни","Может сами примете?","Пинг!") - icon_state = "wallmed" - icon_deny = "wallmed-deny" + + icon_state = "wallmed_off" + panel_overlay = "wallmed_panel" + screen_overlay = "wallmed" + lightmask_overlay = "wallmed_lightmask" + broken_overlay = "wallmed_broken" + broken_lightmask_overlay = "wallmed_broken_lightmask" + deny_overlay = "wallmed_deny" + density = FALSE //It is wall-mounted, and thus, not dense. --Superxpdude products = list(/obj/item/stack/medical/bruise_pack = 2, /obj/item/stack/medical/ointment = 2, /obj/item/reagent_containers/hypospray/autoinjector = 4, /obj/item/healthanalyzer = 1) contraband = list(/obj/item/reagent_containers/syringe/charcoal = 4, /obj/item/reagent_containers/syringe/antiviral = 4, /obj/item/reagent_containers/food/pill/tox = 1) @@ -1186,8 +1385,16 @@ /obj/machinery/vending/wallmed/syndicate name = "\improper SyndiWallMed" desc = "EVIL wall-mounted Medical Equipment dispenser." - icon_state = "syndimed" - icon_deny = "syndimed-deny" + + icon_state = "syndimed_off" + panel_overlay = "wallmed_panel" + screen_overlay = "syndimed" + lightmask_overlay = "wallmed_lightmask" + broken_overlay = "wallmed_broken" + broken_lightmask_overlay = "wallmed_broken_lightmask" + deny_overlay = "syndimed_deny" + + broken_lightmask_overlay = "wallmed_broken_lightmask" ads_list = list("Иди и оборви несколько жизней!","Лучшее снаряжение для вашего корабля","Только лучшие инструменты","Натуральные химикаты!","Эта штука спасает жизни","Может сами примете?","Пинг!") req_access = list(ACCESS_SYNDICATE) products = list(/obj/item/stack/medical/bruise_pack = 2,/obj/item/stack/medical/ointment = 2,/obj/item/reagent_containers/hypospray/autoinjector = 4,/obj/item/healthanalyzer = 1) @@ -1198,22 +1405,37 @@ name = "\improper SecTech" desc = "A security equipment vendor." ads_list = list("Круши черепа капиталистов!","Отбей несколько голов!","Не забывай, вредительство - полезно!","Твое оружие здесь.","Наручники!","Стоять, подонок!","Не бей меня, брат!","Убей их, брат.","Почему бы не съесть пончик?") - icon_state = "sec" - icon_deny = "sec-deny" + + icon_state = "sec_off" + panel_overlay = "sec_panel" + screen_overlay = "sec" + lightmask_overlay = "sec_lightmask" + broken_overlay = "sec_broken" + broken_lightmask_overlay = "sec_broken_lightmask" + deny_overlay = "sec_deny" + req_access = list(ACCESS_SECURITY) products = list(/obj/item/restraints/handcuffs = 8,/obj/item/restraints/handcuffs/cable/zipties = 8,/obj/item/grenade/flashbang = 4,/obj/item/flash = 5, /obj/item/reagent_containers/food/snacks/donut = 12,/obj/item/storage/box/evidence = 6,/obj/item/flashlight/seclite = 4,/obj/item/restraints/legcuffs/bola/energy = 7, - /obj/item/clothing/mask/muzzle/safety = 4, /obj/item/storage/box/swabs = 6, /obj/item/storage/box/fingerprints = 6, /obj/item/eftpos/sec = 4, + /obj/item/clothing/mask/muzzle/safety = 4, /obj/item/storage/box/swabs = 6, /obj/item/storage/box/fingerprints = 6, /obj/item/eftpos/sec = 4, /obj/item/storage/belt/security/webbing = 2, ) contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/storage/fancy/donut_box = 2,/obj/item/hailer = 5) + prices = list(/obj/item/storage/belt/security/webbing = 2000,) refill_canister = /obj/item/vending_refill/security /obj/machinery/vending/security/training name = "\improper SecTech Training" desc = "A security training equipment vendor." ads_list = list("Соблюдай чистоту на стрельбище!","Даже я стреляю лучше тебя!","Почему так косо, бухой что ли?!","Техника безопасности нам не писана, да?","1 из 10 попаданий... А ты хорош!","Инструктор это твой папочка!","Эй, ты куда целишься?!") - icon_state = "sectraining" - icon_deny = "sectraining-deny" + + icon_state = "sectraining_off" + panel_overlay = "sec_panel" + screen_overlay = "sec" + lightmask_overlay = "sec_lightmask" + broken_overlay = "sec_broken" + broken_lightmask_overlay = "sectraining_broken_lightmask" + deny_overlay = "sec_deny" + req_access = list(ACCESS_SECURITY) products = list(/obj/item/clothing/ears/earmuffs = 2, /obj/item/gun/energy/laser/practice = 2, /obj/item/gun/projectile/automatic/toy/pistol/enforcer = 2, /obj/item/gun/projectile/shotgun/toy = 2, /obj/item/gun/projectile/automatic/toy = 2) @@ -1225,22 +1447,18 @@ if(!powered()) return add_fingerprint(user) - var/list/available_kits = list( - "Dominator Kit" = list(/obj/item/gun/energy/dominator/sibyl, /obj/item/clothing/accessory/holster), - "Enforcer Kit" = list(/obj/item/gun/projectile/automatic/pistol/enforcer/security, /obj/item/ammo_box/magazine/enforcer, /obj/item/ammo_box/magazine/enforcer, /obj/item/clothing/accessory/holster), - ) - var/weapon_kit = input(user, "Select a weaponary kit.") as null|anything in available_kits + var/list/available_kits = list("Dominator Kit" = /obj/item/storage/box/dominator_kit, + "Enforcer Kit" = /obj/item/storage/box/enforcer_kit) + var/weapon_kit = tgui_input_list(user, "Select a weaponary kit:", "Weapon kits", available_kits) if(!weapon_kit) return if(!Adjacent(user) || QDELETED(I) || I.loc != user) return qdel(I) sleep(0.5 SECONDS) - var/obj/item/storage/box/box = new(get_turf(src)) playsound(get_turf(src), 'sound/machines/machine_vend.ogg', 50, TRUE) - box.icon_state = "box_sec" - for(var/path in available_kits[weapon_kit]) - new path(box) + var/path = available_kits[weapon_kit] + var/obj/item/box = new path(get_turf(src)) if(Adjacent(user)) user.put_in_hands(box, ignore_anim = FALSE) return @@ -1258,8 +1476,15 @@ desc = "A plant nutrients vendor" slogan_list = list("Вам не надо удобрять почву естественным путём — разве это не чудесно?","Теперь на 50% меньше вони!","Растения тоже люди!") ads_list = list("Мы любим растения!","Может сами примете?","Самые зелёные кнопки на свете.","Мы любим большие растения.","Мягкая почва…") - icon_state = "nutri" - icon_deny = "nutri-deny" + + icon_state = "nutri_off" + panel_overlay = "nutri_panel" + screen_overlay = "nutri" + lightmask_overlay = "nutri_lightmask" + broken_overlay = "nutri_broken" + broken_lightmask_overlay = "nutri_broken_lightmask" + deny_overlay = "nutri_deny" + products = list(/obj/item/reagent_containers/glass/bottle/nutrient/ez = 20,/obj/item/reagent_containers/glass/bottle/nutrient/l4z = 13,/obj/item/reagent_containers/glass/bottle/nutrient/rh = 6,/obj/item/reagent_containers/spray/pestspray = 20, /obj/item/reagent_containers/syringe = 5,/obj/item/storage/bag/plants = 5,/obj/item/cultivator = 3,/obj/item/shovel/spade = 3,/obj/item/plant_analyzer = 4) contraband = list(/obj/item/reagent_containers/glass/bottle/ammonia = 10,/obj/item/reagent_containers/glass/bottle/diethylamine = 5) @@ -1270,7 +1495,14 @@ desc = "When you need seeds fast!" slogan_list = list("THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!","Hands down the best seed selection on the station!","Also certain mushroom varieties available, more for experts! Get certified today!") ads_list = list("Мы любим растения!","Вырасти урожай!","Расти, малыш, расти-и-и-и!","Ды-а, сына!") - icon_state = "seeds" + + icon_state = "seeds_off" + panel_overlay = "seeds_panel" + screen_overlay = "seeds" + lightmask_overlay = "seeds_lightmask" + broken_overlay = "seeds_broken" + broken_lightmask_overlay = "seeds_broken_lightmask" + products = list(/obj/item/seeds/aloe =3, /obj/item/seeds/ambrosia = 3, /obj/item/seeds/apple = 3, @@ -1334,7 +1566,14 @@ /obj/machinery/vending/magivend name = "\improper MagiVend" desc = "A magic vending machine." - icon_state = "MagiVend" + + icon_state = "magivend_off" + panel_overlay = "magivend_panel" + screen_overlay = "magivend" + lightmask_overlay = "magivend_lightmask" + broken_overlay = "magivend_broken" + broken_lightmask_overlay = "magivend_broken_lightmask" + slogan_list = list("Sling spells the proper way with MagiVend!","Be your own Houdini! Use MagiVend!") vend_delay = 15 vend_reply = "Have an enchanted evening!" @@ -1372,8 +1611,15 @@ /obj/machinery/vending/autodrobe name = "\improper AutoDrobe" desc = "A vending machine for costumes." - icon_state = "theater" - icon_deny = "theater-deny" + + icon_state = "theater_off" + panel_overlay = "theater_panel" + screen_overlay = "theater" + lightmask_overlay = "theater_lightmask" + broken_overlay = "theater_broken" + broken_lightmask_overlay = "theater_broken_lightmask" + deny_overlay = "theater_deny" + slogan_list = list("Dress for success!","Suited and booted!","It's show time!","Why leave style up to fate? Use AutoDrobe!") vend_delay = 15 vend_reply = "Thank you for using AutoDrobe!" @@ -1495,30 +1741,41 @@ /obj/item/clothing/under/redhawaiianshirt = 1, /obj/item/clothing/under/pinkhawaiianshirt = 1, /obj/item/clothing/under/bluehawaiianshirt = 1, - /obj/item/clothing/under/orangehawaiianshirt = 1) + /obj/item/clothing/under/orangehawaiianshirt = 1, + /obj/item/clothing/under/ussptracksuit_red = 4, + /obj/item/clothing/under/ussptracksuit_blue = 4) contraband = list(/obj/item/clothing/suit/judgerobe = 1, - /obj/item/clothing/head/powdered_wig = 1, - /obj/item/gun/magic/wand = 1, - /obj/item/clothing/mask/balaclava =1, - /obj/item/clothing/under/syndicate/blackops_civ = 1, - /obj/item/clothing/glasses/thermal_fake = 1, - /obj/item/clothing/mask/horsehead = 2) + /obj/item/clothing/head/powdered_wig = 1, + /obj/item/gun/magic/wand = 1, + /obj/item/clothing/mask/balaclava =1, + /obj/item/clothing/under/syndicate/blackops_civ = 1, + /obj/item/clothing/glasses/thermal_fake = 1, + /obj/item/clothing/mask/horsehead = 2) premium = list(/obj/item/clothing/suit/hgpirate = 1, - /obj/item/clothing/head/hgpiratecap = 1, - /obj/item/clothing/head/helmet/roman/fake = 1, - /obj/item/clothing/head/helmet/roman/legionaire/fake = 1, - /obj/item/clothing/under/roman = 1, - /obj/item/clothing/shoes/roman = 1, - /obj/item/shield/riot/roman/fake = 1, - /obj/item/clothing/under/cuban_suit = 1, - /obj/item/clothing/head/cuban_hat = 1) + /obj/item/clothing/head/hgpiratecap = 1, + /obj/item/clothing/head/helmet/roman/fake = 1, + /obj/item/clothing/head/helmet/roman/legionaire/fake = 1, + /obj/item/clothing/under/roman = 1, + /obj/item/clothing/shoes/roman = 1, + /obj/item/shield/riot/roman/fake = 1, + /obj/item/clothing/under/cuban_suit = 1, + /obj/item/clothing/head/cuban_hat = 1, + /obj/item/clothing/under/ussptracksuit_black = 1, + /obj/item/clothing/under/ussptracksuit_white = 1) refill_canister = /obj/item/vending_refill/autodrobe /obj/machinery/vending/dinnerware name = "\improper Plasteel Chef's Dinnerware Vendor" desc = "A kitchen and restaurant equipment vendor." ads_list = list("Mm, food stuffs!","Food and food accessories.","Get your plates!","You like forks?","I like forks.","Woo, utensils.","You don't really need these...") - icon_state = "dinnerware" + + icon_state = "dinnerware_off" + panel_overlay = "dinnerware_panel" + screen_overlay = "dinnerware" + lightmask_overlay = "dinnerware_lightmask" + broken_overlay = "dinnerware_broken" + broken_lightmask_overlay = "dinnerware_broken_lightmask" + products = list(/obj/item/storage/bag/tray = 8,/obj/item/kitchen/utensil/fork = 6, /obj/item/kitchen/knife = 3,/obj/item/kitchen/rollingpin = 2, /obj/item/kitchen/sushimat = 3, @@ -1555,7 +1812,14 @@ /obj/machinery/vending/sovietsoda name = "\improper BODA" desc = "Old sweet water vending machine." - icon_state = "sovietsoda" + + icon_state = "sovietsoda_off" + panel_overlay = "sovietsoda_panel" + screen_overlay = "sovietsoda" + lightmask_overlay = "sovietsoda_lightmask" + broken_overlay = "sovietsoda_broken" + broken_lightmask_overlay = "sovietsoda_broken_lightmask" + ads_list = list("For Tsar and Country.","Have you fulfilled your nutrition quota today?","Very nice!","We are simple people, for this is all we eat.","If there is a person, there is a problem. If there is no person, then there is no problem.") products = list(/obj/item/reagent_containers/food/drinks/drinkingglass/soda = 30) contraband = list(/obj/item/reagent_containers/food/drinks/drinkingglass/cola = 20) @@ -1565,8 +1829,15 @@ /obj/machinery/vending/tool name = "\improper YouTool" desc = "Tools for tools." - icon_state = "tool" - icon_deny = "tool-deny" + + icon_state = "tool_off" + panel_overlay = "tool_panel" + screen_overlay = "tool" + lightmask_overlay = "tool_lightmask" + broken_overlay = "tool_broken" + broken_lightmask_overlay = "tool_broken_lightmask" + deny_overlay = "tool_deny" + products = list(/obj/item/stack/cable_coil/random = 10,/obj/item/crowbar = 5,/obj/item/weldingtool = 3,/obj/item/wirecutters = 5, /obj/item/wrench = 5,/obj/item/analyzer = 5,/obj/item/t_scanner = 5,/obj/item/screwdriver = 5) contraband = list(/obj/item/weldingtool/hugetank = 2,/obj/item/clothing/gloves/color/fyellow = 2) @@ -1579,8 +1850,15 @@ /obj/machinery/vending/engivend name = "\improper Engi-Vend" desc = "Spare tool vending. What? Did you expect some witty description?" - icon_state = "engivend" - icon_deny = "engivend-deny" + + icon_state = "engivend_off" + panel_overlay = "engivend_panel" + screen_overlay = "engivend" + lightmask_overlay = "engivend_lightmask" + broken_overlay = "engivend_broken" + broken_lightmask_overlay = "engivend_broken_lightmask" + deny_overlay = "engivend_deny" + req_access = list(11,24) // Engineers and atmos techs can use this products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/multitool = 4,/obj/item/airlock_electronics = 10,/obj/item/firelock_electronics = 10,/obj/item/firealarm_electronics = 10,/obj/item/apc_electronics = 10,/obj/item/airalarm_electronics = 10,/obj/item/stock_parts/cell/high = 10,/obj/item/camera_assembly = 10) contraband = list(/obj/item/stock_parts/cell/potato = 3) @@ -1590,8 +1868,16 @@ /obj/machinery/vending/engineering name = "\improper Robco Tool Maker" desc = "Everything you need for do-it-yourself station repair." - icon_state = "engi" - icon_deny = "engi-deny" + + icon_state = "engi_off" + panel_overlay = "engi_panel" + screen_overlay = "engi" + lightmask_overlay = "engi_lightmask" + broken_overlay = "engi_broken" + broken_lightmask_overlay = "engi_broken_lightmask" + deny_overlay = "engi_deny" + deny_lightmask = "engi_deny_lightmask" + req_access = list(ACCESS_ENGINE_EQUIP) products = list(/obj/item/clothing/under/rank/chief_engineer = 4,/obj/item/clothing/under/rank/engineer = 4,/obj/item/clothing/shoes/workboots = 4,/obj/item/clothing/head/hardhat = 4, /obj/item/storage/belt/utility = 4,/obj/item/clothing/glasses/meson = 4,/obj/item/clothing/gloves/color/yellow = 4, /obj/item/screwdriver = 12, @@ -1604,8 +1890,16 @@ /obj/machinery/vending/robotics name = "\improper Robotech Deluxe" desc = "All the tools you need to create your own robot army." - icon_state = "robotics" - icon_deny = "robotics-deny" + + icon_state = "robotics_off" + panel_overlay = "robotics_panel" + screen_overlay = "robotics" + lightmask_overlay = "robotics_lightmask" + broken_overlay = "robotics_broken" + broken_lightmask_overlay = "robotics_broken_lightmask" + deny_overlay = "robotics_deny" + deny_lightmask = "robotics_deny_lightmask" + req_access = list(ACCESS_ROBOTICS) products = list(/obj/item/clothing/suit/storage/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/stack/cable_coil = 4,/obj/item/flash = 4, /obj/item/stock_parts/cell/high = 12, /obj/item/assembly/prox_sensor = 3,/obj/item/assembly/signaler = 3,/obj/item/healthanalyzer = 3, @@ -1618,7 +1912,15 @@ desc = "A vending machine which vends food, as required by section 47-C of the NT's Prisoner Ethical Treatment Agreement." slogan_list = list("Enjoy your meal.","Enough calories to support strenuous labor.") ads_list = list("The healthiest!","Award-winning chocolate bars!","Mmm! So good!","Oh my god it's so juicy!","Have a snack.","Snacks are good for you!","Have some more Getmore!","Best quality snacks straight from mars.","We love chocolate!","Try our new jerky!") - icon_state = "sustenance" + + icon_state = "sustenance_off" + panel_overlay = "snack_panel" + screen_overlay = "snack" + lightmask_overlay = "snack_lightmask" + broken_overlay = "snack_broken" + broken_lightmask_overlay = "snack_broken_lightmask" + + broken_lightmask_overlay = "snack_broken_lightmask" products = list(/obj/item/reagent_containers/food/snacks/tofu = 24, /obj/item/reagent_containers/food/drinks/ice = 12, /obj/item/reagent_containers/food/snacks/candy/candy_corn = 6) @@ -1638,7 +1940,14 @@ /obj/machinery/vending/hatdispenser name = "\improper Hatlord 9000" desc = "It doesn't seem the slightest bit unusual. This frustrates you immensely." - icon_state = "hats" + + icon_state = "hats_off" + panel_overlay = "hats_panel" + screen_overlay = "hats" + lightmask_overlay = "hats_lightmask" + broken_overlay = "hats_broken" + broken_lightmask_overlay = "hats_broken_lightmask" + ads_list = list("Warning, not all hats are dog/monkey compatible. Apply forcefully with care.","Apply directly to the forehead.","Who doesn't love spending cash on hats?!","From the people that brought you collectable hat crates, Hatlord!") products = list(/obj/item/clothing/head/bowlerhat = 10, /obj/item/clothing/head/beaverhat = 10, @@ -1653,7 +1962,14 @@ /obj/machinery/vending/suitdispenser name = "\improper Suitlord 9000" desc = "You wonder for a moment why all of your shirts and pants come conjoined. This hurts your head and you stop thinking about it." - icon_state = "suits" + + icon_state = "suits_off" + panel_overlay = "suits_panel" + screen_overlay = "suits" + lightmask_overlay = "suits_lightmask" + broken_overlay = "suits_broken" + broken_lightmask_overlay = "suits_broken_lightmask" + ads_list = list("Pre-Ironed, Pre-Washed, Pre-Wor-*BZZT*","Blood of your enemies washes right out!","Who are YOU wearing?","Look dapper! Look like an idiot!","Dont carry your size? How about you shave off some pounds you fat lazy- *BZZT*") products = list( /obj/item/clothing/under/color/black = 10, @@ -1684,7 +2000,15 @@ /obj/machinery/vending/shoedispenser name = "\improper Shoelord 9000" desc = "Wow, hatlord looked fancy, suitlord looked streamlined, and this is just normal. The guy who designed these must be an idiot." - icon_state = "shoes" + + icon_state = "shoes_off" + icon_state = "shoes_off" + panel_overlay = "shoes_panel" + screen_overlay = "shoes" + lightmask_overlay = "shoes_lightmask" + broken_overlay = "shoes_broken" + broken_lightmask_overlay = "shoes_broken_lightmask" + ads_list = list("Put your foot down!","One size fits all!","IM WALKING ON SUNSHINE!","No hobbits allowed.","NO PLEASE WILLY, DONT HURT ME- *BZZT*") products = list(/obj/item/clothing/shoes/black = 10,/obj/item/clothing/shoes/brown = 10,/obj/item/clothing/shoes/blue = 10,/obj/item/clothing/shoes/green = 10,/obj/item/clothing/shoes/yellow = 10,/obj/item/clothing/shoes/purple = 10,/obj/item/clothing/shoes/red = 10,/obj/item/clothing/shoes/white = 10,/obj/item/clothing/shoes/sandal=10) contraband = list(/obj/item/clothing/shoes/orange = 5) @@ -1697,7 +2021,14 @@ slogan_list = list("Космосигареты на вкус хороши, какими они и должны быть.","I'd rather toolbox than switch.","Затянитесь!","Не верьте исследованиям — курите сегодня!") ads_list = list("Наверняка не очень-то и вредно для Вас!","Не верьте учёным!","На здоровье!","Не бросайте курить, купите ещё!","Затянитесь!","Никотиновый рай.","Лучшие сигареты с 2150 года.","Сигареты с множеством наград.") vend_delay = 34 - icon_state = "cigs" + + icon_state = "cigs_off" + panel_overlay = "cigs_panel" + screen_overlay = "cigs" + lightmask_overlay = "cigs_lightmask" + broken_overlay = "cigs_broken" + broken_lightmask_overlay = "cigs_broken_lightmask" + products = list(/obj/item/storage/fancy/cigarettes/syndicate = 10,/obj/item/lighter/random = 5) @@ -1706,7 +2037,14 @@ desc = "A modified snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars" slogan_list = list("Try our new nougat bar!","Twice the calories for half the price!") ads_list = list("The healthiest!","Award-winning chocolate bars!","Mmm! So good!","Oh my god it's so juicy!","Have a snack.","Snacks are good for you!","Have some more Getmore!","Best quality snacks straight from mars.","We love chocolate!","Try our new jerky!") - icon_state = "snack" + + icon_state = "snack_off" + panel_overlay = "snack_panel" + screen_overlay = "snack" + lightmask_overlay = "snack_lightmask" + broken_overlay = "snack_broken" + broken_lightmask_overlay = "snack_broken_lightmask" + products = list(/obj/item/reagent_containers/food/snacks/chips =6,/obj/item/reagent_containers/food/snacks/sosjerky = 6, /obj/item/reagent_containers/food/snacks/syndicake = 6, /obj/item/reagent_containers/food/snacks/cheesiehonkers = 6) @@ -1714,8 +2052,16 @@ name = "Синди Робо-ДеЛюкс!" desc = "Всё что нужно, чтобы сделать личного железного друга из ваших врагов!" ads_list = list("Make them beep-boop like a robot should!","Robotisation is NOT a crime!","Nyoom!") - icon_state = "robotics" - icon_deny = "robotics-deny" + + icon_state = "robotics_off" + panel_overlay = "robotics_panel" + screen_overlay = "robotics" + lightmask_overlay = "robotics_lightmask" + broken_overlay = "robotics_broken" + broken_lightmask_overlay = "robotics_broken_lightmask" + deny_overlay = "robotics_deny" + deny_lightmask = "robotics_deny_lightmask" + req_access = list(ACCESS_SYNDICATE) products = list(/obj/item/robot_parts/robot_suit = 2, /obj/item/robot_parts/chest = 2, @@ -1735,7 +2081,14 @@ /obj/machinery/vending/clothing name = "\improper ClothesMate" //renamed to make the slogan rhyme desc = "A vending machine for clothing." - icon_state = "clothes" + + icon_state = "clothes_off" + panel_overlay = "clothes_panel" + screen_overlay = "clothes" + lightmask_overlay = "clothes_lightmask" + broken_overlay = "clothes_broken" + broken_lightmask_overlay = "clothes_broken_lightmask" + slogan_list = list("Dress for success!","Prepare to look swagalicious!","Look at all this free swag!","Why leave style up to fate? Use the ClothesMate!") vend_delay = 15 vend_reply = "Thank you for using the ClothesMate!" @@ -1835,7 +2188,14 @@ slogan_list = list("Stop by for all your artistic needs!","Color the floors with crayons, not blood!","Don't be a starving artist, use ArtVend. ","Don't fart, do art!") ads_list = list("Just like Kindergarten!","Now with 1000% more vibrant colors!","Screwing with the janitor was never so easy!","Creativity is at the heart of every spessman.") vend_delay = 15 - icon_state = "artvend" + + icon_state = "artvend_off" + panel_overlay = "artvend_panel" + screen_overlay = "artvend" + lightmask_overlay = "artvend_lightmask" + broken_overlay = "artvend_broken" + broken_lightmask_overlay = "artvend_broken_lightmask" + products = list(/obj/item/toy/crayon/spraycan = 2,/obj/item/stack/cable_coil/random = 10,/obj/item/camera = 4,/obj/item/camera_film = 6, /obj/item/storage/photo_album = 2,/obj/item/stack/wrapping_paper = 4,/obj/item/stack/tape_roll = 5,/obj/item/stack/packageWrap = 4, /obj/item/storage/fancy/crayons = 4,/obj/item/hand_labeler = 4,/obj/item/paper = 10, @@ -1851,7 +2211,14 @@ slogan_list = list("Stop by for all your animal's needs!","Cuddly pets deserve a stylish collar!","Pets in space, what could be more adorable?","Freshest fish eggs in the system!","Rocks are the perfect pet, buy one today!") ads_list = list("House-training costs extra!","Now with 1000% more cat hair!","Allergies are a sign of weakness!","Dogs are man's best friend. Remember that Vulpkanin!"," Heat lamps for Unathi!"," Vox-y want a cracker?") vend_delay = 15 - icon_state = "crittercare" + + icon_state = "crittercare_off" + panel_overlay = "crittercare_panel" + screen_overlay = "crittercare" + lightmask_overlay = "crittercare_lightmask" + broken_overlay = "crittercare_broken" + broken_lightmask_overlay = "crittercare_broken_lightmask" + products = list(/obj/item/clothing/accessory/petcollar = 5, /obj/item/storage/firstaid/aquatic_kit/full =5, /obj/item/fish_eggs/goldfish = 5, /obj/item/fish_eggs/clownfish = 5, /obj/item/fish_eggs/shark = 5, /obj/item/fish_eggs/feederfish = 10, /obj/item/fish_eggs/salmon = 5, /obj/item/fish_eggs/catfish = 5, /obj/item/fish_eggs/glofish = 5, @@ -1874,7 +2241,6 @@ /obj/machinery/vending/clothing/departament name = "\improper Broken Departament ClothesMate" desc = "Автомат-помощник по выдаче одежды отдела." - icon_state = "clothes" slogan_list = list( "Одежда успешного работника!", "Похвала на глаза!", "Ну наконец-то нормально оделся!", "Одевай одежду, надевай еще и шляпку!", "Вот это гордость такое надевать!", "Выглядишь отпадно!", @@ -1897,8 +2263,14 @@ /obj/machinery/vending/clothing/departament/security name = "\improper Departament Security ClothesMate" desc = "Автомат-помощник по выдаче одежды Отдела Службы Безопасности." - icon_state = "clothes-dep-sec" - //slogan_list += list() + + icon_state = "clothes-dep-sec_off" + panel_overlay = "clothes_panel" + screen_overlay = "clothes-dep-sec" + lightmask_overlay = "clothes_lightmask" + broken_overlay = "clothes-dep-sec_broken" + broken_lightmask_overlay = "clothes_broken_lightmask" + req_access = list(ACCESS_SEC_DOORS) products = list( /obj/item/clothing/head/soft/sec = 10, @@ -1925,6 +2297,7 @@ /obj/item/clothing/mask/balaclava = 10, /obj/item/clothing/mask/bandana/red = 10, /obj/item/clothing/mask/bandana/black = 10, + /obj/item/clothing/mask/secscarf = 10, /obj/item/clothing/gloves/color/black = 10, /obj/item/clothing/gloves/color/red = 10, @@ -1966,8 +2339,14 @@ /obj/machinery/vending/clothing/departament/medical name = "\improper Departament Medical ClothesMate" desc = "Автомат-помощник по выдаче одежды Медицинского Отдела." - icon_state = "clothes-dep-med" - //slogan_list += list() + + icon_state = "clothes-dep-med_off" + panel_overlay = "clothes_panel" + screen_overlay = "clothes-dep-med" + lightmask_overlay = "clothes_lightmask" + broken_overlay = "clothes-dep-med_broken" + broken_lightmask_overlay = "clothes_broken_lightmask" + req_access = list(ACCESS_MEDICAL) products = list( /obj/item/clothing/head/beret/med = 10, @@ -2057,9 +2436,15 @@ /obj/machinery/vending/clothing/departament/engineering name = "\improper Departament Engineering ClothesMate" desc = "Автомат-помощник по выдаче одежды Инженерного Отдела." - icon_state = "clothes-dep-eng" + + icon_state = "clothes-dep-eng_off" + panel_overlay = "clothes_panel" + screen_overlay = "clothes-dep-eng" + lightmask_overlay = "clothes_lightmask" + broken_overlay = "clothes-dep-eng_broken" + broken_lightmask_overlay = "clothes_broken_lightmask" + req_access = list(ACCESS_ENGINE_EQUIP) - //slogan_list += list() products = list( /obj/item/clothing/head/hardhat = 10, /obj/item/clothing/head/hardhat/orange = 10, @@ -2110,8 +2495,14 @@ /obj/machinery/vending/clothing/departament/science name = "\improper Departament Science ClothesMate" desc = "Автомат-помощник по выдаче одежды Научного Отдела." - icon_state = "clothes-dep-sci" - //slogan_list += list() + + icon_state = "clothes-dep-sci_off" + panel_overlay = "clothes_panel" + screen_overlay = "clothes-dep-sci" + lightmask_overlay = "clothes_lightmask" + broken_overlay = "clothes-dep-sci_broken" + broken_lightmask_overlay = "clothes_broken_lightmask" + req_access = list(ACCESS_RESEARCH) products = list( /obj/item/clothing/head/beret/purple_normal = 10, @@ -2159,8 +2550,14 @@ /obj/machinery/vending/clothing/departament/cargo name = "\improper Departament Cargo ClothesMate" desc = "Автомат-помощник по выдаче одежды Отдела Поставок." - icon_state = "clothes-dep-car" - //slogan_list += list() + + icon_state = "clothes-dep-car_off" + panel_overlay = "clothes_panel" + screen_overlay = "clothes-dep-car" + lightmask_overlay = "clothes_lightmask" + broken_overlay = "clothes-dep-car_broken" + broken_lightmask_overlay = "clothes_broken_lightmask" + req_access = list(ACCESS_MINING) products = list( /obj/item/clothing/head/soft = 10, @@ -2211,9 +2608,15 @@ /obj/machinery/vending/clothing/departament/law name = "\improper Departament Law ClothesMate" desc = "Автомат-помощник по выдаче одежды Юридического Отдела." - icon_state = "clothes-dep-sec" - //slogan_list += list() - req_access = list(38) + + icon_state = "clothes-dep-sec_off" + panel_overlay = "clothes_panel" + screen_overlay = "clothes-dep-sec" + lightmask_overlay = "clothes_lightmask" + broken_overlay = "clothes-dep-sec_broken" + broken_lightmask_overlay = "clothes_broken_lightmask" + + req_access = list(ACCESS_LAWYER) products = list( /obj/item/clothing/under/rank/internalaffairs = 10, /obj/item/clothing/under/lawyer/female = 10, @@ -2263,8 +2666,6 @@ /obj/machinery/vending/clothing/departament/service name = "\improper Departament Service ClothesMate" desc = "Автомат-помощник по выдаче одежды Сервисного отдела." - icon_state = "clothes" - //slogan_list += list() req_access = list() products = list() refill_canister = /obj/item/vending_refill/ @@ -2272,8 +2673,14 @@ /obj/machinery/vending/clothing/departament/service/chaplain name = "\improper Departament Service ClothesMate Chaplain" desc = "Автомат-помощник по выдаче одежды Сервисного отдела церкви." - icon_state = "clothes-dep-car" - //slogan_list += list() + + icon_state = "clothes-dep-car_off" + panel_overlay = "clothes_panel" + screen_overlay = "clothes-dep-car" + lightmask_overlay = "clothes_lightmask" + broken_overlay = "clothes-dep-car_broken" + broken_lightmask_overlay = "clothes_broken_lightmask" + req_access = list(ACCESS_CHAPEL_OFFICE) products = list( /obj/item/clothing/under/rank/chaplain = 5, @@ -2303,8 +2710,6 @@ /obj/machinery/vending/clothing/departament/service/botanical name = "\improper Departament Service ClothesMate Botanical" desc = "Автомат-помощник по выдаче одежды Сервисного отдела ботаники." - icon_state = "clothes" - //slogan_list += list() req_access = list(ACCESS_HYDROPONICS) products = list( /obj/item/clothing/under/rank/hydroponics = 5, @@ -2333,9 +2738,17 @@ name = "NT Ammunition" desc = "A special equipment vendor." ads_list = list("Возьми патрон!","Не забывай, снаряжаться - полезно!","Бжж-Бзз-з!.","Обезопасить, Удержать, Сохранить!","Стоять, снярядись на задание!") - icon_state = "nta" - icon_deny = "nta_deny" - icon_vend = "nta_vend" + + icon_state = "nta_base" + panel_overlay = "nta_panel" + screen_overlay = "nta" + lightmask_overlay = "nta_lightmask" + broken_overlay = "nta_broken" + broken_lightmask_overlay = "nta_lightmask" + vend_overlay = "nta_vend" + deny_overlay = "nta_deny" + vend_overlay_time = 3 SECONDS + req_access = list(ACCESS_SECURITY) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF products = list( @@ -2371,12 +2784,43 @@ contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/storage/fancy/donut_box = 2,/obj/item/grenade/clusterbuster/apocalypsefake = 1) refill_canister = /obj/item/vending_refill/nta + +/obj/machinery/vending/nta/ertarmory/update_overlays() + . = list() + + underlays.Cut() + + . += base_icon_state + + if(panel_open) + . += "nta_panel" + + if((stat & NOPOWER) || force_no_power_icon_state) + . += "nta_off" + return + + if(stat & BROKEN) + . += "nta_broken" + else + if(flick_sequence & FLICK_VEND) + . += vend_overlay + + else if(flick_sequence & FLICK_DENY) + . += deny_overlay + + underlays += emissive_appearance(icon, "nta_lightmask") + + /obj/machinery/vending/nta/ertarmory/blue name = "NT ERT Medium Gear & Ammunition" desc = "A ERT Medium equipment vendor." ads_list = list("Круши черепа синдиката!","Не забывай, спасать - полезно!","Бжж-Бзз-з!.","Обезопасить, Удержать, Сохранить!","Стоять, снярядись на задание!") - icon_state = "nta_blue" - icon_deny = "nta_blue_deny" + + icon_state = "nta_base" + base_icon_state = "nta-blue" + vend_overlay = "nta_vend" + deny_overlay = "nta-blue_deny" + req_access = list(ACCESS_CENT_SECURITY) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF products = list( @@ -2400,8 +2844,12 @@ name = "NT ERT Heavy Gear & Ammunition" desc = "A ERT Heavy equipment vendor." ads_list = list("Круши черепа синдиката!","Не забывай, спасать - полезно!","Бжж-Бзз-з!.","Обезопасить, Удержать, Сохранить!","Стоять, снярядись на задание!") - icon_state = "nta_red" - icon_deny = "nta_red_deny" + + icon_state = "nta_base" + base_icon_state = "nta-red" + vend_overlay = "nta_vend" + deny_overlay = "nta-red_deny" + req_access = list(ACCESS_CENT_SECURITY) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF products = list( @@ -2425,8 +2873,12 @@ name = "NT ERT Light Gear & Ammunition" desc = "A ERT Light equipment vendor." ads_list = list("Круши черепа синдиката!","Не забывай, спасать - полезно!","Бжж-Бзз-з!.","Обезопасить, Удержать, Сохранить!","Стоять, снярядись на задание!") - icon_state = "nta_green" - icon_deny = "nta_green_deny" + + icon_state = "nta_base" + base_icon_state = "nta-green" + vend_overlay = "nta_vend" + deny_overlay = "nta-green_deny" + req_access = list(ACCESS_CENT_SECURITY) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF products = list( @@ -2444,7 +2896,8 @@ /obj/item/ammo_box/speedloader/shotgun = 4, /obj/item/gun/projectile/automatic/wt550 = 3, /obj/item/ammo_box/magazine/wt550m9 = 6, - /obj/item/gun/energy/dominator/sibyl = 2 + /obj/item/gun/energy/dominator/sibyl = 2, + /obj/item/melee/classic_baton/telescopic = 4 ) contraband = list(/obj/item/storage/fancy/donut_box = 2) refill_canister = /obj/item/vending_refill/nta @@ -2453,8 +2906,12 @@ name = "NT ERT Death Wish Gear & Ammunition" desc = "A ERT Death Wish equipment vendor." ads_list = list("Круши черепа ВСЕХ!","Не забывай, УБИВАТЬ - полезно!","УБИВАТЬ УБИВАТЬ УБИВАТЬ УБИВАТЬ!.","УБИВАТЬ, Удержать, УБИВАТЬ!","Стоять, снярядись на УБИВАТЬ!") - icon_state = "nta_yellow" - icon_deny = "nta_yellow_deny" + + icon_state = "nta_base" + base_icon_state = "nta-yellow" + vend_overlay = "nta_vend" + deny_overlay = "nta-yellow_deny" + req_access = list(ACCESS_CENT_SECURITY) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF products = list( @@ -2477,8 +2934,12 @@ name = "NT ERT Medical Gear" desc = "A ERT medical equipment vendor." ads_list = list("Лечи раненых от рук синдиката!","Не забывай, лечить - полезно!","Бжж-Бзз-з!.","Перевязать, Оперировать, Выписать!","Стоять, снярядись медикаментами на задание!") - icon_state = "nta_medical" - icon_deny = "nta_medical_deny" + + icon_state = "nta_base" + base_icon_state = "nta-medical" + vend_overlay = "nta_vend" + deny_overlay = "nta-medical_deny" + req_access = list(ACCESS_CENT_MEDICAL) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF products = list( @@ -2511,8 +2972,12 @@ name = "NT ERT Engineer Gear" desc = "A ERT engineering equipment vendor." ads_list = list("Чини станцию от рук синдиката!","Не забывай, чинить - полезно!","Бжж-Бзз-з!.","Починить, Заварить, Трубить!","Стоять, снярядись на починку труб!") - icon_state = "nta_engi" - icon_deny = "nta_engi_deny" + + icon_state = "nta_base" + base_icon_state = "nta-engi" + vend_overlay = "nta_vend" + deny_overlay = "nta-engi_deny" + req_access = list(ACCESS_CENT_GENERAL) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF products = list( @@ -2538,8 +3003,12 @@ name = "NT ERT Janitor Gear" desc = "A ERT ccleaning equipment vendor." ads_list = list("Чисть станцию от рук синдиката!","Не забывай, чистить - полезно!","Вилкой чисти!.","Помыть, Постирать, Оттереть!","Стоять, снярядись клинерами!") - icon_state = "nta_janitor" - icon_deny = "nta_janitor_deny" + + icon_state = "nta_base" + base_icon_state = "nta-janitor" + vend_overlay = "nta_vend" + deny_overlay = "nta-janitor_deny" + req_access = list(ACCESS_CENT_GENERAL) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF products = list( @@ -2563,7 +3032,14 @@ /obj/machinery/vending/pai name = "\improper RoboFriends" desc = "Wonderful vendor of PAI friends" - icon_state = "paivend" + + icon_state = "paivend_off" + panel_overlay = "paivend_panel" + screen_overlay = "paivend" + lightmask_overlay = "paivend_lightmask" + broken_overlay = "paivend_broken" + broken_lightmask_overlay = "paivend_broken_lightmask" + ads_list = list("А вы любите нас?","Мы твои друзья!","Эта покупка войдет в историю","Я ПАИ простой, купишь меня, а я тебе друга!","Спасибо за покупку.") resistance_flags = FIRE_PROOF products = list( @@ -2591,3 +3067,9 @@ /obj/item/pai_cartridge/memory = 350 ) refill_canister = /obj/item/vending_refill/pai + + +#undef FLICK_NONE +#undef FLICK_VEND +#undef FLICK_DENY + diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index d4b9ecbccd2..6edc0abcc19 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/machines/washing_machine.dmi' icon_state = "wm_10" density = 1 - anchored = 1.0 + anchored = TRUE var/state = 1 //1 = empty, open door //2 = empty, closed door @@ -162,10 +162,6 @@ for(var/obj/item/clothing/shoes/S in contents) if(!S.dyeable) continue - if(S.chained == 1) - S.chained = 0 - S.slowdown = SHOES_SLOWDOWN - new /obj/item/restraints/handcuffs( src ) S.icon_state = new_shoe_icon_state S.item_color = wash_color S.name = new_shoe_name @@ -221,7 +217,7 @@ usr.loc = src.loc -/obj/machinery/washing_machine/update_icon() +/obj/machinery/washing_machine/update_icon_state() icon_state = "wm_[state][panel]" /obj/machinery/washing_machine/attackby(obj/item/W as obj, mob/user as mob, params) diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index ac467769754..b0fd6eb75d3 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -330,7 +330,7 @@ if(reagents.total_volume<=0) occupant_message(span_alert("No available reagents to load syringe with.")) return FALSE - var/turf/trg = get_turf(target) + var/turf/target_turf = get_turf(target) var/obj/item/reagent_containers/syringe/mechsyringe = syringes[1] mechsyringe.forceMove(get_turf(chassis)) reagents.trans_to(mechsyringe, min(mechsyringe.volume, reagents.total_volume)) @@ -340,42 +340,49 @@ playsound(chassis, 'sound/items/syringeproj.ogg', 50, 1) log_message("Launched [mechsyringe] from [src], targeting [target].") start_cooldown() + INVOKE_ASYNC(src, PROC_REF(async_syringe_gun_action), mechsyringe, target_turf) + + +/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/async_syringe_gun_action(obj/item/reagent_containers/syringe/mechsyringe, turf/target_turf) var/mob/originaloccupant = chassis.occupant var/original_target_zone = originaloccupant.zone_selected - spawn(0) - src = null //if src is deleted, still process the syringe - var/max_range = 6 - for(var/i=0, i
"
- if(cargo.len)
- for(var/obj/O in cargo)
- output += "Unload : [O]
" - else - output += "Nothing" - output += "
"
- return output
-
-// /obj/mecha/makeshift/relay_container_resist(mob/living/user, obj/O)
-// to_chat(user, "You lean on the back of [O] and start pushing so it falls out of [src].")
-// if(do_after(user, 10, target = O))//Its a fukken locker
-// if(!user || user.stat != CONSCIOUS || user.loc != src || O.loc != src )
-// return
-// to_chat(user, "You successfully pushed [O] out of [src]!")
-// O.loc = loc
-// cargo -= O
-// else
-// if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded.
-// to_chat(user, "You fail to push [O] out of [src]!")
/obj/mecha/makeshift/Destroy()
new /obj/structure/closet(loc)
@@ -92,13 +37,6 @@
max_equip = 4
wreckage = null
-/obj/mecha/combat/lockersyndie/go_out()
- ..()
- update_icon()
-
-/obj/mecha/combat/lockersyndie/moved_inside(mob/living/carbon/human/H)
- ..()
- update_icon()
/obj/mecha/combat/lockersyndie/add_cell()
cell = new /obj/item/stock_parts/cell/high/slime(src)
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 543e425bcb5..fb580773f06 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -12,7 +12,7 @@
/obj/machinery/mech_bay_recharge_port
name = "Mech Bay Power Port"
density = 1
- anchored = 1
+ anchored = TRUE
dir = EAST
icon = 'icons/obj/mecha/mech_bay.dmi'
icon_state = "recharge_port"
@@ -113,7 +113,7 @@
/obj/machinery/computer/mech_bay_power_console
name = "mech bay power control console"
density = 1
- anchored = 1
+ anchored = TRUE
icon = 'icons/obj/machines/computer.dmi'
icon_keyboard = "tech_key"
icon_screen = "recharge_comp"
@@ -122,12 +122,17 @@
var/obj/machinery/mech_bay_recharge_port/recharge_port
-/obj/machinery/computer/mech_bay_power_console/update_icon()
- if(!recharge_port || !recharge_port.recharging_mecha || !recharge_port.recharging_mecha.cell || !(recharge_port.recharging_mecha.cell.charge < recharge_port.recharging_mecha.cell.maxcharge) || stat & (NOPOWER|BROKEN))
- icon_screen = "recharge_comp"
+/obj/machinery/computer/mech_bay_power_console/update_overlays()
+ if(stat & (NOPOWER|BROKEN))
+ icon_screen = "recharge_comp" // off
else
- icon_screen = "recharge_comp_on"
- ..()
+ var/obj/item/stock_parts/cell/cell = recharge_port?.recharging_mecha?.cell
+ if(!cell || cell.charge >= cell.maxcharge)
+ icon_screen = "recharge_comp" // don't have a reachable cell to charge or fully charged
+ else
+ icon_screen = "recharge_comp_on" // now we working!
+ . = ..()
+
/obj/machinery/computer/mech_bay_power_console/proc/reconnect()
if(recharge_port)
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 4f48c565b60..6afc03349a1 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -34,7 +34,6 @@
var/add_req_access = TRUE
var/maint_access = TRUE
var/dna //dna-locking the mech
- var/list/proc_res = list() //stores proc owners, like proc_res["functionname"] = owner reference
var/datum/effect_system/spark_spread/spark_system = new
var/lights = 0
var/lights_power = 6
@@ -42,7 +41,12 @@
var/emagged = FALSE
var/frozen = FALSE
var/repairing = FALSE
- var/cargo_expanded = FALSE // for wide cargo module
+ /// The internal storage of the exosuit. For the cargo module
+ var/list/cargo
+ /// You can fit a few things in this mecha but not much.
+ var/cargo_capacity = 1
+ /// for wide cargo module
+ var/cargo_expanded = FALSE
//inner atmos
var/use_internal_tank = FALSE
@@ -744,15 +748,27 @@
if(occupant)
occupant.ex_act(severity)
+ for(var/X in cargo)
+ var/atom/movable/cargo_thing = X
+ if(prob(30 / severity))
+ cargo -= cargo_thing
+ cargo_thing.forceMove(drop_location())
+
/obj/mecha/handle_atom_del(atom/A)
if(A == occupant)
occupant = null
- icon_state = initial(icon_state)+"-open"
+ update_icon(UPDATE_ICON_STATE)
setDir(dir_in)
if(A in trackers)
trackers -= A
/obj/mecha/Destroy()
+
+ for(var/atom/movable/cargo_thing as anything in cargo)
+ cargo -= cargo_thing
+ cargo_thing.forceMove(drop_location())
+ step_rand(cargo_thing)
+
if(occupant)
occupant.SetSleeping(destruction_sleep_duration)
go_out()
@@ -887,7 +903,7 @@
name = P.new_name
desc = P.new_desc
initial_icon = P.new_icon
- reset_icon()
+ update_icon(UPDATE_ICON_STATE)
user.temporarily_remove_item_from_inventory(P)
qdel(P)
@@ -1065,7 +1081,7 @@
occupant = null
AI.controlled_mech = null
AI.remote_control = null
- icon_state = reset_icon(icon_state)+"-open"
+ update_icon(UPDATE_ICON_STATE)
to_chat(AI, "You have been downloaded to a mobile storage device. Wireless connection offline.")
to_chat(user, "[span_boldnotice("Transfer successful")]: [AI.name] ([rand(1000,9999)].exe) removed from [name] and stored within local memory.")
@@ -1102,7 +1118,7 @@
AI.aiRestorePowerRoutine = 0
AI.forceMove(src)
occupant = AI
- icon_state = reset_icon(icon_state)
+ update_icon(UPDATE_ICON_STATE)
playsound(src, 'sound/machines/windowdoor.ogg', 50, 1)
if(!hasInternalDamage())
occupant << sound(nominalsound, volume = 50)
@@ -1203,10 +1219,10 @@
/obj/mecha/proc/toggle_internal_tank()
internals_action.Trigger()
-/obj/mecha/MouseDrop_T(mob/M, mob/user)
+/obj/mecha/MouseDrop_T(mob/M, mob/user, params)
if(frozen)
to_chat(user, span_warning("Do not enter Admin-Frozen mechs."))
- return
+ return TRUE
if(user.incapacitated())
return
if(user != M)
@@ -1215,7 +1231,7 @@
if(occupant)
to_chat(user, span_warning("The [src] is already occupied!"))
log_append_to_last("Permission denied.")
- return
+ return TRUE
var/passed
if(dna)
if(ishuman(user))
@@ -1226,17 +1242,21 @@
if(!passed)
to_chat(user, span_warning("Access denied."))
log_append_to_last("Permission denied.")
- return
+ return TRUE
if(user.buckled)
to_chat(user, span_warning("You are currently buckled and cannot move."))
log_append_to_last("Permission denied.")
- return
+ return TRUE
if(user.has_buckled_mobs()) //mob attached to us
to_chat(user, span_warning("You can't enter the exosuit with other creatures attached to you!"))
- return
+ return TRUE
+
+ visible_message(span_notice("[user] starts to climb into [src]"))
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/mecha, put_in), user)
+ return TRUE
- visible_message(span_notice("[user] starts to climb into [src]."))
+/obj/mecha/proc/put_in(mob/user)
if(do_after(user, mech_enter_time * gettoolspeedmod(user), target = src))
if(obj_integrity <= 0)
to_chat(user, span_warning("You cannot get in the [name], it has been destroyed!"))
@@ -1251,7 +1271,8 @@
else
to_chat(user, span_warning("You stop entering the exosuit!"))
-/obj/mecha/proc/moved_inside(var/mob/living/carbon/human/H as mob)
+
+/obj/mecha/proc/moved_inside(mob/living/carbon/human/H)
if(H && H.client && (H in range(1)))
occupant = H
H.stop_pulling()
@@ -1260,7 +1281,7 @@
GrantActions(H, human_occupant = 1)
forceMove(loc)
log_append_to_last("[H] moved in as pilot.")
- icon_state = reset_icon()
+ update_icon(UPDATE_ICON_STATE)
dir = dir_in
playsound(src, 'sound/machines/windowdoor.ogg', 50, 1)
if(!activated)
@@ -1324,7 +1345,7 @@
mmi_as_oc.mecha = src
Entered(mmi_as_oc)
Move(loc)
- icon_state = reset_icon()
+ update_icon(UPDATE_ICON_STATE)
dir = dir_in
log_message("[mmi_as_oc] moved in as pilot.")
if(!hasInternalDamage())
@@ -1343,14 +1364,16 @@
return TRUE
return FALSE
-/obj/mecha/proc/pilot_mmi_hud(var/mob/living/carbon/brain/pilot)
- return
-
/obj/mecha/Exited(atom/movable/M, atom/newloc)
..()
if(occupant && occupant == M) // The occupant exited the mech without calling go_out()
go_out(1, newloc)
+/obj/mecha/Exit(atom/movable/O)
+ if(O in cargo)
+ return FALSE
+ return ..()
+
/obj/mecha/proc/go_out(forced, atom/newloc = loc)
if(!occupant)
return
@@ -1409,7 +1432,7 @@
var/obj/item/mmi/robotic_brain/R = mmi
if(R.imprinted_master)
to_chat(L, span_notice("Imprint re-enabled, you are once again bound to [R.imprinted_master]'s commands."))
- icon_state = reset_icon(icon_state)+"-open"
+ update_icon(UPDATE_ICON_STATE)
dir = dir_in
if(L && L.client)
@@ -1513,12 +1536,6 @@
else
occupant.throw_alert("charge", /obj/screen/alert/mech_nocell)
-/obj/mecha/proc/reset_icon()
- if(initial_icon)
- icon_state = initial_icon
- else
- icon_state = initial(icon_state)
- return icon_state
//////////////////////////////////////////
//////// Mecha global iterators ////////
@@ -1640,7 +1657,6 @@
AI = occupant
occupant = null
var/obj/structure/mecha_wreckage/WR = new wreckage(loc, AI)
- WR.icon_state = "[reset_icon(loc, AI)]-broken"
for(var/obj/item/mecha_parts/mecha_equipment/E in equipment)
if(E.salvageable && prob(30))
WR.crowbar_salvage += E
@@ -1695,4 +1711,10 @@
return FALSE
return TRUE
+
+/obj/mecha/update_icon_state()
+ var/init_icon_state = initial_icon ? initial_icon : initial(icon_state)
+ icon_state = occupant ? init_icon_state : "[init_icon_state]-open"
+
+
#undef OCCUPANT_LOGGING
diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm
index 4d3f3cd9a90..192da8f919c 100644
--- a/code/game/mecha/mecha_topic.dm
+++ b/code/game/mecha/mecha_topic.dm
@@ -76,23 +76,34 @@
var/tank_temperature = internal_tank ? internal_tank.return_temperature() : "Unknown"
var/tank_temperature_c = internal_tank ? internal_tank.return_temperature() - T0C : "Unknown"
var/cabin_pressure = round(return_pressure(),0.01)
- . = "[report_internal_damage()]"
- . += "[integrity<30?"DAMAGE LEVEL CRITICAL" - else - output += "Nothing" - output += "
":null]" - . += "Integrity: [integrity]%
" - . += "Powercell charge: [isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]
" - . += "Air source: [use_internal_tank?"Internal Airtank":"Environment"]
" - . += "Airtank pressure: [tank_pressure]kPa
" - . += "Airtank temperature: [tank_temperature]°K|[tank_temperature_c]°C
" - . += "Cabin pressure: [cabin_pressure>WARNING_HIGH_PRESSURE ? "[cabin_pressure]": cabin_pressure]kPa
" - . += "Cabin temperature: [return_temperature()]°K|[return_temperature() - T0C]°C
" - . += "Lights: [lights?"on":"off"]
" - . += "[dna ? "DNA-locked:
[dna] \[Reset\]
" : ""]" - . += "[defense_action.owner ? "Defence Mode: [defence_mode ? "Enabled" : "Disabled"]
" : ""]" - . += "[overload_action.owner ? "Leg Actuators Overload: [leg_overload_mode ? "Enabled" : "Disabled"]
" : ""]" - . += "[thrusters_action.owner ? "Thrusters: [thrusters_active ? "Enabled" : "Disabled"]
" : ""]" - . += "[smoke_action.owner ? "Smoke: [smoke]
" : ""]" - . += "[zoom_action.owner ? "Zoom: [zoom_mode ? "Enabled" : "Disabled"]
" : ""]" - . += "[phasing_action.owner ? "Phase Modulator: [phasing ? "Enabled" : "Disabled"]
" : ""]" + var/list/stats_part_list = list() + stats_part_list += "[report_internal_damage()]" + stats_part_list += "[integrity<30?"DAMAGE LEVEL CRITICAL
":null]" + stats_part_list += "Integrity: [integrity]%
" + stats_part_list += "Powercell charge: [isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]
" + stats_part_list += "Air source: [use_internal_tank?"Internal Airtank":"Environment"]
" + stats_part_list += "Airtank pressure: [tank_pressure]kPa
" + stats_part_list += "Airtank temperature: [tank_temperature]°K|[tank_temperature_c]°C
" + stats_part_list += "Cabin pressure: [cabin_pressure>WARNING_HIGH_PRESSURE ? "[cabin_pressure]": cabin_pressure]kPa
" + stats_part_list += "Cabin temperature: [return_temperature()]°K|[return_temperature() - T0C]°C
" + stats_part_list += "Lights: [lights?"on":"off"]
" + stats_part_list += "[dna ? "DNA-locked:
[dna] \[Reset\]
" : ""]" + stats_part_list += "[defense_action.owner ? "Defence Mode: [defence_mode ? "Enabled" : "Disabled"]
" : ""]" + stats_part_list += "[overload_action.owner ? "Leg Actuators Overload: [leg_overload_mode ? "Enabled" : "Disabled"]
" : ""]" + stats_part_list += "[thrusters_action.owner ? "Thrusters: [thrusters_active ? "Enabled" : "Disabled"]
" : ""]" + stats_part_list += "[smoke_action.owner ? "Smoke: [smoke]
" : ""]" + stats_part_list += "[zoom_action.owner ? "Zoom: [zoom_mode ? "Enabled" : "Disabled"]
" : ""]" + stats_part_list += "[phasing_action.owner ? "Phase Modulator: [phasing ? "Enabled" : "Disabled"]
" : ""]" + stats_part_list += "Cargo Compartment Contents:
"
+ if(length(cargo))
+ for(var/obj/O in cargo)
+ stats_part_list += "Unload : [O]
" + for(var/mob/living/L in cargo) + stats_part_list += "Unload : [L]
" + else + stats_part_list += "Nothing" + stats_part_list += "
"
+ return stats_part_list.Join("")
/obj/mecha/proc/get_commands()
. = "" + for(var/mob/living/L in cargo) + stats_part_list += "Unload : [L]
" + else + stats_part_list += "Nothing" + stats_part_list += "
"
@@ -405,6 +416,14 @@
occupant_message("Recalibration failed.")
log_message("Recalibration of coordination system failed with 1 error.",1)
+ if(href_list["drop_from_cargo"])
+ var/atom/movable/cargo_thing = locateUID(href_list["drop_from_cargo"])
+ if(istype(cargo_thing) && (cargo_thing in cargo))
+ occupant_message(span_notice("You unload [cargo_thing]."))
+ cargo_thing.forceMove(loc)
+ cargo -= cargo_thing
+ log_message("Unloaded [cargo_thing]. Cargo compartment capacity: [cargo_capacity - length(cargo)]")
+
//debug
/*
if(href_list["debug"])
diff --git a/code/game/mecha/paintkits.dm b/code/game/mecha/paintkits.dm
index 977b5f27560..e486b9488e6 100644
--- a/code/game/mecha/paintkits.dm
+++ b/code/game/mecha/paintkits.dm
@@ -309,3 +309,39 @@
new_name = "Pirate Mauler"
new_icon = "piratmauler"
allowed_types = list("mauler")
+
+/obj/item/paintkit/lockermech_nt
+ name = "NT Special Locker Mech customisation kit"
+ icon_state = "paintkit_nt1"
+ desc = "A kit containing all the needed tools and parts to show that Locker Mech it is the property of NT."
+
+ new_name = "NT Special Locker Mech"
+ new_icon = "ntlockermech"
+ allowed_types = list("lockermech")
+
+/obj/item/paintkit/durand_nt
+ name = "NT Special Durand customisation kit"
+ icon_state = "paintkit_nt"
+ desc = "A kit containing all the needed tools and parts to show that Durand it is the property of NT"
+
+ new_name = "NT Special Durand"
+ new_icon = "ntdurand"
+ allowed_types = list("durand")
+
+/obj/item/paintkit/ripley_nt
+ name = "NT Special APLU customisation kit"
+ icon_state = "paintkit_nt"
+ desc = "A kit containing all the needed tools and parts to show that APLU it is the property of NT"
+
+ new_name = "NT Special APLU"
+ new_icon = "ntripley"
+ allowed_types = list("ripley", "firefighter")
+
+/obj/item/paintkit/phazon_nt
+ name = "NT Special Phazon customisation kit"
+ icon_state = "paintkit_nt"
+ desc = "A kit containing all the needed tools and parts to show that Phazon it is the property of NT"
+
+ new_name = "NT Special Phazon"
+ new_icon = "ntphazon"
+ allowed_types = list("phazon")
diff --git a/code/game/mecha/working/gigadrill.dm b/code/game/mecha/working/gigadrill.dm
index ff3dfd01821..6f1f6a02e95 100644
--- a/code/game/mecha/working/gigadrill.dm
+++ b/code/game/mecha/working/gigadrill.dm
@@ -25,14 +25,14 @@
turnsound = null
// wreckage = /obj/effect/decal/mecha_wreckage/gigadrill // no dmi :(
-/obj/mecha/working/gigadrill/New()
- ..()
+/obj/mecha/working/gigadrill/Initialize()
+ . = ..()
soundloop = new(list(src), FALSE)
pixel_x = -16
pixel_y = -16
var/obj/item/mecha_parts/mecha_equipment/drill/giga/drill = new
drill.attach(src)
- cargo.Add(new /obj/structure/ore_box(src))
+ LAZYADD(cargo, new /obj/structure/ore_box(src))
var/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/clamp = new
clamp.integrated = TRUE
diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index fdd9c96bb96..a2e0f66a4c6 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -16,49 +16,69 @@
var/hides = 0
var/plates = 0
-/obj/mecha/working/ripley/update_icon()
- ..()
+
+/obj/mecha/working/ripley/Destroy()
+ for(var/i=1, i <= hides, i++)
+ new /obj/item/stack/sheet/animalhide/goliath_hide(loc) //If a goliath-plated ripley gets killed, all the plates drop
+ return ..()
+
+
+/obj/mecha/working/ripley/update_overlays()
+ . = ..()
+ if(hides && !plates)
+ if(hides < 3)
+ . += occupant ? "ripley-g" : "ripley-g-open"
+ else
+ . += occupant ? "ripley-g-full" : "ripley-g-full-open"
+
+ else if(plates && !hides)
+ if(plates < 3)
+ . += occupant ? "ripley-a" : "ripley-a-open"
+ else
+ . += occupant ? "ripley-a-full" : "ripley-a-full-open"
+
+ else if(plates && hides)
+ if(plates < 3 && hides >= 3)
+ . += occupant ? "ripley-g-full" : "ripley-g-full-open"
+ . += occupant ? "ripley-a" : "ripley-a-open"
+
+ else if(plates < 3 && hides < 3)
+ . += occupant ? "ripley-a-full" : "ripley-a-full-open"
+ . += occupant ? "ripley-g" : "ripley-g-open"
+
+ else if(plates >= 3 && hides < 3)
+ . += occupant ? "ripley-a-full" : "ripley-a-full-open"
+ . += occupant ? "ripley-g" : "ripley-g-open"
+
+ else if(plates >= 3 && hides >= 3)
+ . += occupant ? "ripley-g-full" : "ripley-g-full-open"
+ . += occupant ? "ripley-a" : "ripley-a-open"
+
+
+/obj/mecha/working/ripley/update_desc(updates = ALL)
+ . = ..()
+
if(hides && !plates)
- cut_overlays()
if(hides < 3)
- add_overlay(occupant ? "ripley-g" : "ripley-g-open")
desc = "Autonomous Power Loader Unit. You see reinforcements made of plates of goliath hide attached to the armor."
else
- add_overlay(occupant ? "ripley-g-full" : "ripley-g-full-open")
desc = "Autonomous Power Loader Unit. It has an intimidating carapace composed entirely of plates of goliath hide - its pilot must be an experienced monster hunter."
- if(plates && !hides)
- cut_overlays()
+ else if(plates && !hides)
if(plates < 3)
- add_overlay(occupant ? "ripley-a" : "ripley-a-open")
desc = "Autonomous Power Loader Unit. You can see the pieces of homemade armor on the hull."
else
- add_overlay(occupant ? "ripley-a-full" : "ripley-a-full-open")
desc = "Autonomous Power Loader Unit. Completely encrusted with reinforced debris, this shiny lump of metal looks incredibly durable."
- if(plates && hides)
- cut_overlays()
- if(plates < 3 && hides == 3)
- cut_overlays()
- add_overlay(occupant ? "ripley-g-full" : "ripley-g-full-open")
- add_overlay(occupant ? "ripley-a" : "ripley-a-open")
+ else if(plates && hides)
+ if(plates < 3 && hides >= 3)
desc = "Autonomous Power Loader Unit. Not only is the goliath hide armor intimidating, it's additionally covered in pieces of homemade armor. How do you kill that?!"
- if(plates < 3 && hides < 3)
- cut_overlays()
- add_overlay(occupant ? "ripley-a-full" : "ripley-a-full-open")
- add_overlay(occupant ? "ripley-g" : "ripley-g-open")
+ else if(plates < 3 && hides < 3)
desc = "Autonomous Power Loader Unit. The owner of the mech decided to go all out - clad in pieces of homemade armor and goliath skins."
- if(plates == 3 && hides < 3)
- cut_overlays()
- add_overlay(occupant ? "ripley-a-full" : "ripley-a-full-open")
- add_overlay(occupant ? "ripley-g" : "ripley-g-open")
+ else if(plates >= 3 && hides < 3)
+ desc = "Autonomous Power Loader Unit. Fully covered with homemade armor and few goliath hides on top."
+ else if(plates >= 3 && hides >= 3)
desc = "Autonomous Power Loader Unit. Clad in homemade armor from ear to toe, with Goliath plates on top - a real tank, no other way."
- if(plates == 3 && hides == 3)
- cut_overlays()
- add_overlay(occupant ? "ripley-g-full" : "ripley-g-full-open")
- add_overlay(occupant ? "ripley-a" : "ripley-a-open")
-
-
/obj/mecha/working/ripley/firefighter
@@ -119,7 +139,7 @@
P.attach(src)
//Add ore box to cargo
- cargo.Add(new /obj/structure/ore_box(src))
+ LAZYADD(cargo, new /obj/structure/ore_box(src))
//Attach hydraulic clamp
var/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/HC = new
@@ -129,18 +149,6 @@
var/obj/item/mecha_parts/mecha_equipment/mining_scanner/scanner = new
scanner.attach(src)
-/obj/mecha/working/ripley/Exit(atom/movable/O)
- if(O in cargo)
- return 0
- return ..()
-
-/obj/mecha/working/ripley/ex_act(severity)
- ..()
- for(var/X in cargo)
- var/obj/O = X
- if(prob(30 / severity))
- cargo -= O
- O.forceMove(drop_location())
/obj/mecha/working/ripley/emag_act(mob/user)
if(!emagged)
diff --git a/code/game/mecha/working/working.dm b/code/game/mecha/working/working.dm
index 51c9a6fe2de..823f305f897 100644
--- a/code/game/mecha/working/working.dm
+++ b/code/game/mecha/working/working.dm
@@ -1,12 +1,11 @@
/obj/mecha/working
internal_damage_threshold = 60
- var/list/cargo = new
- var/cargo_capacity = 15
+ cargo_capacity = 15
var/fast_pressure_step_in = 2
var/slow_pressure_step_in = 2
-/obj/mecha/working/New()
- ..()
+/obj/mecha/working/Initialize()
+ . = ..()
if(!ruin_mecha)
trackers += new /obj/item/mecha_parts/mecha_tracking(src)
@@ -18,20 +17,6 @@
if(ore.Adjacent(src) && ((get_dir(src, ore) & dir) || ore.loc == loc)) //we can reach it and it's in front of us? grab it!
ore.forceMove(ore_box)
-/obj/mecha/working/Topic(href, href_list)
- ..()
- if(href_list["drop_from_cargo"])
- var/obj/O = locate(href_list["drop_from_cargo"])
- if(O && (O in cargo))
- occupant_message("You unload [O].")
- O.loc = get_turf(src)
- cargo -= O
- var/turf/T = get_turf(O)
- if(T)
- T.Entered(O)
- log_message("Unloaded [O]. Cargo compartment capacity: [cargo_capacity - cargo.len]")
- return
-
/obj/mecha/working/Move()
. = ..()
if(.)
@@ -52,53 +37,12 @@
/obj/mecha/working/go_out()
..()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/mecha/working/moved_inside(mob/living/carbon/human/H)
..()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/mecha/working/mmi_moved_inside(obj/item/mmi/mmi_as_oc, mob/user)
..()
- update_icon()
-
-/obj/mecha/working/Exit(atom/movable/O)
- if(O in cargo)
- return 0
- return ..()
-
-/obj/mecha/working/get_stats_part()
- var/output = ..()
- output += "Cargo Compartment Contents:
" - if(materials.len) + if(length(materials)) msg += "Extractable materials:
" for(var/mat in materials) msg += "[CallMaterialName(mat)]
" //Capitize first word, remove the "$" @@ -532,6 +532,12 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g if((src == user.l_ear || src == user.r_ear) && (user.head.flags_inv & HIDEHEADSETS)) return TRUE + if(user.wear_mask) + if(src == user.glasses && (user.wear_mask.flags_inv & HIDEGLASSES)) + return TRUE + if((src == user.l_ear || src == user.r_ear) && (user.wear_mask.flags_inv & HIDEHEADSETS)) + return TRUE + return FALSE @@ -1153,12 +1159,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g /obj/item/update_atom_colour() . = ..() - if(!is_equipped()) - return update_equipped_item() - for(var/action in actions) - var/datum/action/myaction = action - myaction.UpdateButtonIcon() /obj/item/proc/add_tape() diff --git a/code/game/objects/items/ashtray.dm b/code/game/objects/items/ashtray.dm index 251b95fdadc..31c0cdee0c7 100644 --- a/code/game/objects/items/ashtray.dm +++ b/code/game/objects/items/ashtray.dm @@ -49,47 +49,73 @@ pixel_y = rand(-5, 5) pixel_x = rand(-6, 6) + /obj/item/storage/ashtray/attackby(obj/item/I, mob/user, params) if(!can_be_inserted(I)) return - handle_item_insertion(I) - if(istype(I, /obj/item/clothing/mask/cigarette)) - var/obj/item/clothing/mask/cigarette/cig = I - if(cig.lit == TRUE) - visible_message("[user] crushes [cig] in [src], putting it out.") - var/obj/item/butt = new cig.type_butt(src) - cig.transfer_fingerprints_to(butt) - qdel(cig) - if(cig.lit == FALSE) - visible_message("[user] places [cig] in [src] without even smoking it. Why did [user.p_they()] do that?") - return - visible_message("[user] places [I] in [src].") -/obj/item/storage/ashtray/update_icon() - if(contents.len == storage_slots) + var/is_cig = istype(I, /obj/item/clothing/mask/cigarette) + if(is_cig || istype(I, /obj/item/cigbutt) || istype(I, /obj/item/match)) + if(!user.drop_item_ground(I)) + return + + handle_item_insertion(I) + + var/message_done = FALSE + if(is_cig) + var/obj/item/clothing/mask/cigarette/cig = I + if(cig.lit) + message_done = TRUE + visible_message("[user] crushes [cig] in [src], putting it out.") + var/obj/item/butt = new cig.type_butt(src) + cig.transfer_fingerprints_to(butt) + qdel(cig) + else + to_chat(user, "You place [cig] in [src] without even smoking it. Why would you do that?") + + if(!message_done) + visible_message("[user] places [I] in [src].") + add_fingerprint(user) + update_appearance(UPDATE_DESC|UPDATE_ICON_STATE) + + +/obj/item/storage/ashtray/update_icon_state() + if(length(contents) == storage_slots) icon_state = icon_full - desc = initial(desc) + " It's stuffed full." - return - if(contents.len >= storage_slots * 0.5) + else if(length(contents) > storage_slots * 0.5) icon_state = icon_half - desc = initial(desc) + " It's half-filled." - return - if(contents.len < storage_slots * 0.5) + else icon_state = initial(icon_state) + + +/obj/item/storage/ashtray/update_desc(updates = ALL) + . = ..() + if(length(contents) == storage_slots) + desc = initial(desc) + " It's stuffed full." + else if(length(contents) > storage_slots * 0.5) + desc = initial(desc) + " It's half-filled." + else desc = initial(desc) + +/obj/item/storage/ashtray/proc/empty_tray() + for(var/obj/item/I in contents) + I.forceMove(loc) + update_appearance(UPDATE_DESC|UPDATE_ICON_STATE) + + /obj/item/storage/ashtray/deconstruct() var/obj/item/trash/broken_ashtray/shards = new(get_turf(src)) - shards.icon_state = src.icon_broken + shards.icon_state = icon_broken visible_message("Oops, [src] broke into a lot of pieces!") return ..() + /obj/item/storage/ashtray/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) - if(contents.len) - for(var/obj/item/I in contents) - I.forceMove(loc) - update_icon() + if(length(contents)) visible_message("[src] slams into [hit_atom] spilling its contents!") + empty_tray() if(rand(1,20) > max_integrity) deconstruct() return ..() + diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index da89819b411..6a8f6d0fece 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -23,45 +23,55 @@ close_sound = 'sound/items/zip.ogg' open_sound_volume = 15 close_sound_volume = 15 + density = FALSE + integrity_failure = FALSE var/item_path = /obj/item/bodybag - density = 0 - integrity_failure = 0 -/obj/structure/closet/body_bag/attackby(W as obj, mob/user as mob, params) - if(istype(W, /obj/item/pen)) - var/t = rename_interactive(user, W) +/obj/structure/closet/body_bag/attackby(obj/item/I, mob/user, params) + if(is_pen(I)) + var/t = rename_interactive(user, I) if(isnull(t)) return - cut_overlays() if(t) - add_fingerprint(user) - add_overlay(image(icon, "bodybag_label")) + update_icon(UPDATE_OVERLAYS) return - if(istype(W, /obj/item/wirecutters)) - add_fingerprint(user) - to_chat(user, "You cut the tag off the bodybag") - name = "body bag" - cut_overlays() + if(I.tool_behaviour == TOOL_WIRECUTTER) + to_chat(user, "You cut the tag off the bodybag.") + name = initial(name) + update_icon(UPDATE_OVERLAYS) return return ..() /obj/structure/closet/body_bag/close() if(..()) - density = 0 - return 1 - return 0 + density = FALSE + return TRUE + return FALSE -/obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location) - . = ..() - if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) - if(!ishuman(usr) || opened || length(contents)) - return FALSE - visible_message("[usr] folds up the [name]") +/obj/structure/closet/body_bag/update_icon_state() + icon_state = opened ? icon_opened : icon_closed + + +/obj/structure/closet/body_bag/update_overlays() + . = list() + if(name != initial(name)) + . += "bodybag_label" + + +/obj/structure/closet/body_bag/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) + if(over_object == usr && ishuman(usr) && !usr.incapacitated() && !opened && !length(contents) && usr.Adjacent(src)) + usr.visible_message( + span_notice("[usr] folds up [src]."), + span_notice("You fold up [src]."), + ) new item_path(get_turf(src)) qdel(src) + return FALSE + return ..() + /obj/structure/closet/body_bag/relaymove(mob/user as mob) if(user.stat) @@ -72,8 +82,3 @@ if(!open()) to_chat(user, "It won't budge!") -/obj/structure/closet/body_bag/update_icon() - if(!opened) - icon_state = icon_closed - else - icon_state = icon_opened diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index d25e23e1b0f..cb50ac08180 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -1,3 +1,7 @@ +#define TALL_CANDLE 1 +#define MID_CANDLE 2 +#define SHORT_CANDLE 3 + /obj/item/candle name = "red candle" desc = "In Greek myth, Prometheus stole fire from the Gods and gave it to humankind. The jewelry he kept for himself." @@ -6,36 +10,40 @@ item_state = "candle1" w_class = WEIGHT_CLASS_TINY var/wax = 200 - var/lit = 0 - var/infinite = 0 - var/start_lit = 0 + /// Index for the icon state + var/wax_index = TALL_CANDLE + var/lit = FALSE + var/infinite = FALSE + var/start_lit = FALSE + var/flickering = FALSE light_color = "#E09D37" -/obj/item/candle/New() - ..() + +/obj/item/candle/Initialize(mapload) + . = ..() if(start_lit) // No visible message light(show_message = 0) + /obj/item/candle/Destroy() STOP_PROCESSING(SSobj, src) return ..() -/obj/item/candle/update_icon() - var/i - if(wax>150) - i = 1 - else if(wax>80) - i = 2 - else i = 3 - icon_state = "candle[i][lit ? "_lit" : ""]" + +/obj/item/candle/update_icon_state() + if(flickering) + icon_state = "candle[wax_index]_flicker" + else + icon_state = "candle[wax_index][lit ? "_lit" : ""]" + /obj/item/candle/can_enter_storage(obj/item/storage/S, mob/user) if(lit) to_chat(user, "[S] can't hold [src] while it's lit!") return FALSE - else - return TRUE + return TRUE + /obj/item/candle/attackby(obj/item/W, mob/user, params) if(is_hot(W)) @@ -43,16 +51,19 @@ return return ..() + /obj/item/candle/welder_act(mob/user, obj/item/I) . = TRUE if(I.tool_use_check(user, 0)) //Don't need to flash eyes because you are a badass light("[user] casually lights the [name] with [I], what a badass.") + /obj/item/candle/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) if(!lit) light() //honk return ..() + /obj/item/candle/proc/light(show_message) if(!lit) lit = 1 @@ -60,7 +71,32 @@ usr.visible_message(show_message) set_light(CANDLE_LUM) START_PROCESSING(SSobj, src) - update_icon() + update_icon(UPDATE_ICON_STATE) + + +/obj/item/candle/proc/update_wax_index() + var/new_wax_index + if(wax > 150) + new_wax_index = TALL_CANDLE + else if(wax > 80) + new_wax_index = MID_CANDLE + else + new_wax_index = SHORT_CANDLE + if(wax_index != new_wax_index) + wax_index = new_wax_index + return TRUE + return FALSE + + +/obj/item/candle/proc/start_flickering() + flickering = TRUE + update_icon(UPDATE_ICON_STATE) + addtimer(CALLBACK(src, PROC_REF(stop_flickering)), 4 SECONDS, TIMER_UNIQUE) + + +/obj/item/candle/proc/stop_flickering() + flickering = FALSE + update_icon(UPDATE_ICON_STATE) /obj/item/candle/process() @@ -68,28 +104,49 @@ return if(!infinite) wax-- + if(wax_index != SHORT_CANDLE) // It's not at its shortest + if(update_wax_index()) + update_icon(UPDATE_ICON_STATE) if(!wax) - new/obj/item/trash/candle(src.loc) - if(istype(src.loc, /mob)) - var/mob/M = src.loc - M.temporarily_remove_item_from_inventory(src, force = TRUE) //src is being deleted anyway + new/obj/item/trash/candle(loc) + if(ismob(loc)) + var/mob/holder = loc + holder.drop_item_ground(src, force = TRUE) //src is being deleted anyway qdel(src) - update_icon() if(isturf(loc)) //start a fire if possible var/turf/T = loc T.hotspot_expose(700, 5) +/obj/item/candle/proc/unlight() + if(lit) + lit = FALSE + update_icon(UPDATE_ICON_STATE) + set_light(0) + + /obj/item/candle/attack_self(mob/user) if(lit) user.visible_message("[user] snuffs out [src].") - lit = 0 - update_icon() - set_light(0) + unlight() + + +/obj/item/candle/get_spooked() + if(lit) + start_flickering() + playsound(src, 'sound/effects/candle_flicker.ogg', 15, TRUE) + return TRUE + return FALSE + /obj/item/candle/eternal desc = "A candle. This one seems to have an odd quality about the wax." - infinite = 1 + infinite = TRUE + + +/obj/item/candle/eternal/wizard + desc = "A candle. It smells like magic, so that would explain why it burns brighter." + start_lit = TRUE /obj/item/candle/extinguish_light(force = FALSE) @@ -97,3 +154,9 @@ return infinite = FALSE wax = 1 // next process will burn it out + + +#undef TALL_CANDLE +#undef MID_CANDLE +#undef SHORT_CANDLE + diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 95abc042be1..c8cc639f123 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -271,8 +271,7 @@ switch(choice) if("Toggle Cap") to_chat(user, "You [capped ? "Remove" : "Replace"] the cap of the [src]") - capped = capped ? 0 : 1 - icon_state = "spraycan[capped ? "_cap" : ""]" + capped = !capped update_icon() if("Change Drawing") ..() @@ -304,8 +303,13 @@ playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) ..() -/obj/item/toy/crayon/spraycan/update_icon() - overlays.Cut() - var/image/I = image('icons/obj/crayons.dmi',icon_state = "[capped ? "spraycan_cap_colors" : "spraycan_colors"]") + +/obj/item/toy/crayon/spraycan/update_icon_state() + icon_state = "spraycan[capped ? "_cap" : ""]" + + +/obj/item/toy/crayon/spraycan/update_overlays() + . = ..() + var/image/I = image('icons/obj/crayons.dmi', icon_state = "[capped ? "spraycan_cap_colors" : "spraycan_colors"]") I.color = colour - overlays += I + . += I diff --git a/code/game/objects/items/decorations.dm b/code/game/objects/items/decorations.dm index 20727a73635..bb53edb459c 100644 --- a/code/game/objects/items/decorations.dm +++ b/code/game/objects/items/decorations.dm @@ -226,7 +226,7 @@ icon = 'icons/obj/decorations.dmi' icon_state = "" density = 1 - anchored = 0 + anchored = FALSE max_integrity = 100 /obj/structure/decorative_structures/fireplace @@ -234,7 +234,7 @@ desc = "Looks warm and comfy." icon = 'icons/obj/fireplace.dmi' icon_state = "fireplace" - anchored = 1 + anchored = TRUE density = 0 pixel_x = -16 @@ -246,7 +246,7 @@ /obj/structure/decorative_structures/garland density = 0 - anchored = 1 + anchored = TRUE max_integrity = 100 icon_state = "xmaslights" @@ -419,7 +419,7 @@ name = "Bloody crystal" icon_state = "cult_crystal" max_integrity = 120 - anchored = 1 + anchored = TRUE /obj/structure/decorative_structures/cult_crystal/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index 4cb4a70f3ef..9042d5eda79 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -8,7 +8,8 @@ origin_tech = "magnets=1;biotech=1" var/list/datum/autopsy_data_scanner/wdata = list() var/list/chemtraces = list() - var/target_name = null + var/target_UID = null + var/target_name = null // target.name can change after scanning, so better save it here. var/timeofdeath = null /obj/item/autopsy_scanner/Destroy() @@ -86,7 +87,7 @@ if(timeofdeath) scan_data += "Time of death: [station_time_timestamp("hh:mm:ss", timeofdeath)]
" else - scan_data += "Time of death: Unknown / Still alive
" + scan_data += "Time of death: No data
" if(wdata.len) var/n = 1 @@ -136,7 +137,7 @@ for(var/chemID in chemtraces) scan_data += chemID scan_data += "
" - user.visible_message("[src] rattles and prints out a sheet of paper.") + user.visible_message(span_notice("[src] rattles and prints out a sheet of paper.")) playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) flick("autopsy_scanner_anim", src) @@ -145,7 +146,7 @@ var/obj/item/paper/P = new(drop_location()) P.name = "Autopsy Data ([target_name])" P.info = "[scan_data]" - P.overlays += "paper_words" + P.update_icon() user.put_in_hands(P, ignore_anim = FALSE) @@ -156,20 +157,21 @@ if(!can_operate(M)) return - if(target_name != M.name) + if(target_UID != M.UID()) + to_chat(user, span_notice("A new patient has been registered.[target_UID ? " Purging data for previous patient." : ""]")) + target_UID = M.UID() target_name = M.name wdata.Cut() chemtraces.Cut() timeofdeath = null - to_chat(user, "A new patient has been registered. Purging data for previous patient.") timeofdeath = M.timeofdeath var/obj/item/organ/external/S = M.get_organ(user.zone_selected) if(!S) - to_chat(user, "You can't scan this body part.") + to_chat(user, span_warning("You can't scan this body part!")) return - M.visible_message("[user] scans the wounds on [M]'s [S] with [src]") + M.visible_message(span_notice("[user] scans the wounds on [M]'s [S] with [src].")) add_data(S) - return 1 + return TRUE diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 71c180ccdcb..edb3a437360 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -21,15 +21,27 @@ var/can_overcharge = TRUE //set this to FALSE if you don't want your flash to be overcharge capable var/use_sound = 'sound/weapons/flash.ogg' + +/obj/item/flash/update_icon_state() + icon_state = "[initial(icon_state)][broken ? "burnt" : ""]" + + +/obj/item/flash/update_overlays() + . = ..() + if(overcharged) + . += "overcharge" + + /obj/item/flash/proc/clown_check(mob/user) if(user && (CLUMSY in user.mutations) && prob(50)) flash_carbon(user, user, 30 SECONDS, 0) return FALSE return TRUE + /obj/item/flash/attackby(obj/item/W, mob/user, params) if(can_overcharge) - if(istype(W, /obj/item/screwdriver)) + if(W.tool_behaviour == TOOL_SCREWDRIVER) if(battery_panel) to_chat(user, "You close the battery compartment on the [src].") battery_panel = FALSE @@ -41,17 +53,18 @@ to_chat(user, "You jam the cell into battery compartment on the [src].") qdel(W) overcharged = TRUE - overlays += "overcharge" + update_icon(UPDATE_OVERLAYS) + /obj/item/flash/random/New() ..() if(prob(25)) broken = TRUE - icon_state = "[initial(icon_state)]burnt" + update_icon(UPDATE_ICON_STATE) /obj/item/flash/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something. broken = TRUE - icon_state = "[initial(icon_state)]burnt" + update_icon(UPDATE_ICON_STATE) visible_message("The [src.name] burns out!") diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index bdab186f156..65a5885b425 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -13,38 +13,39 @@ var/brightness_on = 4 //luminosity when on var/togglesound = 'sound/weapons/empty.ogg' + /obj/item/flashlight/Initialize() . = ..() + update_brightness() + + +/obj/item/flashlight/update_icon_state() if(on) icon_state = "[initial(icon_state)]-on" - set_light(brightness_on) else - icon_state = initial(icon_state) - set_light(0) + icon_state = "[initial(icon_state)]" + -/obj/item/flashlight/proc/update_brightness(var/mob/user = null) +/obj/item/flashlight/proc/update_brightness() if(on) - icon_state = "[initial(icon_state)]-on" set_light(brightness_on) else - icon_state = initial(icon_state) set_light(0) + update_icon() + /obj/item/flashlight/attack_self(mob/user) if(!isturf(user.loc)) - to_chat(user, "You cannot turn the light on while in this [user.loc].")//To prevent some lighting anomalities. - - return 0 + to_chat(user, "You cannot turn the light on while in this [user.loc].") //To prevent some lighting anomalities. + return FALSE on = !on playsound(user, togglesound, 100, 1) - update_brightness(user) - for(var/X in actions) - var/datum/action/A = X - A.UpdateButtonIcon() - return 1 + update_brightness() + update_equipped_item() + return TRUE -/obj/item/flashlight/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/flashlight/attack(mob/living/M, mob/living/user) add_fingerprint(user) if(on && user.zone_selected == BODY_ZONE_PRECISE_EYES) @@ -174,10 +175,29 @@ var/fuel_lower = 800 var/fuel_upp = 1000 -/obj/item/flashlight/flare/New() + +/obj/item/flashlight/flare/Initialize() fuel = rand(fuel_lower, fuel_upp) + . = ..() + + +/obj/item/flashlight/flare/Destroy() + STOP_PROCESSING(SSobj, src) + return ..() + + +/obj/item/flashlight/flare/update_icon_state() + if(on) + item_state = "[initial(item_state)]-on" + else + item_state = "[initial(item_state)]" + + if(!fuel) + icon_state = "[initial(icon_state)]-empty" + return ..() + /obj/item/flashlight/flare/process() var/turf/pos = get_turf(src) if(pos && produce_heat) @@ -185,33 +205,17 @@ fuel = max(fuel - 1, 0) if(!fuel || !on) turn_off() - if(!fuel) - src.icon_state = "[initial(icon_state)]-empty" STOP_PROCESSING(SSobj, src) -/obj/item/flashlight/flare/Destroy() - STOP_PROCESSING(SSobj, src) - return ..() /obj/item/flashlight/flare/proc/turn_off() - on = 0 - src.force = initial(src.force) - src.damtype = initial(src.damtype) - if(ismob(loc)) - var/mob/U = loc - update_brightness(U) - else - update_brightness(null) + on = FALSE + force = initial(force) + damtype = initial(damtype) + update_brightness() -/obj/item/flashlight/flare/update_brightness(var/mob/user = null) - ..() - if(on) - item_state = "[initial(item_state)]-on" - else - item_state = "[initial(item_state)]" /obj/item/flashlight/flare/attack_self(mob/user) - // Usual checks if(!fuel) to_chat(user, "[src] is out of fuel.") @@ -224,10 +228,12 @@ // All good, turn it on. if(.) user.visible_message("[user] activates [src].", "You activate [src].") - src.force = on_damage - src.damtype = "fire" + if(produce_heat) + force = on_damage + damtype = BURN START_PROCESSING(SSobj, src) + // GLOWSTICKS /obj/item/flashlight/flare/glowstick @@ -242,27 +248,26 @@ produce_heat = 0 fuel_lower = 1600 fuel_upp = 2000 + blocks_emissive = FALSE + /obj/item/flashlight/flare/glowstick/Initialize() light_color = color ..() -/obj/item/flashlight/flare/glowstick/update_icon() - item_state = "glowstick" - cut_overlays() + +/obj/item/flashlight/flare/glowstick/update_icon_state() if(!fuel) icon_state = "glowstick-empty" - cut_overlays() - update_brightness(0) - else if(on) + + +/obj/item/flashlight/flare/glowstick/update_overlays() + . = ..() + if(on) var/mutable_appearance/glowstick_overlay = mutable_appearance(icon, "glowstick-glow") glowstick_overlay.color = color - add_overlay(glowstick_overlay) - item_state = "glowstick-on" - update_brightness(brightness_on) - else - icon_state = "glowstick" - cut_overlays() + . += glowstick_overlay + /obj/item/flashlight/flare/glowstick/red name = "red glowstick" @@ -335,12 +340,10 @@ materials = list() on = TRUE //Bio-luminesence has one setting, on. -/obj/item/flashlight/slime/New() - ..() - set_light(brightness_on) - spawn(1) //Might be sloppy, but seems to be necessary to prevent further runtimes and make these work as intended... don't judge me! - update_brightness() - icon_state = initial(icon_state) + +/obj/item/flashlight/slime/update_icon_state() + return + /obj/item/flashlight/slime/attack_self(mob/user) return //Bio-luminescence does not toggle. @@ -360,10 +363,11 @@ var/charge_tick = 0 -/obj/item/flashlight/emp/New() - ..() +/obj/item/flashlight/emp/Initialize() + . = ..() START_PROCESSING(SSobj, src) + /obj/item/flashlight/emp/Destroy() STOP_PROCESSING(SSobj, src) return ..() @@ -376,13 +380,15 @@ emp_cur_charges = min(emp_cur_charges+1, emp_max_charges) return TRUE -/obj/item/flashlight/emp/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/flashlight/emp/attack(mob/living/M, mob/living/user) if(on && user.zone_selected == BODY_ZONE_PRECISE_EYES) // call original attack proc only if aiming at the eyes ..() return -/obj/item/flashlight/emp/afterattack(atom/A as mob|obj, mob/user, proximity) - if(!proximity) return + +/obj/item/flashlight/emp/afterattack(atom/A, mob/user, proximity) + if(!proximity) + return if(emp_cur_charges > 0) emp_cur_charges -= 1 if(ismob(A)) @@ -392,7 +398,7 @@ A.emp_act(1) else to_chat(user, "\The [src] needs time to recharge!") - return + /obj/item/flashlight/spotlight //invisible lighting source name = "disco light" diff --git a/code/game/objects/items/devices/handheld_defib.dm b/code/game/objects/items/devices/handheld_defib.dm index 0f604428fca..dbf0e4c7b6d 100644 --- a/code/game/objects/items/devices/handheld_defib.dm +++ b/code/game/objects/items/devices/handheld_defib.dm @@ -12,6 +12,15 @@ var/cooldown = FALSE var/charge_time = 100 var/emagged = FALSE + var/shocking = FALSE + + +/obj/item/handheld_defibrillator/update_icon_state() + if(shocking) + icon_state = "[icon_base]-shock" + return + icon_state = "[icon_base][cooldown ? "-off" : "-on"]" + /obj/item/handheld_defibrillator/emag_act(mob/user) if(!emagged) @@ -83,19 +92,22 @@ else to_chat(user, span_danger("[H] has a hardsuit!")) cooldown = TRUE - icon_state = "[icon_base]-shock" - addtimer(CALLBACK(src, PROC_REF(short_charge)), 10) + shocking = TRUE + update_icon(UPDATE_ICON_STATE) + addtimer(CALLBACK(src, PROC_REF(short_charge)), 1 SECONDS) addtimer(CALLBACK(src, PROC_REF(recharge)), charge_time) else to_chat(user, span_notice("[src]'s on board medical scanner indicates that no shock is required.")) /obj/item/handheld_defibrillator/proc/short_charge() - icon_state = "[icon_base]-off" + shocking = FALSE + update_icon(UPDATE_ICON_STATE) + /obj/item/handheld_defibrillator/proc/recharge() cooldown = FALSE - icon_state = "[icon_base]-on" + update_icon(UPDATE_ICON_STATE) playsound(loc, "sound/weapons/flash.ogg", 75, 1) /obj/item/handheld_defibrillator/syndie diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index f06b2e28add..0d4eb278382 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -16,6 +16,7 @@ var/recharging = 0 var/recharge_locked = 0 var/obj/item/stock_parts/micro_laser/diode //used for upgrading! + var/is_pointing = FALSE /obj/item/laser_pointer/red @@ -42,6 +43,9 @@ diode = new /obj/item/stock_parts/micro_laser/ultra +/obj/item/laser_pointer/update_icon_state() + icon_state = "pointer[is_pointing ? "_[pointer_icon_state]" : ""]" + /obj/item/laser_pointer/attack(mob/living/M, mob/user) laser_act(M, user) @@ -55,7 +59,7 @@ else to_chat(user, "[src] already has a cell.") - else if(istype(W, /obj/item/screwdriver)) + else if(W.tool_behaviour == TOOL_SCREWDRIVER) if(diode) to_chat(user, "You remove the [diode.name] from the [src].") diode.loc = get_turf(src.loc) @@ -64,12 +68,12 @@ ..() return -/obj/item/laser_pointer/afterattack(var/atom/target, var/mob/living/user, flag, params) +/obj/item/laser_pointer/afterattack(atom/target, mob/living/user, flag, params) if(flag) //we're placing the object on a table or in backpack return laser_act(target, user, params) -/obj/item/laser_pointer/proc/laser_act(var/atom/target, var/mob/living/user, var/params) +/obj/item/laser_pointer/proc/laser_act(atom/target, mob/living/user, params) if( !(user in (viewers(7,target))) ) return if(!diode) @@ -135,11 +139,9 @@ outmsg = "You missed the lens of [C] with [src]." //laser pointer image - icon_state = "pointer_[pointer_icon_state]" - var/list/showto = list() - for(var/mob/M in viewers(7,targloc)) - if(M.client) - showto.Add(M.client) + is_pointing = TRUE + update_icon(UPDATE_ICON_STATE) + addtimer(CALLBACK(src, PROC_REF(stop_pointing)), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT) var/image/I = image('icons/obj/weapons/projectiles.dmi',targloc,pointer_icon_state,10) var/list/click_params = params2list(params) if(click_params) @@ -165,8 +167,13 @@ to_chat(user, "You've overused the battery of [src], now it needs time to recharge!") recharge_locked = 1 - flick_overlay(I, showto, 10) - icon_state = "pointer" + flick_overlay_view(I, 1 SECONDS) + + +/obj/item/laser_pointer/proc/stop_pointing() + is_pointing = FALSE + update_icon(UPDATE_ICON_STATE) + /obj/item/laser_pointer/process() if(prob(20 - recharge_locked*5)) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index dc75d59db96..a2c3066ccc7 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -115,7 +115,7 @@ qdel(L) return - if(istype(I, /obj/item/storage)) + if(isstorage(I)) var/obj/item/storage/S = I var/found_lightbulbs = FALSE var/replaced_something = TRUE @@ -154,16 +154,29 @@ /obj/item/lightreplacer/emag_act(mob/user) if(!emagged) + emagged = TRUE add_attack_logs(user, src, "emagged") - Emag() + playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + update_appearance(UPDATE_NAME|UPDATE_ICON_STATE) + + +/obj/item/lightreplacer/update_name(updates = ALL) + . = ..() + if(emagged) + name = "shortcircuited [initial(name)]" + else + name = initial(name) + + +/obj/item/lightreplacer/update_icon_state() + icon_state = "lightreplacer[emagged]" + /obj/item/lightreplacer/attack_self(mob/user) for(var/obj/machinery/light/target in user.loc) ReplaceLight(target, user) to_chat(user, status_string()) -/obj/item/lightreplacer/update_icon() - icon_state = "lightreplacer[emagged]" /obj/item/lightreplacer/proc/status_string() return "It has [uses] light\s remaining (plus [bulb_shards] fragment\s)." @@ -229,14 +242,6 @@ to_chat(U, "There is a working [target.fitting] already inserted!") return -/obj/item/lightreplacer/proc/Emag() - emagged = !emagged - playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - if(emagged) - name = "shortcircuited [initial(name)]" - else - name = initial(name) - update_icon() /obj/item/lightreplacer/proc/CanUse(mob/living/user) add_fingerprint(user) diff --git a/code/game/objects/items/devices/memorizer.dm b/code/game/objects/items/devices/memorizer.dm index a58b541cb8f..b894e9c7967 100644 --- a/code/game/objects/items/devices/memorizer.dm +++ b/code/game/objects/items/devices/memorizer.dm @@ -18,6 +18,17 @@ var/can_overcharge = FALSE //set this to FALSE if you don't want your flash to be overcharge capable var/use_sound = 'sound/weapons/flash.ogg' + +/obj/item/memorizer/update_icon_state() + icon_state = "memorizer[broken ? "burnt" : ""]" + + +/obj/item/memorizer/update_overlays() + . = ..() + if(overcharged) + . += "overcharge" + + /obj/item/memorizer/proc/clown_check(mob/user) if(user && (CLUMSY in user.mutations) && prob(50)) memorize_carbon(user, user, 15, FALSE) @@ -27,7 +38,7 @@ /obj/item/memorizer/attackby(obj/item/W, mob/user, params) if(!can_overcharge) return - if(istype(W, /obj/item/screwdriver)) + if(W.tool_behaviour == TOOL_SCREWDRIVER) battery_panel = !battery_panel if(battery_panel) to_chat(user, "You open the battery compartment on the [src].") @@ -39,12 +50,13 @@ to_chat(user, "You jam the cell into battery compartment on the [src].") qdel(W) overcharged = TRUE - overlays += "overcharge" + update_icon(UPDATE_OVERLAYS) + /obj/item/memorizer/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something. broken = TRUE - icon_state = "[initial(icon_state)]burnt" - visible_message("The [src.name] burns out!") + update_icon(UPDATE_ICON_STATE) + visible_message("The [name] burns out!") /obj/item/memorizer/proc/flash_recharge(var/mob/user) @@ -163,7 +175,7 @@ custom_objective.owner = fucking_target.mind fucking_target.mind.objectives += custom_objective fucking_target.mind.lost_memory = TRUE - var/list/messages = list(fucking_target.mind.prepare_announce_objectives()) + var/list/messages = list(fucking_target.mind.prepare_announce_objectives()) to_chat(fucking_target, chat_box_red(chat_box_red(messages.Join("
")))) last_used = world.time if(fucking_target.weakeyes) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index ca05f5d7173..69cc00a81b3 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -523,7 +523,7 @@ /obj/item/paper/pai_upgrade name = "Инструкция по применению" - icon_state = "paper" + icon_state = "paper_words" info = {" Инструкция по применению СпИИ
В набор СпИИ входит:
@@ -548,7 +548,7 @@ 5.Термальное зрение для пИИ
"} -/obj/item/paper/pai_upgrade/update_icon() +/obj/item/paper/pai_upgrade/update_icon_state() return /obj/item/storage/box/syndie_kit/pai diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index b49b1012c89..481b8a83772 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -5,22 +5,53 @@ icon_state = "pizzabox1" throw_range = 1 var/timer = 10 //Adjustable timer - var/timer_set = 0 - var/primed = 0 - var/disarmed = 0 + var/timer_set = FALSE + var/primed = FALSE + var/disarmed = FALSE var/wires = list("orange", "green", "blue", "yellow", "aqua", "purple") var/correct_wire var/armer //Used for admin purposes + +/obj/item/pizza_bomb/update_icon_state() + if(disarmed) + icon_state = "pizzabox_bomb_[correct_wire]" + return + if(primed || !timer_set) + icon_state = "pizzabox_bomb" + return + icon_state = "pizzabox1" + + +/obj/item/pizza_bomb/update_name(updates) + . = ..() + if(timer_set && !disarmed) + name = "pizza box" + else + name = "pizza bomb" + + +/obj/item/pizza_bomb/update_desc(updates) + . = ..() + if(disarmed) + desc = "A devious contraption, made of a small explosive payload hooked up to pressure-sensitive wires. It's disarmed." + return + if(primed) + desc = "OH GOD THAT'S NOT A PIZZA" + return + if(timer_set) + desc = "A box suited for pizzas." + else + desc = "It seems inactive." + + /obj/item/pizza_bomb/attack_self(mob/user) if(disarmed) to_chat(user, "\The [src] is disarmed.") return + if(!timer_set) - name = "pizza bomb" - desc = "It seems inactive." - icon_state = "pizzabox_bomb" - timer_set = 1 + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) timer = (input(user, "Set a timer, from one second to ten seconds.", "Timer", "[timer]") as num) * 10 if(!in_range(src, usr) || issilicon(usr) || !usr.canmove || usr.restrained()) timer_set = 0 @@ -29,25 +60,23 @@ icon_state = "pizzabox1" return timer = clamp(timer, 10, 100) - icon_state = "pizzabox1" + timer_set = TRUE + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) to_chat(user, "You set the timer to [timer / 10] before activating the payload and closing \the [src].") message_admins("[key_name_admin(usr)] has set a timer on a pizza bomb to [timer/10] seconds at [ADMIN_COORDJMP(loc)].") add_game_logs("has set the timer on a pizza bomb to [timer/10] seconds [COORD(loc)].", usr) armer = usr - name = "pizza box" - desc = "A box suited for pizzas." return + if(!primed) - name = "pizza bomb" - desc = "OH GOD THAT'S NOT A PIZZA" - icon_state = "pizzabox_bomb" audible_message("[bicon(src)] *beep* *beep*") to_chat(user, "That's no pizza! That's a bomb!") message_admins("[key_name_admin(usr)] has triggered a pizza bomb armed by [armer] at [ADMIN_COORDJMP(loc)].") add_game_logs("has triggered a pizza bomb armed by [armer] [COORD(loc)].", usr) - primed = 1 - sleep(timer) - return go_boom() + primed = TRUE + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) + addtimer(CALLBACK(src, PROC_REF(go_boom)), timer) + /obj/item/pizza_bomb/proc/go_boom() if(disarmed) @@ -58,8 +87,9 @@ explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb qdel(src) -/obj/item/pizza_bomb/attackby(var/obj/item/I, var/mob/user, params) - if(istype(I, /obj/item/wirecutters) && primed) + +/obj/item/pizza_bomb/attackby(obj/item/I, mob/user, params) + if(I.tool_behaviour == TOOL_WIRECUTTER && primed) to_chat(user, "Oh God, what wire do you cut?!") var/chosen_wire = input(user, "OH GOD OH GOD", "WHAT WIRE?!") in wires if(!in_range(src, usr) || issilicon(usr) || !usr.canmove || usr.restrained()) @@ -68,19 +98,17 @@ user.visible_message("[user] cuts the [chosen_wire] wire!", "You cut the [chosen_wire] wire!") sleep(5) if(chosen_wire == correct_wire) - src.audible_message("[bicon(src)] \The [src] suddenly stops beeping and seems lifeless.") + audible_message("[bicon(src)] \The [src] suddenly stops beeping and seems lifeless.") to_chat(user, "You did it!") - icon_state = "pizzabox_bomb_[correct_wire]" - name = "pizza bomb" - desc = "A devious contraption, made of a small explosive payload hooked up to pressure-sensitive wires. It's disarmed." - disarmed = 1 - primed = 0 + disarmed = TRUE + primed = FALSE + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) return else to_chat(user, "WRONG WIRE!") go_boom() return - if(istype(I, /obj/item/wirecutters) && disarmed) + if(I.tool_behaviour == TOOL_WIRECUTTER && disarmed) if(!in_range(user, src)) to_chat(user, "You can't see the box well enough to cut the wires out.") return diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 60260b00bbb..6d471e726bd 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -30,7 +30,7 @@ attached = null return ..() -/obj/item/powersink/update_icon() +/obj/item/powersink/update_icon_state() icon_state = "powersink[mode == OPERATING]" /obj/item/powersink/proc/set_mode(value) @@ -60,7 +60,7 @@ density = TRUE mode = value - update_icon() + update_icon(UPDATE_ICON_STATE) set_light(0) /obj/item/powersink/screwdriver_act(mob/user, obj/item/I) @@ -135,8 +135,8 @@ if(A.operating && A.cell) A.cell.charge = max(0, A.cell.charge - 50) power_drained += 50 - if(A.charging == 2) // If the cell was full - A.charging = 1 // It's no longer full + if(A.charging == APC_FULLY_CHARGED) // If the cell was full + A.charging = APC_IS_CHARGING // It's no longer full if(drained >= drain_rate) break diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index d1ec25ddb21..9aabaf85c89 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -103,7 +103,7 @@ /obj/item/radio/beacon/engine desc = "A label on it reads: Warning: This device is used for transportation of high-density objects used for high-yield power generation. Stay away!." - anchored = 1 //Let's not move these around. Some folk might get the idea to use these for assassinations + anchored = TRUE //Let's not move these around. Some folk might get the idea to use these for assassinations var/list/enginetype = list() /obj/item/radio/beacon/engine/Initialize(mapload) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 0b593561771..a140942f86f 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -9,16 +9,17 @@ w_class = WEIGHT_CLASS_HUGE materials = list(MAT_METAL=10000, MAT_GLASS=2500) var/code = 2 + var/intensivity = TRUE -/obj/item/radio/electropack/attack_hand(mob/user as mob) +/obj/item/radio/electropack/attack_hand(mob/user) if(src == user.back) - to_chat(user, "You need help taking this off!") - return 0 + to_chat(user, span_notice("You need help taking this off!")) + return FALSE . = ..() /obj/item/radio/electropack/Destroy() - if(istype(src.loc, /obj/item/assembly/shock_kit)) - var/obj/item/assembly/shock_kit/S = src.loc + if(istype(loc, /obj/item/assembly/shock_kit)) + var/obj/item/assembly/shock_kit/S = loc if(S.part1 == src) S.part1 = null else if(S.part2 == src) @@ -26,17 +27,17 @@ master = null return ..() -/obj/item/radio/electropack/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/radio/electropack/attackby(obj/item/W, mob/user, params) ..() if(istype(W, /obj/item/clothing/head/helmet)) if(!b_stat) - to_chat(user, "[src] is not ready to be attached!") + to_chat(user, span_notice("[src] is not ready to be attached!")) return var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit(drop_location()) A.icon = 'icons/obj/assemblies.dmi' if(!user.drop_transfer_item_to_loc(W, A)) - to_chat(user, "\the [W] is stuck to your hand, you cannot attach it to \the [src]!") + to_chat(user, span_notice("\the [W] is stuck to your hand, you cannot attach it to \the [src]!")) return W.master = A A.part1 = W @@ -47,26 +48,21 @@ user.put_in_hands(A, ignore_anim = FALSE) A.add_fingerprint(user) - if(src.flags & NODROP) + if(flags & NODROP) A.flags |= NODROP - /obj/item/radio/electropack/receive_signal(datum/signal/signal) if(!signal || signal.encryption != code) return if(isliving(loc) && on) var/mob/living/M = loc - var/turf/T = M.loc - if(istype(T, /turf)) - if(!M.moved_recently && M.last_move) - M.moved_recently = 1 - step(M, M.last_move) - sleep(50) - if(M) - M.moved_recently = 0 - to_chat(M, "You feel a sharp shock!") - do_sparks(3, 1, M) + if(isturf(M.loc) && M.last_move && intensivity) + step(M, M.last_move) + intensivity = FALSE + addtimer(CALLBACK(src, PROC_REF(intensify)), 5 SECONDS) + to_chat(M, span_userdanger("You feel a sharp shock!")) + do_sparks(3, TRUE, M) M.Weaken(10 SECONDS) @@ -74,6 +70,8 @@ master.receive_signal() return +/obj/item/radio/electropack/proc/intensify() + intensivity = TRUE /obj/item/radio/electropack/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 58c73fcbb45..bf5cf828ba5 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -60,11 +60,11 @@ /obj/item/radio/headset/handle_message_mode(mob/living/M, list/message_pieces, channel) if(channel == "special") if(translate_binary) - var/datum/language/binary = GLOB.all_languages["Robot Talk"] + var/datum/language/binary = GLOB.all_languages[LANGUAGE_BINARY] binary.broadcast(M, strip_prefixes(multilingual_to_message(message_pieces))) return RADIO_CONNECTION_NON_SUBSPACE if(translate_hive) - var/datum/language/hivemind = GLOB.all_languages["Hivemind"] + var/datum/language/hivemind = GLOB.all_languages[LANGUAGE_HIVE_XENOS] hivemind.broadcast(M, strip_prefixes(multilingual_to_message(message_pieces))) return RADIO_CONNECTION_NON_SUBSPACE return RADIO_CONNECTION_FAIL diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 5ffd2ae7b7d..5f5ea340c48 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -2,14 +2,16 @@ name = "station intercom (General)" desc = "Talk through this." icon_state = "intercom" - anchored = 1 + anchored = TRUE w_class = WEIGHT_CLASS_BULKY canhear_range = 2 flags = CONDUCT - var/circuitry_installed = 1 + blocks_emissive = FALSE + var/circuitry_installed = TRUE var/buildstage = 0 dog_fashion = null + /obj/item/radio/intercom/custom name = "station intercom (Custom)" broadcasting = 0 @@ -53,8 +55,8 @@ if(direction) setDir(direction) set_pixel_offsets_from_dir(28, -28, 28, -28) - b_stat=1 - on = 0 + b_stat = TRUE + on = FALSE GLOB.global_intercoms.Add(src) update_icon() @@ -66,7 +68,7 @@ ..() internal_channels = list( num2text(PUB_FREQ) = list(), - num2text(SEC_I_FREQ) = list(ACCESS_SECURITY) + num2text(SEC_I_FREQ) = list(ACCESS_SECURITY), ) /obj/item/radio/intercom/syndicate @@ -173,12 +175,12 @@ return if(!I.use_tool(src, user, 10, volume = I.tool_volume) || buildstage != 2) return - update_icon() - on = 1 - b_stat = 0 + update_icon(UPDATE_ICON_STATE) + on = TRUE + b_stat = FALSE buildstage = 3 to_chat(user, "You secure the electronics!") - update_icon() + update_icon(UPDATE_ICON_STATE) update_operating_status() for(var/i, i<= 5, i++) wires.on_cut(i, 1) @@ -191,8 +193,8 @@ return WIRECUTTER_SNIP_MESSAGE new /obj/item/stack/cable_coil(get_turf(src),5) - on = 0 - b_stat = 1 + on = FALSE + b_stat = TRUE buildstage = 1 update_icon() update_operating_status(FALSE) @@ -209,12 +211,18 @@ new /obj/item/mounted/frame/intercom(get_turf(src)) qdel(src) -/obj/item/radio/intercom/update_icon() +/obj/item/radio/intercom/update_icon_state() if(!circuitry_installed) icon_state="intercom-frame" return icon_state = "intercom[!on?"-p":""][b_stat ? "-open":""]" +/obj/item/radio/intercom/update_overlays() + . = ..() + underlays.Cut() + if(on && buildstage == 3) + underlays += emissive_appearance(icon, "intercom_lightmask") + /obj/item/radio/intercom/proc/update_operating_status(on = TRUE) var/area/current_area = get_area(src) if(!current_area) @@ -236,8 +244,10 @@ var/area/current_area = get_area(src) if(!current_area) on = FALSE + set_light(0) else on = current_area.powered(EQUIP) // set "on" to the equipment power status of our area. + set_light(1, LIGHTING_MINIMUM_POWER) update_icon() /obj/item/intercom_electronics diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 49de0c3c080..928bb79a3a1 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -11,21 +11,22 @@ REAGENT SCANNER desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." icon = 'icons/obj/device.dmi' icon_state = "t-ray0" - var/on = 0 + base_icon_state = "t-ray" + var/on = FALSE slot_flags = SLOT_BELT - w_class = 2 w_class = WEIGHT_CLASS_SMALL item_state = "electronic" materials = list(MAT_METAL=150) origin_tech = "magnets=1;engineering=1" var/scan_range = 1 - var/pulse_duration = 10 + var/pulse_duration = 1 SECONDS /obj/item/t_scanner/extended_range name = "T-ray сканер расширенной дальности" desc = "Излучатель и сканер терагерцевого излучения, используемый для обнаружения скрытых объектов и объектов под полом, таких как кабели и трубы. \ \nДанная модель обладает расширенным радиусом действия." icon_state = "t-ray-range0" + base_icon_state = "t-ray-range" scan_range = 3 origin_tech = "magnets=3;engineering=3" materials = list(MAT_METAL=300) @@ -35,7 +36,8 @@ REAGENT SCANNER desc = "Излучатель и сканер терагерцевого излучения, используемый для обнаружения скрытых объектов и объектов под полом, таких как кабели и трубы. \ \nДанная модель способна генерировать более продолжительные импульсы." icon_state = "t-ray-pulse0" - pulse_duration = 50 + base_icon_state = "t-ray-pulse" + pulse_duration = 5 SECONDS origin_tech = "magnets=5;engineering=3" materials = list(MAT_METAL=300) @@ -44,8 +46,9 @@ REAGENT SCANNER desc = "Излучатель и сканер терагерцевого излучения, используемый для обнаружения скрытых объектов и объектов под полом, таких как кабели и трубы. \ \nДанная модель способна генерировать более продолжительные импульсы и обладает расширенным радиусом действия." icon_state = "t-ray-advanced0" + base_icon_state = "t-ray-advanced" scan_range = 3 - pulse_duration = 50 + pulse_duration = 5 SECONDS origin_tech = "magnets=7;engineering=3" materials = list(MAT_METAL=300) @@ -54,8 +57,9 @@ REAGENT SCANNER desc = "Излучатель и сканер терагерцевого излучения, используемый для обнаружения скрытых объектов и объектов под полом, таких как кабели и трубы. \ \nВысокотехнологичная модель, способная генерировать очень продолжительные импульсы в пределах большого радиуса." icon_state = "t-ray-science0" + base_icon_state = "t-ray-science" scan_range = 5 - pulse_duration = 100 + pulse_duration = 10 SECONDS origin_tech = "magnets=8;engineering=5" materials = list(MAT_METAL=500) @@ -65,8 +69,9 @@ REAGENT SCANNER \nЭкспериментальный образец, обладающий расширенным радиусом действия и более продолжительным импульсом. \ \nСудя по его виду, эта вещь была собрана безумными учеными в ходе спонтанных экспериментов." icon_state = "t-ray-experimental0" + base_icon_state = "t-ray-experimental" scan_range = 3 - pulse_duration = 80 + pulse_duration = 8 SECONDS origin_tech = null materials = list() resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF @@ -76,14 +81,19 @@ REAGENT SCANNER STOP_PROCESSING(SSobj, src) return ..() -/obj/item/t_scanner/attack_self(mob/user) +/obj/item/t_scanner/update_icon_state() + icon_state = "[base_icon_state][on]" +/obj/item/t_scanner/proc/toggle_mode() on = !on - icon_state = copytext(icon_state, 1, length(icon_state))+"[on]" - + update_icon(UPDATE_ICON_STATE) if(on) START_PROCESSING(SSobj, src) + else + STOP_PROCESSING(SSobj, src) +/obj/item/t_scanner/attack_self(mob/user) + toggle_mode() /obj/item/t_scanner/process() if(!on) @@ -92,48 +102,41 @@ REAGENT SCANNER scan() /obj/item/t_scanner/proc/scan() + t_ray_scan(loc, pulse_duration, scan_range) - for(var/turf/scan_turf in range(scan_range, src.loc) ) - - if(!scan_turf.intact) +/proc/t_ray_scan(mob/viewer, flick_time, distance) + if(!ismob(viewer) || !viewer.client) + return + var/list/t_ray_images = list() + for(var/atom/movable/in_turf_atom in orange(distance, viewer)) + if(!isobj(in_turf_atom) && !isliving(in_turf_atom)) continue - for(var/obj/in_turf_object in scan_turf.contents) - + if(isobj(in_turf_atom)) + var/obj/in_turf_object = in_turf_atom if(in_turf_object.level != 1) continue - var/temp_invisibility = in_turf_object.invisibility - var/temp_alpha = in_turf_object.alpha - if(temp_invisibility == INVISIBILITY_ABSTRACT || temp_invisibility == INVISIBILITY_ANOMALY) - in_turf_object.invisibility = 0 - in_turf_object.alpha = 128 - in_turf_object.drain_act_protected = TRUE - if(in_turf_object.layer < TURF_LAYER) - in_turf_object.layer += TRAY_SCAN_LAYER_OFFSET - spawn(pulse_duration) - in_turf_object.plane = GAME_PLANE - if(in_turf_object) - var/turf/objects_turf = in_turf_object.loc - if(objects_turf && objects_turf.intact) - in_turf_object.invisibility = temp_invisibility - in_turf_object.alpha = temp_alpha - in_turf_object.drain_act_protected = FALSE - for(var/mob/living/in_turf_mob in scan_turf.contents) - var/oldalpha = in_turf_mob.alpha - if(in_turf_mob.alpha < 255 && istype(in_turf_mob)) - in_turf_mob.alpha = 255 - spawn(10) - if(in_turf_mob) - in_turf_mob.alpha = oldalpha - - var/mob/living/in_turf_mob = locate() in scan_turf - - if(in_turf_mob && in_turf_mob.invisibility == INVISIBILITY_LEVEL_TWO) - in_turf_mob.invisibility = 0 - spawn(2) - if(in_turf_mob) - in_turf_mob.invisibility = INVISIBILITY_LEVEL_TWO + if(in_turf_object.invisibility != INVISIBILITY_MAXIMUM && in_turf_object.invisibility != INVISIBILITY_ANOMALY) + continue + + if(isliving(in_turf_atom)) + var/mob/living/in_turf_living = in_turf_atom + if(!(in_turf_living.alpha < 255 || in_turf_living.invisibility == INVISIBILITY_LEVEL_TWO)) + continue + + var/image/I = new(loc = get_turf(in_turf_atom)) + var/mutable_appearance/MA = new(in_turf_atom) + MA.alpha = isliving(in_turf_atom) ? 255 : 128 + MA.dir = in_turf_atom.dir + if(MA.layer < TURF_LAYER) + MA.layer += TRAY_SCAN_LAYER_OFFSET + MA.plane = GAME_PLANE + I.appearance = MA + t_ray_images += I + + if(length(t_ray_images)) + flick_overlay(t_ray_images, list(viewer.client), flick_time) /obj/item/t_scanner/security name = "Противо-маскировочное ТГц устройство" @@ -143,13 +146,14 @@ REAGENT SCANNER righthand_file = 'icons/mob/inhands/items_righthand.dmi' item_state = "sb_t-ray" icon_state = "sb_t-ray0" + base_icon_state = "sb_t-ray" scan_range = 2 - pulse_duration = 30 var/was_alerted = FALSE // Protection against spam alerts from this scanner var/burnt = FALSE // Did emp break us? var/datum/effect_system/spark_spread/spark_system //The spark system, used for generating... sparks? origin_tech = "combat=3;magnets=5;biotech=5" + /obj/item/t_scanner/security/Initialize() . = ..() //Sets up a spark system @@ -157,43 +161,67 @@ REAGENT SCANNER spark_system.set_up(5, 0, src) spark_system.attach(src) + +/obj/item/t_scanner/security/update_icon_state() + if(burnt) + icon_state = "[base_icon_state]_burnt" + return + icon_state = "[base_icon_state][on]" + + +/obj/item/t_scanner/security/update_desc(updates = ALL) + . = ..() + if(!burnt) + desc = initial(desc) + return + desc = "Излучатель терагерцевого типа используемый для сканирования области на наличие замаскированных биоорганизмов. Устройство сгорело, теперь можно обнаружить разве что крошки от пончика оставшиеся на нём..." + + /obj/item/t_scanner/security/attack_self(mob/user) if(!burnt) on = !on - icon_state = copytext(icon_state, 1, length(icon_state))+"[on]" + update_icon(UPDATE_ICON_STATE) if(on) - START_PROCESSING(SSobj, src) + START_PROCESSING(SSprocessing, src) + else + STOP_PROCESSING(SSprocessing, src) + /obj/item/t_scanner/security/emp_act(severity) . = ..() if(prob(25) && !burnt) burnt = TRUE - on = FALSE; - icon_state = copytext(icon_state, 1, length(icon_state))+"_burnt" - desc = "Излучатель терагерцевого типа используемый для сканирования области на наличие замаскированных биоорганизмов. Устройство сгорело, теперь можно обнаружить разве что крошки от пончика оставшиеся на нём..." + on = FALSE + update_appearance(UPDATE_ICON_STATE|UPDATE_DESC) playsound(loc, "sparks", 50, TRUE, 5) spark_system.start() -/obj/item/t_scanner/security/scan() +/obj/item/t_scanner/security/scan() + var/mob/viewer = loc + if(!ismob(viewer) || !viewer.client) + return new /obj/effect/temp_visual/scan(get_turf(src)) - var/list/mobs_in_range = viewers(scan_range, get_turf(src)) - for(var/mob/living/in_turf_mob in mobs_in_range) - var/oldalpha = in_turf_mob.alpha - if(in_turf_mob.alpha < 255 && istype(in_turf_mob)) - in_turf_mob.alpha = 255 - alert_searchers(in_turf_mob) - spawn(pulse_duration) - if(in_turf_mob) - in_turf_mob.alpha = oldalpha - if(in_turf_mob && in_turf_mob.invisibility == INVISIBILITY_LEVEL_TWO) - in_turf_mob.invisibility = 0 - alert_searchers(in_turf_mob) - spawn(pulse_duration) - if(in_turf_mob) - in_turf_mob.invisibility = INVISIBILITY_LEVEL_TWO + var/list/t_ray_images = list() + for(var/mob/living/in_turf_living in viewers(scan_range, get_turf(src))) + if(!(in_turf_living.alpha < 255 || in_turf_living.invisibility == INVISIBILITY_LEVEL_TWO)) + continue + + var/image/I = new(loc = get_turf(in_turf_living)) + var/mutable_appearance/MA = new(in_turf_living) + MA.alpha = 255 + MA.dir = in_turf_living.dir + if(MA.layer < TURF_LAYER) + MA.layer += TRAY_SCAN_LAYER_OFFSET + MA.plane = GAME_PLANE + I.appearance = MA + t_ray_images += I + alert_searchers(in_turf_living) + + if(length(t_ray_images)) + flick_overlay(t_ray_images, list(viewer.client), pulse_duration) /obj/item/t_scanner/security/proc/alert_searchers(mob/living/found_mob) var/list/alerted = viewers(7, found_mob) @@ -601,6 +629,13 @@ REAGENT SCANNER if(0) to_chat(usr, "Сканер больше не показывает повреждения конечностей.") + +/obj/item/healthanalyzer/update_overlays() + . = ..() + if(advanced) + . += "advanced" + + /obj/item/healthanalyzer/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/healthupgrade)) if(advanced) @@ -608,9 +643,9 @@ REAGENT SCANNER else if(user.drop_transfer_item_to_loc(I, src)) to_chat(user, "Вы установили модуль обновления на [src].") - add_overlay("advanced") playsound(loc, I.usesound, 50, 1) advanced = TRUE + update_icon(UPDATE_OVERLAYS) qdel(I) return return ..() @@ -620,7 +655,7 @@ REAGENT SCANNER /obj/item/healthanalyzer/advanced/Initialize(mapload) . = ..() - add_overlay("advanced") + update_icon(UPDATE_OVERLAYS) /obj/item/healthupgrade @@ -787,6 +822,7 @@ REAGENT SCANNER var/obj/item/stock_parts/cell/cell var/cell_type = /obj/item/stock_parts/cell/upgraded var/ready = TRUE // Ready to scan + var/printing = FALSE var/time_to_use = 0 // How much time remaining before next scan is available. var/usecharge = 750 var/scan_time = 10 SECONDS //how long does it take to scan @@ -817,17 +853,24 @@ REAGENT SCANNER playsound(src, 'sound/machines/defib_saftyon.ogg', 50, 0) update_icon() -/obj/item/bodyanalyzer/update_icon(printing = FALSE) - overlays.Cut() - var/percent = cell.percent() + +/obj/item/bodyanalyzer/update_icon_state() + if(!cell) + icon_state = "bodyanalyzer_0" + return if(ready) icon_state = "bodyanalyzer_1" else icon_state = "bodyanalyzer_2" + +/obj/item/bodyanalyzer/update_overlays() + . = ..() + var/percent = cell.percent() var/overlayid = round(percent / 10) - overlayid = "bodyanalyzer_charge[overlayid]" - overlays += icon(icon, overlayid) + . += "bodyanalyzer_charge[overlayid]" + if(printing) + . += "bodyanalyzer_printing" /obj/item/bodyanalyzer/attack(mob/living/M, mob/living/carbon/human/user) @@ -845,6 +888,7 @@ REAGENT SCANNER to_chat(user, "The scanner beeps angrily at you! It's out of charge!") playsound(user.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) + /obj/item/bodyanalyzer/borg/attack(mob/living/M, mob/living/silicon/robot/user) if(user.incapacitated() || !user.Adjacent(M)) return @@ -858,6 +902,7 @@ REAGENT SCANNER else to_chat(user, "You need to recharge before you can use [src]") + /obj/item/bodyanalyzer/proc/mobScan(mob/living/M, mob/user) if(ishuman(M)) var/report = generate_printing_text(M, user) @@ -867,8 +912,6 @@ REAGENT SCANNER printout.info = report printout.name = "Scan report - [M.name]" playsound(user.loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) - flick("bodyanalyzer_anim", src) - sleep(3 SECONDS) user.put_in_hands(printout, ignore_anim = FALSE) time_to_use = world.time + scan_cd if(isrobot(user)) @@ -877,14 +920,16 @@ REAGENT SCANNER else cell.use(usecharge) ready = FALSE - update_icon(TRUE) + printing = TRUE + update_icon() addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/bodyanalyzer, setReady)), scan_cd) - addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 20) - + addtimer(VARSET_CALLBACK(src, printing, FALSE), 1.4 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), UPDATE_OVERLAYS), 1.5 SECONDS) else if(iscorgi(M) && M.stat == DEAD) to_chat(user, "You wonder if [M.p_they()] was a good dog. [src] tells you they were the best...") // :'( playsound(loc, 'sound/machines/ping.ogg', 50, 0) ready = FALSE + update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/bodyanalyzer, setReady)), scan_cd) time_to_use = world.time + scan_cd else diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm index d0a65408d5b..4a81ccd38d1 100644 --- a/code/game/objects/items/devices/sensor_device.dm +++ b/code/game/objects/items/devices/sensor_device.dm @@ -17,23 +17,20 @@ QDEL_NULL(crew_monitor) return ..() -/obj/item/sensor_device/attack_self(mob/user as mob) +/obj/item/sensor_device/attack_self(mob/user) ui_interact(user) -/obj/item/sensor_device/MouseDrop(atom/over) +/obj/item/sensor_device/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) . = ..() if(!.) return FALSE var/mob/user = usr - if(istype(over, /obj/screen)) - return FALSE - if(user.incapacitated() || !ishuman(user)) return FALSE - if(over == user) + if(over_object == user) attack_self(user) return TRUE diff --git a/code/game/objects/items/devices/signmaker.dm b/code/game/objects/items/devices/signmaker.dm index 64da2cfc406..6d163a7105e 100644 --- a/code/game/objects/items/devices/signmaker.dm +++ b/code/game/objects/items/devices/signmaker.dm @@ -29,22 +29,25 @@ return qdel(sign) sign = null - update_icon() + update_icon(UPDATE_ICON_STATE) + /obj/item/signmaker/proc/icon_flick() set waitfor = FALSE - icon_state = "signmaker_clown_on" pointer_busy = TRUE - sleep(10) + update_icon(UPDATE_ICON_STATE) + sleep(1 SECONDS) pointer_busy = FALSE - icon_state = "signmaker_clown_off" + update_icon(UPDATE_ICON_STATE) + -/obj/item/signmaker/update_icon() - if(sign) - icon_state = "signmaker_clown_on" - else +/obj/item/signmaker/update_icon_state() + if(pointer_busy) icon_state = "signmaker_clown_off" + return + icon_state = "signmaker_clown_[sign ? "on" : "off"]]" + /obj/item/signmaker/emag_act(mob/user) add_attack_logs(user, src, "emagged") diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 98c77e2f95a..218f4d6e7b3 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -36,7 +36,7 @@ ..() if(starts_with_tape) mytape = new /obj/item/tape/random(src) - update_icon() + update_icon(UPDATE_ICON_STATE) soundloop = new(list(src)) @@ -60,7 +60,7 @@ . += span_notice("[mytape] has [mytape.remaining_capacity] seconds remaining.") // to avoid having 0 minutes else . += span_notice("[mytape] has [seconds_to_time(mytape.remaining_capacity)] remaining.") - . += span_notice("Alt-Click to access the tape.") + . += span_info("Alt-Click to access the tape.") /obj/item/taperecorder/proc/update_sound() @@ -70,7 +70,7 @@ soundloop.start() -/obj/item/taperecorder/update_icon() +/obj/item/taperecorder/update_icon_state() if(!mytape) icon_state = "taperecorder_empty" else if(recording) @@ -82,7 +82,7 @@ /obj/item/taperecorder/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) - mytape.ruin() //Fires destroy the tape + mytape?.ruin() //Fires destroy the tape return ..() @@ -91,7 +91,7 @@ mytape = I to_chat(user, span_notice("You insert [I] into [src].")) playsound(src, 'sound/items/taperecorder/taperecorder_close.ogg', 50, FALSE) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/taperecorder/attack_hand(mob/user) @@ -150,7 +150,7 @@ mytape.forceMove_turf() user.put_in_hands(mytape, ignore_anim = FALSE) mytape = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/taperecorder/proc/record() @@ -167,7 +167,7 @@ recording = TRUE recorder_say("Запись началась.") update_sound() - update_icon() + update_icon(UPDATE_ICON_STATE) mytape.timestamp += mytape.used_capacity var/datum/tape_piece/piece = new() piece.time = mytape.used_capacity @@ -209,7 +209,7 @@ if(!playback_override) recorder_say("Проигрывание остановлено.") playing = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) update_sound() @@ -229,7 +229,7 @@ return playing = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) update_sound() recorder_say("Проигрывание началось.") playsound(src, 'sound/items/taperecorder/taperecorder_play.ogg', 50, FALSE) @@ -317,18 +317,18 @@ var/obj/item/paper/transcript = new /obj/item/paper(drop_location()) - var/t1 = "Transcript:
" + var/list/paper_info = list("Transcript:
") for(var/i = 1, length(mytape.storedinfo) >= i, i++) var/datum/tape_piece/piece = mytape.storedinfo[i] - t1 += "\[[time2text(piece.time * 10,"mm:ss")]\] " + paper_info += "\[[time2text(piece.time * 10,"mm:ss")]\] " if(piece.speaker_name) - t1 += "[piece.speaker_name] " + paper_info += "[piece.speaker_name] " if(piece.message_verb) - t1 += "[piece.message_verb], \"[piece.message]\"
" + paper_info += "[piece.message_verb], \"[replace_characters(piece.message, list("+"))]\"
" else - t1 += "[piece.message]
" + paper_info += "[replace_characters(piece.message, list("+"))]
" - transcript.info = t1 + transcript.info = paper_info.Join("") transcript.name = "paper- 'Transcript'" cooldown = world.time + 3 SECONDS @@ -377,6 +377,12 @@ . += span_notice("It has [seconds_to_time(remaining_capacity)] remaining.") +/obj/item/tape/update_overlays() + . = ..() + if(ruined) + . += "ribbonoverlay" + + /obj/item/tape/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) ..() ruin() @@ -414,14 +420,14 @@ to_chat(user, span_notice("You pull the tape out of [src].")) if(!ruined) - overlays += "ribbonoverlay" ruined = TRUE + update_icon(UPDATE_OVERLAYS) /obj/item/tape/proc/fix() if(ruined) - overlays -= "ribbonoverlay" ruined = FALSE + update_icon(UPDATE_OVERLAYS) /obj/item/tape/verb/wipe() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 43f06e5b5dd..c0d5b223e9d 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -29,15 +29,17 @@ effective or pretty fucking useless. var/charges = 3 + /obj/item/batterer/examine(mob/user) . = ..() - . += "[src] has [charges] charges left." + . += span_notice("[src] has [charges] charges left.") + /obj/item/batterer/attack_self(mob/living/carbon/user, flag = 0, emp = 0) if(!user) return if(charges == 0) - to_chat(user, "The mind batterer is out of charge!") + to_chat(user, span_danger("The mind batterer is out of charge!")) return @@ -46,17 +48,18 @@ effective or pretty fucking useless. M.Weaken(rand(2,6) SECONDS) M.adjustStaminaLoss(rand(35, 60)) add_attack_logs(user, M, "Stunned with [src]") - to_chat(M, "You feel a tremendous, paralyzing wave flood your mind.") + to_chat(M, span_danger("You feel a tremendous, paralyzing wave flood your mind.")) else - to_chat(M, "You feel a sudden, electric jolt travel through your head.") + to_chat(M, span_danger("You feel a sudden, electric jolt travel through your head.")) M.Slowed(10 SECONDS) M.Confused(6 SECONDS) playsound(loc, 'sound/misc/interference.ogg', 50, 1) charges-- - to_chat(user, "You trigger [src]. It has [charges] charges left.") + to_chat(user,span_notice("You trigger [src]. It has [charges] charges left.")) addtimer(CALLBACK(src, PROC_REF(recharge)), 3 MINUTES) + /obj/item/batterer/proc/recharge() charges++ @@ -92,31 +95,43 @@ effective or pretty fucking useless. var/wavelength = 10 // time it takes for the radiation to kick in, in seconds var/used = 0 // is it cooling down? -/obj/item/rad_laser/attack(mob/living/M, mob/living/user) - if(!used) - add_attack_logs(user, M, "Irradiated by [src]") - user.visible_message("[user] analyzes [M]'s vitals.") - var/cooldown = round(max(100,(((intensity*8)-(wavelength/2))+(intensity*2))*10)) - used = 1 - icon_state = "health1" - handle_cooldown(cooldown) // splits off to handle the cooldown while handling wavelength - spawn((wavelength+(intensity*4))*10) - if(M) - if(intensity >= 5) - M.Paralyse(intensity * 40/3 SECONDS) - M.apply_effect(intensity * 10, IRRADIATE) - else - to_chat(user, "The radioactive microlaser is still recharging.") -/obj/item/rad_laser/proc/handle_cooldown(cooldown) - spawn(cooldown) - used = 0 - icon_state = "health2" +/obj/item/rad_laser/update_icon_state() + icon_state = used ? "health1" : "health2" + + +/obj/item/rad_laser/attack(mob/living/target, mob/living/user) + if(used) + to_chat(user, span_warning("The radioactive microlaser is still recharging.")) + return + + add_attack_logs(user, target, "Irradiated by [src]") + user.visible_message(span_notice("[user] analyzes [target]'s vitals.")) + var/cooldown = round(max(100,(((intensity*8)-(wavelength/2))+(intensity*2))*10)) + used = TRUE + update_icon(UPDATE_ICON_STATE) + addtimer(CALLBACK(src, PROC_REF(reset_cooldown)), cooldown) + addtimer(CALLBACK(src, PROC_REF(delayed_effect), target), (wavelength + (intensity * 4)) SECONDS) + + +/obj/item/rad_laser/proc/reset_cooldown() + used = FALSE + update_icon(UPDATE_ICON_STATE) + + +/obj/item/rad_laser/proc/delayed_effect(mob/living/target) + if(QDELETED(target)) + return + if(intensity >= 5) + target.Paralyse((intensity * 40 / 3) SECONDS) + target.apply_effect(intensity * 10, IRRADIATE) + /obj/item/rad_laser/attack_self(mob/user) ..() interact(user) + /obj/item/rad_laser/interact(mob/user) user.set_machine(src) @@ -131,6 +146,7 @@ effective or pretty fucking useless. popup.set_content(dat) popup.open() + /obj/item/rad_laser/Topic(href, href_list) if(..()) return 1 @@ -149,7 +165,8 @@ effective or pretty fucking useless. attack_self(usr) add_fingerprint(usr) - return + + /obj/item/jammer name = "radio jammer" @@ -159,12 +176,14 @@ effective or pretty fucking useless. var/active = FALSE var/range = 12 + /obj/item/jammer/Destroy() GLOB.active_jammers -= src return ..() + /obj/item/jammer/attack_self(mob/user) - to_chat(user,"You [active ? "deactivate" : "activate"] the [src].") + to_chat(user, span_notice("You [active ? "deactivate" : "activate"] the [src].")) active = !active if(active) GLOB.active_jammers |= src @@ -175,7 +194,8 @@ effective or pretty fucking useless. name = "Syndicate teleporter" desc = "A strange syndicate version of a cult veil shifter. Warranty voided if exposed to EMP." icon = 'icons/obj/device.dmi' - icon_state = "syndi-tele" + icon_state = "syndi-tele-4" + base_icon_state = "syndi-tele" throwforce = 5 w_class = WEIGHT_CLASS_SMALL throw_speed = 4 @@ -190,87 +210,122 @@ effective or pretty fucking useless. var/saving_throw_distance = 3 var/flawless = FALSE -/obj/item/teleporter/Initialize(mapload, ...) - . = ..() - START_PROCESSING(SSobj, src) /obj/item/teleporter/Destroy() - STOP_PROCESSING(SSobj, src) + if(isprocessing) + STOP_PROCESSING(SSobj, src) return ..() + /obj/item/teleporter/examine(mob/user) . = ..() - . += "[src] has [charges] out of [max_charges] charges left." + . += span_notice("[src] has [charges] out of [max_charges] charges left.") + + +/obj/item/teleporter/update_icon_state() + icon_state = "[base_icon_state]-[charges]" + /obj/item/teleporter/attack_self(mob/user) attempt_teleport(user, FALSE) + /obj/item/teleporter/process() - if(prob(10) && charges < max_charges) + if(charges >= max_charges) + return PROCESS_KILL + + if(prob(10)) charges++ + update_icon(UPDATE_ICON_STATE) + /obj/item/teleporter/emp_act(severity) - if(prob(50 / severity)) - if(istype(loc, /mob/living/carbon/human)) - var/mob/living/carbon/human/user = loc - to_chat(user, "The [src] buzzes and activates!") - attempt_teleport(user, TRUE) - else - visible_message(" The [src] activates and blinks out of existence!") - do_sparks(2, 1, src) - qdel(src) + if(!prob(50 / severity)) + return + + if(ishuman(loc)) + var/mob/living/carbon/human/user = loc + to_chat(user, span_danger("The [src] buzzes and activates!")) + attempt_teleport(user, TRUE) + return + + // Well, it either is on a floor / locker, and won't teleport someone, + // OR it's in someones bag. As such, we need to check the turf to see if people are there. + var/teleported_something = FALSE + var/turf/teleport_turf = get_turf(src) + for(var/mob/living/user in teleport_turf) + teleported_something = TRUE + attempt_teleport(user, TRUE) + + if(teleported_something) + teleport_turf.visible_message(span_danger("[src] activates sporadically, teleporting everyone around it!")) + return + + visible_message(span_warning("The [src] activates and blinks out of existence!")) + do_sparks(2, TRUE, src) + qdel(src) + -/obj/item/teleporter/proc/attempt_teleport(mob/user, EMP_D = FALSE) +/obj/item/teleporter/proc/attempt_teleport(mob/living/user, EMP_D = FALSE) + for(var/obj/item/grab/G in user) + qdel(G) dir_correction(user) - if(!charges) - to_chat(user, "The [src] is recharging still.") + if(!charges && !EMP_D) //If it's empd, you are moving no matter what. + to_chat(user, span_warning("[src] is still recharging.")) return - var/mob/living/carbon/C = user - var/turf/mobloc = get_turf(C) - var/list/turfs = new/list() + var/turf/mobloc = get_turf(user) + var/list/turfs = list() var/found_turf = FALSE var/list/bagholding = user.search_contents_for(/obj/item/storage/backpack/holding) - for(var/turf/T in range(user, tp_range)) - if(!is_teleport_allowed(T.z)) + for(var/turf/check in range(user, tp_range)) + if(!is_teleport_allowed(check.z)) break if(!(length(bagholding) && !flawless)) //Chaos if you have a bag of holding - if(get_dir(C, T) != C.dir) + if(get_dir(user, check) != user.dir) continue - if(T in range(user, inner_tp_range)) + if(check in range(user, inner_tp_range)) continue - if(T.x > world.maxx-tp_range || T.x < tp_range) + if(check.x > world.maxx-tp_range || check.x < tp_range) continue //putting them at the edge is dumb - if(T.y > world.maxy-tp_range || T.y < tp_range) + if(check.y > world.maxy-tp_range || check.y < tp_range) continue - turfs += T + turfs += check found_turf = TRUE - if(found_turf) - if(user.loc != mobloc) // No locker / mech / sleeper teleporting, that breaks stuff - to_chat(C, "The [src] will not work here!") + if(!found_turf) + to_chat(user, span_danger("[src] will not work here!")) + return + + if(user.loc != mobloc) // No locker / mech / sleeper teleporting, that breaks stuff + to_chat(user, span_danger("[src] will not work here!")) + + if(charges > 0) //While we want EMP triggered teleports to drain charge, we also do not want it to go negative charge, as such we need this check here charges-- - var/turf/destination = pick(turfs) - if(tile_check(destination) || flawless) // Why is there so many bloody floor types - var/turf/fragging_location = destination - telefrag(fragging_location, user) - C.forceMove(destination) - playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc) - playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(destination) - else if (EMP_D == FALSE && !(bagholding.len && !flawless)) // This is where the fun begins - var/direction = get_dir(user, destination) - panic_teleport(user, destination, direction) - else // Emp activated? Bag of holding? No saving throw for you - get_fragged(user, destination) - else - to_chat(C, "The [src] will not work here!") + update_icon(UPDATE_ICON_STATE) + if(!isprocessing) + START_PROCESSING(SSobj, src) + + var/turf/destination = pick(turfs) + if(tile_check(destination) || flawless) // Why is there so many bloody floor types + var/turf/fragging_location = destination + telefrag(fragging_location, user) + user.forceMove(destination) + playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc) + playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(destination) + else if(EMP_D == FALSE && !(length(bagholding) && !flawless)) // This is where the fun begins + var/direction = get_dir(user, destination) + panic_teleport(user, destination, direction) + else // Emp activated? Bag of holding? No saving throw for you + get_fragged(user, destination) + + +/obj/item/teleporter/proc/tile_check(turf/check_turf) + return isfloorturf(check_turf) || isspaceturf(check_turf) -/obj/item/teleporter/proc/tile_check(turf/T) - if(istype(T, /turf/simulated/floor) || istype(T, /turf/space) || istype(T, /turf/simulated/floor/shuttle) || istype(T, /turf/simulated/floor/shuttle/objective_check) || istype(T, /turf/simulated/floor/shuttle/plating)) - return TRUE /obj/item/teleporter/proc/dir_correction(mob/user) //Direction movement, screws with teleport distance and saving throw, and thus must be removed first var/temp_direction = user.dir @@ -280,7 +335,8 @@ effective or pretty fucking useless. if(NORTHWEST, SOUTHWEST) user.dir = WEST -/obj/item/teleporter/proc/panic_teleport(mob/user, turf/destination, direction = NORTH) + +/obj/item/teleporter/proc/panic_teleport(mob/living/user, turf/destination, direction = NORTH) var/saving_throw switch(direction) if(NORTH, SOUTH) @@ -296,33 +352,33 @@ effective or pretty fucking useless. else saving_throw = NORTH // just in case - var/mob/living/carbon/C = user - var/turf/mobloc = get_turf(C) + var/turf/mobloc = get_turf(user) var/list/turfs = list() var/found_turf = FALSE - for(var/turf/T in range(destination, saving_throw_distance)) - if(get_dir(destination, T) != saving_throw) + for(var/turf/check in range(destination, saving_throw_distance)) + if(get_dir(destination, check) != saving_throw) continue - if(T.x > world.maxx-saving_throw_distance || T.x < saving_throw_distance) + if(check.x > world.maxx-saving_throw_distance || check.x < saving_throw_distance) continue //putting them at the edge is dumb - if(T.y > world.maxy-saving_throw_distance || T.y < saving_throw_distance) + if(check.y > world.maxy-saving_throw_distance || check.y < saving_throw_distance) continue - if(!tile_check(T)) + if(!tile_check(check)) continue // We are only looking for safe tiles on the saving throw, since we are nice - turfs += T + turfs += check found_turf = TRUE - if(found_turf) - var/turf/new_destination = pick(turfs) - var/turf/fragging_location = new_destination - telefrag(fragging_location, user) - C.forceMove(new_destination) - playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc) - new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(new_destination) - playsound(new_destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - else //We tried to save. We failed. Death time. - get_fragged(user, destination) + if(!found_turf) + get_fragged(user, destination) //We tried to save. We failed. Death time. + return + + var/turf/new_destination = pick(turfs) + var/turf/fragging_location = new_destination + telefrag(fragging_location, user) + user.forceMove(new_destination) + playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc) + new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(new_destination) + playsound(new_destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) /obj/item/teleporter/proc/get_fragged(mob/user, turf/destination) @@ -334,19 +390,19 @@ effective or pretty fucking useless. playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) playsound(destination, "sound/magic/disintegrate.ogg", 50, TRUE) destination.ex_act(rand(1,2)) - for(var/obj/item/W in user) - if(istype(W, /obj/item/organ)|| istype(W, /obj/item/implant)) - continue - if(!user.drop_item_ground(W)) - qdel(W) - to_chat(user, "You teleport into the wall, the teleporter tries to save you, but--") + for(var/obj/item/thing as anything in user.get_equipped_items(TRUE, TRUE)) + if(!user.drop_item_ground(thing)) + qdel(thing) + to_chat(user, span_dangerbigger("You teleport into the wall, the teleporter tries to save you, but--")) user.gib() + /obj/item/teleporter/proc/telefrag(turf/fragging_location, mob/user) - for(var/mob/living/M in fragging_location)//Hit everything in the turf - M.apply_damage(20, BRUTE) - M.Weaken(6 SECONDS) - to_chat(M, "[user] teleports into you, knocking you to the floor with the bluespace wave! ")
+ for(var/mob/living/target in fragging_location)//Hit everything in the turf
+ target.apply_damage(20, BRUTE)
+ target.Weaken(6 SECONDS)
+ to_chat(target, span_warning("[user] teleports into you, knocking you to the floor with the bluespace wave!"))
+
/obj/item/paper/teleporter
name = "Teleporter Guide"
@@ -361,18 +417,25 @@ effective or pretty fucking useless.
Do not expose the teleporter to electromagnetic pulses or attempt to use with a bag of holding, unwanted malfunctions may occur. "} + + /obj/item/storage/box/syndie_kit/teleporter name = "syndicate teleporter kit" + /obj/item/storage/box/syndie_kit/teleporter/populate_contents() new /obj/item/teleporter(src) new /obj/item/paper/teleporter(src) new /obj/item/clothing/glasses/chameleon/meson(src) + + /obj/effect/temp_visual/teleport_abductor/syndi_teleporter duration = 5 + /obj/item/teleporter/admin desc = "A strange syndicate version of a cult veil shifter. \n This one seems EMP proof, and with much better saftey protocols." charges = 8 max_charges = 8 flawless = TRUE + diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 57fa49d5bf4..ad810bee5e0 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -110,7 +110,8 @@ if(tank_one) split_gases() valve_open = FALSE - tank_one.forceMove(get_turf(src)) + tank_one.forceMove_turf() + usr?.put_in_hands(tank_one, ignore_anim = FALSE) tank_one = null update_icon() if((!tank_two || tank_two.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL)) @@ -119,7 +120,8 @@ if(tank_two) split_gases() valve_open = FALSE - tank_two.forceMove(get_turf(src)) + tank_two.forceMove_turf() + usr?.put_in_hands(tank_two, ignore_anim = FALSE) tank_two = null update_icon() if((!tank_one || tank_one.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL)) @@ -131,7 +133,8 @@ attached_device.attack_self(usr) if("remove_device") if(attached_device) - attached_device.forceMove(get_turf(src)) + attached_device.forceMove_turf() + usr?.put_in_hands(attached_device, ignore_anim = FALSE) attached_device.holder = null attached_device = null qdel(GetComponent(/datum/component/proximity_monitor)) @@ -145,28 +148,32 @@ /obj/item/transfer_valve/proc/process_activation(obj/item/D, normal = TRUE, special = TRUE, mob/user) if(toggle) - toggle = 0 + toggle = FALSE toggle_valve(user) - spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever - toggle = 1 + addtimer(VARSET_CALLBACK(src, toggle, TRUE), 5 SECONDS) // To stop a signal being spammed from a proxy sensor constantly going off or whatever -/obj/item/transfer_valve/update_icon() - overlays.Cut() - underlays = null +/obj/item/transfer_valve/update_icon_state() if(!tank_one && !tank_two && !attached_device) icon_state = "valve_1" - return - icon_state = "valve" + else + icon_state = "valve" + +/obj/item/transfer_valve/update_overlays() + . = ..() + underlays.Cut() + if(!tank_one && !tank_two && !attached_device) + return if(tank_one) - overlays += "[tank_one.icon_state]" + . += "[tank_one.icon_state]" if(tank_two) var/icon/J = new(icon, icon_state = "[tank_two.icon_state]") J.Shift(WEST, 13) underlays += J if(attached_device) - overlays += "device" + . += "device" + /obj/item/transfer_valve/proc/merge_gases() tank_two.air_contents.volume += tank_one.air_contents.volume @@ -190,7 +197,7 @@ /obj/item/transfer_valve/proc/toggle_valve(mob/user) if(!valve_open && tank_one && tank_two) - valve_open = 1 + valve_open = TRUE var/turf/bombturf = get_turf(src) @@ -202,13 +209,17 @@ if(user) add_attack_logs(user, src, "Bomb valve opened with [attached_device ? attached_device : "no device"], attached by [key_name_log(attacher)]. Last touched by: [key_name_log(mob)]", ATKLOG_FEW) merge_gases() - spawn(20) // In case one tank bursts - for(var/i in 1 to 5) - update_icon() - sleep(10) - update_icon() + addtimer(CALLBACK(src, PROC_REF(toggle_process)), 2 SECONDS) // In case one tank bursts else if(valve_open && tank_one && tank_two) split_gases() - valve_open = 0 + valve_open = FALSE update_icon() + + +/obj/item/transfer_valve/proc/toggle_process() + for(var/i in 1 to 5) + update_icon() + sleep(1 SECONDS) + update_icon() + diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 32341ad3b27..7d369dbb619 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -246,7 +246,8 @@ GLOBAL_LIST_EMPTY(world_uplinks) "age" = html_encode(L.fields["age"]), "species" = html_encode(L.fields["species"]), "rank" = html_encode(L.fields["rank"]), - "fingerprint" = html_encode(L.fields["fingerprint"]) + "fingerprint" = html_encode(L.fields["fingerprint"]), + "exploit_record" = html_encode(L.fields["exploit_record"]), )) data["exploitable"] = exploitable diff --git a/code/game/objects/items/devices/window_painter.dm b/code/game/objects/items/devices/window_painter.dm index a44f0d13a09..8aa104f4cd8 100644 --- a/code/game/objects/items/devices/window_painter.dm +++ b/code/game/objects/items/devices/window_painter.dm @@ -11,9 +11,10 @@ /obj/structure/window/full/basic, /obj/machinery/door/window) -/obj/item/pipe_painter/window_painter/New() + +/obj/item/pipe_painter/window_painter/Initialize(mapload) . = ..() - update_icon() + update_icon(UPDATE_OVERLAYS) mode = "paint" @@ -25,11 +26,12 @@ if("Choose Color") mode = "paint" colour = input(user,"Choose Color") as color - update_icon() + update_icon(UPDATE_OVERLAYS) if("Color Presets") mode = "paint" colour = input("Which color do you want to use?", name, colour) in GLOB.pipe_colors - update_icon() + update_icon(UPDATE_OVERLAYS) + /obj/item/pipe_painter/window_painter/afterattack(atom/A, mob/user as mob) if(!is_type_in_list(A, paintable_windows) || !in_range(user, A)) @@ -43,10 +45,10 @@ colour = W.color mode = "paint" to_chat(user, span_notice("You copy color of this window.")) - update_icon() + update_icon(UPDATE_OVERLAYS) + + +/obj/item/pipe_painter/window_painter/update_overlays() + . = ..() + . += mutable_appearance(icon, icon_state = "window_painter_colour", color = colour) -/obj/item/pipe_painter/window_painter/update_icon() - overlays.Cut() - var/image/colour_image = image('icons/obj/device.dmi', "window_painter_colour") - colour_image.color = colour - overlays += colour_image diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index acbd3fc6722..6e1d9a05e4d 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -9,6 +9,7 @@ w_class = WEIGHT_CLASS_BULKY max_integrity = 40 resistance_flags = FLAMMABLE + custom_fire_overlay = "fire" var/rolled = FALSE /obj/item/flag/attackby(obj/item/W, mob/user, params) @@ -20,36 +21,34 @@ /obj/item/flag/attack_self(mob/user) rolled = !rolled user.visible_message("[user] [rolled ? "rolls up" : "unfurls"] [src].", "You [rolled ? "roll up" : "unfurl"] [src].", "You hear fabric rustling.") - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/flag/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = FALSE) ..() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/flag/extinguish() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/item/flag/update_icon() - overlays.Cut() + +/obj/item/flag/update_icon_state() updateFlagIcon() item_state = icon_state if(rolled) icon_state = "[icon_state]_rolled" + custom_fire_overlay = "fire_rolled" + else + custom_fire_overlay = initial(custom_fire_overlay) if(resistance_flags & ON_FIRE) item_state = "[item_state]_fire" - if((resistance_flags & ON_FIRE) && rolled) - overlays += image('icons/obj/flag.dmi', src , "fire_rolled") - else if((resistance_flags & ON_FIRE) && !rolled) - overlays += image('icons/obj/flag.dmi', src , "fire") - if(ismob(loc)) - var/mob/M = loc - M.update_inv_r_hand() - M.update_inv_l_hand() + update_equipped_item() + /obj/item/flag/proc/updateFlagIcon() icon_state = initial(icon_state) + /obj/item/flag/nt name = "Nanotrasen flag" desc = "A flag proudly boasting the logo of NT." @@ -219,9 +218,16 @@ var/obj/item/grenade/boobytrap = null var/mob/trapper = null -/obj/item/flag/chameleon/New() + +/obj/item/flag/chameleon/Initialize(mapload) updated_icon_state = icon_state - ..() + . = ..() + + +/obj/item/flag/chameleon/Destroy() + QDEL_NULL(boobytrap) + return ..() + /obj/item/flag/chameleon/attack_self(mob/user) if(used) diff --git a/code/game/objects/items/hourglass.dm b/code/game/objects/items/hourglass.dm index 0dc486cc5c2..410b6efd85c 100644 --- a/code/game/objects/items/hourglass.dm +++ b/code/game/objects/items/hourglass.dm @@ -29,9 +29,10 @@ to_chat(user,span_notice("You stop the [src].")) //Sand magically flows back because that's more convinient to use. stop() -/obj/item/hourglass/update_icon() + +/obj/item/hourglass/update_icon_state() icon_state = "hourglass_[timing_id ? "active" : "idle"]" - return ..() + /obj/item/hourglass/proc/start() finish_time = world.time + time @@ -52,7 +53,7 @@ countdown.stop() finish_time = null animate(src) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/hourglass/proc/finish() visible_message(span_notice("[src] stops.")) diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm index a4e60ce16e0..ebe0f80f87a 100644 --- a/code/game/objects/items/misc.dm +++ b/code/game/objects/items/misc.dm @@ -15,7 +15,7 @@ name = "beach ball" item_state = "beachball" density = 0 - anchored = 0 + anchored = FALSE w_class = WEIGHT_CLASS_TINY force = 0.0 throwforce = 0.0 diff --git a/code/game/objects/items/mixing_bowl.dm b/code/game/objects/items/mixing_bowl.dm index 8eed9480fb6..c29b18236f0 100644 --- a/code/game/objects/items/mixing_bowl.dm +++ b/code/game/objects/items/mixing_bowl.dm @@ -155,12 +155,12 @@ if(prob(chance)) dirty = TRUE flags = null - icon_state = dirty_icon + update_icon(UPDATE_ICON_STATE) /obj/item/mixing_bowl/proc/clean() dirty = FALSE flags = OPENCONTAINER - icon_state = clean_icon + update_icon(UPDATE_ICON_STATE) /obj/item/mixing_bowl/wash(mob/user, atom/source) if(..()) @@ -187,3 +187,8 @@ ffuu.reagents.add_reagent("carbon", amount) ffuu.reagents.add_reagent("????", amount/10) make_dirty(75) + + +/obj/item/mixing_bowl/update_icon_state() + icon_state = dirty ? dirty_icon : clean_icon + diff --git a/code/game/objects/items/mountable_frames/frames.dm b/code/game/objects/items/mountable_frames/frames.dm index 179684139fc..66b185f4148 100644 --- a/code/game/objects/items/mountable_frames/frames.dm +++ b/code/game/objects/items/mountable_frames/frames.dm @@ -9,7 +9,7 @@ /obj/item/mounted/frame/attackby(obj/item/W, mob/user) ..() - if(istype(W, /obj/item/wrench) && sheets_refunded) + if(W.tool_behaviour == TOOL_WRENCH && sheets_refunded) new /obj/item/stack/sheet/metal(get_turf(src), sheets_refunded) qdel(src) diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm index 3b9caa6fed6..5fa73f398c7 100644 --- a/code/game/objects/items/random_items.dm +++ b/code/game/objects/items/random_items.dm @@ -31,7 +31,16 @@ /obj/item/stack/sheet/animalhide/random/New() ..() - var/htype = pick(/obj/item/stack/sheet/animalhide/cat,/obj/item/stack/sheet/animalhide/corgi,/obj/item/stack/sheet/animalhide/human,/obj/item/stack/sheet/animalhide/lizard,/obj/item/stack/sheet/animalhide/monkey) + var/htype = pick(/obj/item/stack/sheet/animalhide/cat, \ + /obj/item/stack/sheet/animalhide/corgi, \ + /obj/item/stack/sheet/animalhide/human, \ + /obj/item/stack/sheet/animalhide/lizard, \ + /obj/item/stack/sheet/animalhide/monkey, \ + /obj/item/stack/sheet/animalhide/wolpin, \ + /obj/item/stack/sheet/animalhide/stok, \ + /obj/item/stack/sheet/animalhide/neara, \ + /obj/item/stack/sheet/animalhide/farwa \ + ) new htype(loc, amount) qdel(src) @@ -200,7 +209,7 @@ /obj/structure/closet/crate/bin/flowers name = "flower barrel" desc = "A bin full of fresh flowers for the bereaved." - anchored = 0 + anchored = FALSE New() while(contents.len < 10) var/flowertype = pick(/obj/item/grown/sunflower,/obj/item/grown/novaflower,/obj/item/reagent_containers/food/snacks/grown/poppy, @@ -212,7 +221,7 @@ /obj/structure/closet/crate/bin/plants name = "plant barrel" desc = "Caution: Contents may contain vitamins and minerals. It is recommended that you deep fry them before eating." - anchored = 0 + anchored = FALSE New() while(contents.len < 10) var/ptype = pick(/obj/item/reagent_containers/food/snacks/grown/apple,/obj/item/reagent_containers/food/snacks/grown/banana, @@ -262,7 +271,7 @@ desc = "What could it be?" /obj/structure/largecrate/evil/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) + if(W.tool_behaviour == TOOL_CROWBAR) var/list/menace = pick( /mob/living/simple_animal/hostile/carp,/mob/living/simple_animal/hostile/faithless,/mob/living/simple_animal/hostile/pirate, /mob/living/simple_animal/hostile/creature,/mob/living/simple_animal/hostile/pirate/ranged, /mob/living/simple_animal/hostile/hivebot,/mob/living/simple_animal/hostile/viscerator,/mob/living/simple_animal/hostile/pirate) @@ -294,7 +303,7 @@ desc = "What happens if you open it?" /obj/structure/largecrate/schrodinger/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) + if(W.tool_behaviour == TOOL_CROWBAR) add_fingerprint(user) sleep(2) var/mob/living/simple_animal/pet/cat/Cat = new(loc) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index caf8c3b9b69..2bf19296d14 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -204,7 +204,7 @@ else to_chat(user, "You need to attach a flash to it first!") - if(istype(W, /obj/item/multitool)) + if(W.tool_behaviour == TOOL_MULTITOOL) if(check_completion()) Interact(user) else @@ -366,7 +366,7 @@ if(living_user.lying || living_user.stat || living_user.IsStunned() || !Adjacent(living_user)) return var/obj/item/item_in_hand = living_user.get_active_hand() - if(!istype(item_in_hand, /obj/item/multitool)) + if(item_in_hand.tool_behaviour != TOOL_MULTITOOL) to_chat(living_user, "You need a multitool!") return diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 002f9898c18..ded789270b3 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -46,12 +46,10 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ . = ..() recipes = GLOB.rod_recipes -/obj/item/stack/rods/update_icon() +/obj/item/stack/rods/update_icon_state() var/amount = get_amount() - if((amount <= 5) && (amount > 0)) - icon_state = "rods-[amount]" - else - icon_state = "rods" + icon_state = "rods-[clamp(amount, 1, 5)]" + /obj/item/stack/rods/welder_act(mob/user, obj/item/I) if(get_amount() < 2) @@ -79,8 +77,8 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ is_cyborg = 1 cyborg_construction_stack = /obj/item/stack/rods -/obj/item/stack/rods/cyborg/update_icon() - return +/obj/item/stack/rods/cyborg/update_icon_state() + return // icon_state should always be a full stack of rods. /obj/item/stack/fireproof_rods name = "fireproof rods" @@ -103,13 +101,12 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ toolspeed = 1 usesound = 'sound/items/deconstruct.ogg' + /obj/item/stack/fireproof_rods/twentyfive amount = 25 -/obj/item/stack/fireproof_rods/update_icon() + +/obj/item/stack/fireproof_rods/update_icon_state() var/amount = get_amount() - if((amount <= 5) && (amount > 0)) - icon_state = "f_rods-[amount]" - else - icon_state = "f_rods" + icon_state = "f_rods-[clamp(amount, 1, 5)]" diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index a7401ef97ee..6dde09bc9d8 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -42,6 +42,30 @@ GLOBAL_LIST_INIT(human_recipes, list( \ singular_name = "monkey hide piece" icon_state = "sheet-monkey" +/obj/item/stack/sheet/animalhide/wolpin + name = "wolpin hide" + desc = "The by-product of wolpin farming." + singular_name = "wolpin hide piece" + icon_state = "sheet-wolpin" + +/obj/item/stack/sheet/animalhide/stok + name = "stok hide" + desc = "The by-product of stok farming." + singular_name = "stok hide piece" + icon_state = "sheet-lizzard" + +/obj/item/stack/sheet/animalhide/neara + name = "neara hide" + desc = "The by-product of neara farming." + singular_name = "neara hide piece" + icon_state = "sheet-neara" + +/obj/item/stack/sheet/animalhide/farwa + name = "farwa hide" + desc = "The by-product of farwa farming." + singular_name = "farwa hide piece" + icon_state = "sheet-farwa" + /obj/item/stack/sheet/animalhide/lizard name = "lizard skin" desc = "Sssssss..." @@ -168,17 +192,18 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ /obj/item/clothing/head/hooded/explorer, /obj/item/clothing/head/helmet/space/plasmaman/mining, )) + /obj/item/stack/sheet/animalhide/goliath_hide/afterattack(atom/target, mob/user, proximity_flag) if(!proximity_flag) return - if(is_type_in_typecache(target, goliath_platable_armor_typecache) || is_type_in_typecache(target, goliath_platable_armor_with_icon_typecache)) + var/platable_armor_with_icon = is_type_in_typecache(target, goliath_platable_armor_with_icon_typecache) + if(is_type_in_typecache(target, goliath_platable_armor_typecache) || platable_armor_with_icon) var/obj/item/clothing/C = target var/datum/armor/current_armor = C.armor - - if(current_armor.getRating("melee") < 60) - C.armor = current_armor.setRating(melee_value = min(current_armor.getRating("melee") + 10, 60)) - if(is_type_in_typecache(target, goliath_platable_armor_with_icon_typecache)) - switch(C.armor.getRating("melee")) + if(current_armor.getRating(MELEE) < 60) + C.armor = current_armor.setRating(melee_value = min(current_armor.getRating(MELEE) + 10, 60)) + if(platable_armor_with_icon) + switch(C.armor.getRating(MELEE)) if(40, 50) C.icon_state = "[initial(C.icon_state)]_reinf" C.item_color = "[initial(C.item_color)]_reinf" @@ -200,11 +225,11 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ var/obj/mecha/working/ripley/D = target if(D.hides < 3) D.hides++ - D.armor = D.armor.setRating(melee_value = min(D.armor.getRating("melee") + 10, 70)) - D.armor = D.armor.setRating(bullet_value = min(D.armor.getRating("bullet") + 5, 50)) - D.armor = D.armor.setRating(laser_value = min(D.armor.getRating("laser") + 5, 50)) + D.armor = D.armor.setRating(melee_value = min(D.armor.getRating(MELEE) + 10, 70)) + D.armor = D.armor.setRating(bullet_value = min(D.armor.getRating(BULLET) + 5, 50)) + D.armor = D.armor.setRating(laser_value = min(D.armor.getRating(LASER) + 5, 50)) to_chat(user, "You strengthen [target], improving its resistance against melee attacks.") - D.update_icon() + D.update_appearance(UPDATE_DESC|UPDATE_OVERLAYS) use(1) else to_chat(user, "You can't improve [D] any further!") @@ -230,7 +255,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ D.armor = D.armor.setRating(bullet_value = min(D.armor.getRating("bullet") + 5, 50)) D.armor = D.armor.setRating(laser_value = min(D.armor.getRating("laser") + 5, 50)) to_chat(user, "Вы нашли куда суется [name] и пихнули её на экзокостюм, усиливая защиту против атак.") - D.update_icon() + D.update_appearance(UPDATE_DESC|UPDATE_OVERLAYS) use(1) else to_chat(user, "Вы больше не можете найти куда [name] пристраивается!") diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 0c035c6161b..e735f797078 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -275,6 +275,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list( new /datum/stack_recipe("Bio bag", /obj/item/storage/bag/bio, 4), new /datum/stack_recipe("Book bag", /obj/item/storage/bag/books, 4), new /datum/stack_recipe("Chemistry bag", /obj/item/storage/bag/chemistry, 4), + new /datum/stack_recipe("Construction bag", /obj/item/storage/bag/construction, 4), new /datum/stack_recipe("Fish bag", /obj/item/storage/bag/fish, 4), new /datum/stack_recipe("Mining satchel", /obj/item/storage/bag/ore, 4), new /datum/stack_recipe("Plant bag", /obj/item/storage/bag/plants, 4), diff --git a/code/game/objects/items/stacks/stack_recipe.dm b/code/game/objects/items/stacks/stack_recipe.dm index 3a5f5ba019a..47061ddc8c1 100644 --- a/code/game/objects/items/stacks/stack_recipe.dm +++ b/code/game/objects/items/stacks/stack_recipe.dm @@ -37,25 +37,7 @@ /datum/stack_recipe/cable_restraints/post_build(obj/item/stack/S, obj/result) var/obj/item/restraints/handcuffs/cable/cable_restraints = result if(istype(cable_restraints)) - var/color = "white" - - switch(S.color) - if(WIRE_COLOR_BLUE) - color = "blue" - if(WIRE_COLOR_CYAN) - color = "cyan" - if(WIRE_COLOR_GREEN) - color = "green" - if(WIRE_COLOR_ORANGE) - color = "orange" - if(WIRE_COLOR_PINK) - color = "pink" - if(WIRE_COLOR_RED) - color = "red" - if(WIRE_COLOR_YELLOW) - color = "yellow" - - cable_restraints.icon_state = "cuff_[color]" + cable_restraints.cable_color(S.color) ..() diff --git a/code/game/objects/items/theft_items.dm b/code/game/objects/items/theft_items.dm index 898ceb055b5..3c0f7d84752 100644 --- a/code/game/objects/items/theft_items.dm +++ b/code/game/objects/items/theft_items.dm @@ -82,6 +82,17 @@ else // Not cracked or dented. . += "Fine print on the box reads \"Cybersun Industries secure container, guaranteed thermite proof, assistant proof, and explosive resistant.\"" + +/obj/item/nuke_core_container/update_icon_state() + if(sealed) + icon_state = "core_container_sealed" + return + if(core) + icon_state = cracked ? "core_container_cracked_loaded" : "core_container_loaded" + else + icon_state = cracked ? "core_container_cracked_empty" : "core_container_empty" + + /obj/item/nuke_core_container/attack_hand(mob/user) if(cracked && core) unload(user) @@ -93,7 +104,7 @@ return new_core.forceMove(src) core = new_core - icon_state = "core_container_loaded" + update_icon(UPDATE_ICON_STATE) to_chat(user, "Container is sealing...") addtimer(CALLBACK(src, PROC_REF(seal)), 10 SECONDS) @@ -101,14 +112,14 @@ core.add_fingerprint(user) user.put_in_active_hand(core) core = null - icon_state = "core_container_cracked_empty" + update_icon(UPDATE_ICON_STATE) /obj/item/nuke_core_container/proc/seal() if(!QDELETED(core)) STOP_PROCESSING(SSobj, core) ADD_TRAIT(core, TRAIT_BLOCK_RADIATION, src) - icon_state = "core_container_sealed" sealed = TRUE + update_icon(UPDATE_ICON_STATE) playsound(src, 'sound/items/deconstruct.ogg', 60, TRUE) if(ismob(loc)) to_chat(loc, "[src] is permanently sealed, [core]'s radiation is contained.") @@ -116,7 +127,6 @@ /obj/item/nuke_core_container/attackby(obj/item/nuke_core/plutonium/core, mob/user) if(!istype(core) || cracked) return ..() - if(!user.drop_item_ground(core)) to_chat(user, "[core] is stuck to your hand!") return @@ -128,11 +138,8 @@ if(core) START_PROCESSING(SSobj, core) REMOVE_TRAIT(core, TRAIT_BLOCK_RADIATION, src) - icon_state = "core_container_cracked_loaded" - else - icon_state = "core_container_cracked_empty" - icon_state = "core_container_cracked_empty" cracked = TRUE + update_icon(UPDATE_ICON_STATE) /obj/item/paper/guides/antag/nuke_instructions info = "Как вскрыть ядерную боеголовку Нанотрейзен и вытащить из нее плутониевое ядро:
\ @@ -182,8 +189,8 @@ return FALSE forceMove(tongs) tongs.sliver = src - tongs.icon_state = "supermatter_tongs_loaded" - tongs.item_state = "supermatter_tongs_loaded" + tongs.update_icon(UPDATE_ICON_STATE) + to_chat(user, "You carefully pick up [src] with [tongs].") else if(istype(I, /obj/item/scalpel/supermatter) || istype(I, /obj/item/nuke_core_container/supermatter)) // we don't want it to dust return @@ -243,15 +250,30 @@ QDEL_NULL(sliver) return ..() + +/obj/item/nuke_core_container/supermatter/update_name(updates = ALL) + . = ..() + name = cracked ? "broken supermatter bin" : initial(name) + + +/obj/item/nuke_core_container/supermatter/update_icon_state() + if(sealed) + icon_state = "supermatter_container_sealed" + return + if(sliver) + icon_state = cracked ? "core_container_cracked_loaded" : "core_container_loaded" + else + icon_state = "core_container_cracked_empty" + + /obj/item/nuke_core_container/supermatter/load(obj/item/retractor/supermatter/I, mob/user) if(!istype(I) || !I.sliver || sliver) return I.sliver.forceMove(src) sliver = I.sliver I.sliver = null - I.icon_state = "supermatter_tongs" - I.item_state = "supermatter_tongs" - icon_state = "supermatter_container_loaded" + I.update_icon(UPDATE_ICON_STATE) + update_icon(UPDATE_ICON_STATE) to_chat(user, "Container is sealing...") addtimer(CALLBACK(src, PROC_REF(seal)), 10 SECONDS) @@ -259,9 +281,9 @@ if(!QDELETED(sliver)) STOP_PROCESSING(SSobj, sliver) ADD_TRAIT(sliver, TRAIT_BLOCK_RADIATION, src) - icon_state = "supermatter_container_sealed" playsound(src, 'sound/items/deconstruct.ogg', 60, TRUE) sealed = TRUE + update_icon(UPDATE_ICON_STATE) if(ismob(loc)) to_chat(loc, "[src] is permanently sealed, [sliver] is safely contained.") @@ -271,9 +293,8 @@ sliver.forceMove(I) I.sliver = sliver sliver = null - I.icon_state = "supermatter_tongs_loaded" - I.item_state = "supermatter_tongs_loaded" - icon_state = "core_container_cracked_empty" + I.update_icon(UPDATE_ICON_STATE) + update_icon(UPDATE_ICON_STATE) to_chat(user, "You carefully pick up [I.sliver] with [I].") /obj/item/nuke_core_container/supermatter/attackby(obj/item/retractor/supermatter/tongs, mob/user) @@ -300,9 +321,8 @@ message_admins("[sliver] has consumed [key_name_admin(user)] [ADMIN_JMP(src)].") investigate_log("has consumed [key_name(user)].", "supermatter") user.gib() - icon_state = "core_container_cracked_empty" - qdel(sliver) - sliver = null + QDEL_NULL(sliver) + update_icon(UPDATE_ICON_STATE) else return ..() @@ -312,11 +332,8 @@ if(sliver) START_PROCESSING(SSobj, sliver) REMOVE_TRAIT(sliver, TRAIT_BLOCK_RADIATION, src) - icon_state = "supermatter_container_cracked_loaded" - else - icon_state = "core_container_cracked_empty" - name = "broken supermatter bin" cracked = TRUE + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) /obj/item/scalpel/supermatter name = "supermatter scalpel" @@ -348,6 +365,12 @@ QDEL_NULL(sliver) return ..() + +/obj/item/retractor/supermatter/update_icon_state() + icon_state = "supermatter_tongs[sliver ? "_loaded" : ""]" + item_state = "supermatter_tongs[sliver ? "_loaded" : ""]" + + /obj/item/retractor/supermatter/afterattack(atom/O, mob/user, proximity) . = ..() if(!sliver) @@ -360,8 +383,7 @@ sliver.forceMove(loc) visible_message("[sliver] falls out of [src] as it hits the ground.") sliver = null - icon_state = "supermatter_tongs" - item_state = "supermatter_tongs" + update_icon(UPDATE_ICON_STATE) return ..() /obj/item/retractor/supermatter/proc/Consume(atom/movable/AM, mob/living/user) @@ -393,5 +415,5 @@ L.apply_effect(60, IRRADIATE) playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE) QDEL_NULL(sliver) - icon_state = "supermatter_tongs" - item_state = "supermatter_tongs" + update_icon(UPDATE_ICON_STATE) + diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm index c02177c1463..db562b1d1b9 100644 --- a/code/game/objects/items/tools/multitool.dm +++ b/code/game/objects/items/tools/multitool.dm @@ -74,12 +74,17 @@ STOP_PROCESSING(SSobj, src) return ..() + +/obj/item/multitool/ai_detect/update_icon_state() + icon_state = "[initial(icon_state)][detect_state]" + + /obj/item/multitool/ai_detect/process() if(track_cooldown > world.time) return detect_state = PROXIMITY_NONE multitool_detect() - icon_state = "[initial(icon_state)][detect_state]" + update_icon(UPDATE_ICON_STATE) track_cooldown = world.time + track_delay /obj/item/multitool/ai_detect/proc/multitool_detect() @@ -91,16 +96,19 @@ if(!detect_state && GLOB.cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z)) var/datum/camerachunk/chunk = GLOB.cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z) - if(chunk) - if(chunk.seenby.len) - for(var/mob/camera/aiEye/A in chunk.seenby) - var/turf/detect_turf = get_turf(A) - if(get_dist(our_turf, detect_turf) < rangealert) - detect_state = PROXIMITY_ON_SCREEN - break - if(get_dist(our_turf, detect_turf) < rangewarning) - detect_state = PROXIMITY_NEAR - break + if(!chunk) + return + for(var/mob/camera/aiEye/A in chunk.seenby) + //Checks if the A is to be detected or not + if(!A.ai_detector_visible) + continue + var/turf/detect_turf = get_turf(A) + if(get_dist(our_turf, detect_turf) < rangealert) + detect_state = PROXIMITY_ON_SCREEN + break + if(get_dist(our_turf, detect_turf) < rangewarning) + detect_state = PROXIMITY_NEAR + break /obj/item/multitool/ai_detect/admin desc = "Used for pulsing wires to test which to cut. Not recommended by doctors. Has a strange tag that says 'Grief in Safety'" //What else should I say for a meme item? diff --git a/code/game/objects/items/tools/tool_behaviour.dm b/code/game/objects/items/tools/tool_behaviour.dm index b68de693855..c0afaafb462 100644 --- a/code/game/objects/items/tools/tool_behaviour.dm +++ b/code/game/objects/items/tools/tool_behaviour.dm @@ -43,7 +43,7 @@ return tool_use_check(user, amount) // A check called by tool_start_check once, and by use_tool on every tick of delay. -/obj/item/proc/tool_use_check(mob/living/user, amount) +/obj/item/proc/tool_use_check(mob/living/user, amount, silent = FALSE) return !amount /obj/item/proc/play_tool_sound(atom/target, volume = tool_volume) diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm index 2e75f52fbdf..7fcc4f70406 100644 --- a/code/game/objects/items/tools/welder.dm +++ b/code/game/objects/items/tools/welder.dm @@ -115,14 +115,16 @@ M.update_inv_l_hand() // If welding tool ran out of fuel during a construction task, construction fails. -/obj/item/weldingtool/tool_use_check(mob/living/user, amount) +/obj/item/weldingtool/tool_use_check(mob/living/user, amount, silent = FALSE) if(!tool_enabled) - to_chat(user, "[src] has to be on to complete this task!") + if(!silent) + to_chat(user, "[src] has to be on to complete this task!") return FALSE if(GET_FUEL >= amount * requires_fuel) return TRUE else - to_chat(user, "You need more welding fuel to complete this task!") + if(!silent) + to_chat(user, "You need more welding fuel to complete this task!") return FALSE // When welding is about to start, run a normal tool_use_check, then flash a mob if it succeeds. @@ -174,15 +176,8 @@ else to_chat(user, "There's not enough fuel in [A] to refuel [src]!") -/obj/item/weldingtool/proc/update_torch() - overlays.Cut() - if(tool_enabled) - overlays += "[initial(icon_state)]-on" - item_state = "[initial(item_state)]1" - else - item_state = "[initial(item_state)]" -/obj/item/weldingtool/update_icon() +/obj/item/weldingtool/update_icon_state() if(low_fuel_changes_icon) var/ratio = GET_FUEL / maximum_fuel ratio = CEILING(ratio*4, 1) * 25 @@ -190,8 +185,16 @@ icon_state = initial(icon_state) else icon_state = "[initial(icon_state)][ratio]" - update_torch() - ..() + if(tool_enabled) + item_state = "[initial(item_state)]1" + else + item_state = "[initial(item_state)]" + + +/obj/item/weldingtool/update_overlays() + . = ..() + if(tool_enabled) + . += "[initial(icon_state)]-on" /obj/item/weldingtool/largetank diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index b9b13cbc6cc..77db10a3288 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -53,13 +53,16 @@ icon_state = "waterballoon-e" item_state = "waterballoon-e" + /obj/item/toy/balloon/New() ..() create_reagents(10) + /obj/item/toy/balloon/attack(mob/living/carbon/human/M as mob, mob/user as mob) return + /obj/item/toy/balloon/afterattack(atom/A, mob/user, proximity) if(!proximity) return @@ -73,17 +76,18 @@ A.reagents.trans_to(src, 10) to_chat(user, "You fill the balloon with the contents of [A].") desc = "A translucent balloon with some form of liquid sloshing around in it." - update_icon() + update_icon(UPDATE_ICON_STATE) + /obj/item/toy/balloon/wash(mob/user, atom/source) if(reagents.total_volume < 10) reagents.add_reagent("water", min(10-reagents.total_volume, 10)) to_chat(user, "You fill the balloon from the [source].") desc = "A translucent balloon with some form of liquid sloshing around in it." - update_icon() - return + update_icon(UPDATE_ICON_STATE) + -/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob, params) +/obj/item/toy/balloon/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks/drinkingglass)) if(O.reagents) if(O.reagents.total_volume < 1) @@ -97,8 +101,8 @@ desc = "A translucent balloon with some form of liquid sloshing around in it." to_chat(user, "You fill the balloon with the contents of [O].") O.reagents.trans_to(src, 10) - update_icon() - return + update_icon(UPDATE_ICON_STATE) + /obj/item/toy/balloon/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) if(reagents.total_volume >= 1) @@ -110,16 +114,17 @@ spawn(5) if(src) qdel(src) - return -/obj/item/toy/balloon/update_icon() - if(src.reagents.total_volume >= 1) + +/obj/item/toy/balloon/update_icon_state() + if(reagents.total_volume >= 1) icon_state = "waterballoon" item_state = "waterballoon" else icon_state = "waterballoon-e" item_state = "waterballoon-e" + /obj/item/toy/syndicateballoon name = "syndicate balloon" desc = "There is a tag on the back that reads \"FUK NT!11!\"." @@ -420,12 +425,6 @@ desc = "Mini-Mecha action figure! Collect them all! 11/11. This one is the mysterious Phazon combat mecha! Nobody's safe!" icon_state = "phazonprize" - - -/* -|| A Deck of Cards for playing various games of chance || -*/ - /obj/item/toy/nuke name = "\improper Nuclear Fission Explosive toy" desc = "A plastic model of a Nuclear Fission Explosive." @@ -433,22 +432,41 @@ icon_state = "nuketoyidle" w_class = WEIGHT_CLASS_SMALL var/cooldown = 0 + var/animation_stage = 0 + + +/obj/item/toy/nuke/update_icon_state() + switch(animation_stage) + if(1) + icon_state = "nuketoy" + if(2) + icon_state = "nuketoycool" + else + icon_state = initial(icon_state) + /obj/item/toy/nuke/attack_self(mob/user) if(cooldown < world.time) - cooldown = world.time + 1800 //3 minutes + cooldown = world.time + 3 MINUTES user.visible_message("[user] presses a button on [src]", "You activate [src], it plays a loud noise!", "You hear the click of a button.") - spawn(5) //gia said so - icon_state = "nuketoy" - playsound(src, 'sound/machines/alarm.ogg', 100, 0, 0) - sleep(135) - icon_state = "nuketoycool" - sleep(cooldown - world.time) - icon_state = "nuketoyidle" + INVOKE_ASYNC(src, PROC_REF(async_animation)) else var/timeleft = (cooldown - world.time) to_chat(user, "Nothing happens, and '[round(timeleft/10)]' appears on a small display.") + +/obj/item/toy/nuke/proc/async_animation() + animation_stage++ + update_icon(UPDATE_ICON_STATE) + playsound(src, 'sound/machines/alarm.ogg', 100, FALSE, 0) + sleep(13 SECONDS) + animation_stage++ + update_icon(UPDATE_ICON_STATE) + sleep(cooldown - world.time) + animation_stage = 0 + update_icon(UPDATE_ICON_STATE) + + /obj/item/toy/therapy name = "therapy doll" desc = "A toy for therapeutic and recreational purposes." @@ -949,25 +967,39 @@ icon_state = "ninja_plushie_green" item_state = "ninja_plushie_green" var/cooldown = 0 + var/plushie_color + + +/obj/item/toy/plushie/ninja/update_icon_state() + switch(plushie_color) + if("green") + icon_state = "ninja_plushie_green" + item_state = "ninja_plushie_green" + if("blue") + icon_state = "ninja_plushie_blue" + item_state = "ninja_plushie_blue" + if("red") + icon_state = "ninja_plushie_red" + item_state = "ninja_plushie_red" + else + icon_state = initial(icon_state) + item_state = initial(item_state) + /obj/item/toy/plushie/ninja/attack_self(mob/user as mob) . = ..() if(cooldown < world.time) cooldown = (world.time + 30) //3 second cooldown var/plushie_color = pick("green","blue","red") - switch (plushie_color) + update_icon(UPDATE_ICON_STATE) + switch(plushie_color) if("green") - icon_state = "ninja_plushie_green" - item_state = "ninja_plushie_green" user.visible_message(span_notice("[bicon(src)] The [name] says \"I am not afraid of the darkness! I am the darkness!\"")) if("blue") - icon_state = "ninja_plushie_blue" - item_state = "ninja_plushie_blue" user.visible_message(span_notice("[bicon(src)] The [name] says \"Your simple light won't stop me!\"")) if("red") - icon_state = "ninja_plushie_red" - item_state = "ninja_plushie_red" user.visible_message(span_notice("[bicon(src)] The [name] says \"You can run, but you can't hide!\"")) + plushie_color = null //New toys from another builds /obj/item/toy/plushie/nianplushie/beeplushie @@ -1038,9 +1070,6 @@ /obj/item/toy/plushie/blahaj/twohanded/Initialize(mapload) . = ..() - apply_twohanded_component() - -/obj/item/toy/plushie/blahaj/twohanded/proc/apply_twohanded_component() AddComponent(/datum/component/two_handed, require_twohands = TRUE) /obj/item/toy/plushie/blahaj/twohanded/attack_self(mob/user) @@ -1175,13 +1204,13 @@ desc = "Watch out for angry voxes!" -/obj/item/toy/plushie/pig/MouseDrop(atom/over) +/obj/item/toy/plushie/pig/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) . = ..() if(!.) return FALSE var/mob/user = usr - if(over != user || user.incapacitated() || !ishuman(user)) + if(over_object != user || user.incapacitated() || !ishuman(user)) return FALSE if(user.put_in_hands(src, ignore_anim = FALSE)) @@ -1541,22 +1570,33 @@ w_class = WEIGHT_CLASS_SMALL bubble_icon = "alien" var/cooldown = 0 + var/animating = FALSE + + +/obj/item/toy/toy_xeno/update_icon_state() + icon_state = animating ? "[initial(icon_state)]_used" : initial(icon_state) + /obj/item/toy/toy_xeno/attack_self(mob/user) if(cooldown <= world.time) cooldown = (world.time + 50) //5 second cooldown user.visible_message("[user] pulls back the string on [src].") - icon_state = "[initial(icon_state)]_used" - sleep(5) - atom_say("Hiss!") - var/list/possible_sounds = list('sound/voice/hiss1.ogg', 'sound/voice/hiss2.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss4.ogg') - playsound(get_turf(src), pick(possible_sounds), 50, 1) - spawn(45) - if(src) - icon_state = "[initial(icon_state)]" + INVOKE_ASYNC(src, PROC_REF(async_animation)) else to_chat(user, "The string on [src] hasn't rewound all the way!") - return + + +/obj/item/toy/toy_xeno/proc/async_animation() + animating = TRUE + update_icon(UPDATE_ICON_STATE) + sleep(0.5 SECONDS) + atom_say("Hiss!") + var/list/possible_sounds = list('sound/voice/hiss1.ogg', 'sound/voice/hiss2.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss4.ogg') + playsound(get_turf(src), pick(possible_sounds), 50, TRUE) + sleep(4.5 SECONDS) + animating = FALSE + update_icon(UPDATE_ICON_STATE) + /obj/item/toy/russian_revolver name = "russian revolver" @@ -1669,11 +1709,8 @@ wieldsound = 'sound/weapons/chainsawstart.ogg' attack_verb = list("sawed", "cut", "hacked", "carved", "cleaved", "butchered", "felled", "timbered") -/obj/item/twohanded/toy/chainsaw/update_icon() - if(wielded) - icon_state = "chainsaw[wielded]" - else - icon_state = "chainsaw0" +/obj/item/twohanded/toy/chainsaw/update_icon_state() + icon_state = "chainsaw[HAS_TRAIT(src, TRAIT_WIELDED)]" /* * Cat Toy @@ -1994,7 +2031,7 @@ var/on = 0 var/activation_sound = 'sound/items/buttonclick.ogg' -/obj/item/toy/desk/update_icon() +/obj/item/toy/desk/update_icon_state() if(on) icon_state = "[initial(icon_state)]-on" else @@ -2004,8 +2041,8 @@ on = !on if(activation_sound) playsound(src.loc, activation_sound, 75, 1) - update_icon() - return 1 + update_icon(UPDATE_ICON_STATE) + return TRUE /obj/item/toy/desk/verb/rotate() set name = "Rotate" @@ -2046,7 +2083,7 @@ /obj/item/toy/desk/newtoncradle/attack_self(mob/user) on = !on - update_icon() + update_icon(UPDATE_ICON_STATE) if(on) soundloop.start() else @@ -2064,7 +2101,7 @@ /obj/item/toy/desk/fan/attack_self(mob/user) on = !on - update_icon() + update_icon(UPDATE_ICON_STATE) if(on) soundloop.start() else diff --git a/code/game/objects/items/weapons/RCL.dm b/code/game/objects/items/weapons/RCL.dm index 48d606cabc7..08cdb091a93 100644 --- a/code/game/objects/items/weapons/RCL.dm +++ b/code/game/objects/items/weapons/RCL.dm @@ -34,7 +34,7 @@ loaded.amount = amount else return - update_icon() + update_icon(UPDATE_ICON_STATE) to_chat(user, "You add the cables to the [src]. It now contains [loaded.amount].") else ..() @@ -58,7 +58,7 @@ loaded.forceMove(user.loc) user.put_in_hands(loaded) loaded = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/twohanded/rcl/examine(mob/user) . = ..() @@ -71,7 +71,8 @@ active = 0 return ..() -/obj/item/twohanded/rcl/update_icon() + +/obj/item/twohanded/rcl/update_icon_state() if(!loaded) icon_state = "rcl-0" item_state = "rcl-0" @@ -89,10 +90,10 @@ else icon_state = "rcl-0" item_state = "rcl-0" - ..() + /obj/item/twohanded/rcl/proc/is_empty(mob/user, loud = 1) - update_icon() + update_icon(UPDATE_ICON_STATE) if(!loaded || !loaded.amount) if(loud) to_chat(user, "The last of the cables unreel from [src].") @@ -151,4 +152,4 @@ loaded = new() loaded.max_amount = max_amount loaded.amount = max_amount - update_icon() + update_icon(UPDATE_ICON_STATE) diff --git a/code/game/objects/items/weapons/RLF.dm b/code/game/objects/items/weapons/RLF.dm index ff64326c076..8155d560e77 100644 --- a/code/game/objects/items/weapons/RLF.dm +++ b/code/game/objects/items/weapons/RLF.dm @@ -10,7 +10,7 @@ RLF icon_state = "rlf" opacity = 0 density = 0 - anchored = 0.0 + anchored = FALSE armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index f28abbee5e6..747976d1fe6 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -11,7 +11,7 @@ RSF icon_state = "rsf" opacity = 0 density = 0 - anchored = 0.0 + anchored = FALSE var/matter = 0 var/mode = 1 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) @@ -31,7 +31,7 @@ RSF list("Deck of cards", 50, /obj/item/deck/cards), list("Prize ticket", 250, /obj/item/stack/tickets/five) ) - update_desc() + update_appearance(UPDATE_DESC) /obj/item/rsf/rff name = "\improper Rapid-Food-Fabricator" @@ -50,7 +50,7 @@ RSF list("Chimichanga", 3000, /obj/item/reagent_containers/food/snacks/chimichanga), list("Ikura sushi", 3000, /obj/item/reagent_containers/food/snacks/sushi_Ikura) ) - update_desc() + update_appearance(UPDATE_DESC) /obj/item/rsf/attackby(obj/item/W as obj, mob/user as mob, params) ..() @@ -72,9 +72,9 @@ RSF else mode++ to_chat(user, "Changed dispensing mode to '" + configured_items[mode][1] + "'") - update_desc() + update_appearance(UPDATE_DESC) -/obj/item/rsf/update_desc() +/obj/item/rsf/update_desc(updates = ALL) . = ..() desc = initial(desc) + " Currently set to dispense '[configured_items[mode][1]]'." diff --git a/code/game/objects/items/weapons/anomaly_extract.dm b/code/game/objects/items/weapons/anomaly_extract.dm index db8ce528f67..3ef0cf4d80d 100644 --- a/code/game/objects/items/weapons/anomaly_extract.dm +++ b/code/game/objects/items/weapons/anomaly_extract.dm @@ -1,3 +1,5 @@ +#define COOLDOWN_TO_SLIMEPERSON (10 SECONDS) +#define COOLDOWN_TO_SLIME_MOB (40 SECONDS) /obj/item/anomaly_extract name = "Strange syringe" desc = "Syringe with a blunt needle." @@ -41,7 +43,7 @@ sound = 'sound/effects/mob_effects/slime_squish.ogg' human_req = FALSE clothes_req = FALSE - base_cooldown = 1 MINUTES + base_cooldown = COOLDOWN_TO_SLIMEPERSON var/is_transformed = FALSE var/mob/living/carbon/human/original_body @@ -84,9 +86,9 @@ /obj/effect/proc_holder/spell/slime_degradation/before_cast(list/targets, mob/user) . = ..() if(is_transformed) - cooldown_handler.recharge_duration = 10 MINUTES + cooldown_handler.recharge_duration = COOLDOWN_TO_SLIME_MOB else - cooldown_handler.recharge_duration = 1 MINUTES + cooldown_handler.recharge_duration = COOLDOWN_TO_SLIMEPERSON /obj/effect/proc_holder/spell/slime_degradation/cast(list/targets, mob/living/carbon/human/user = usr) @@ -142,7 +144,7 @@ var/self_message = death_provoked ? span_userdanger("You can't take the strain of sustaining [user]'s shape in this condition, it begins to fall apart!") : span_notice("You start to transform back into human.") user.visible_message(span_warning("[user] shape becomes fuzzy before it takes human form!"), self_message, span_notice("You hear something squishing...")) if(death_provoked) - cooldown_handler.recharge_duration = 10 MINUTES + cooldown_handler.recharge_duration = COOLDOWN_TO_SLIME_MOB cooldown_handler.start_recharge() playsound(get_turf(usr), sound, 50, TRUE) user.density = FALSE @@ -237,3 +239,6 @@ M.mind.RemoveSpell(/obj/effect/proc_holder/spell/slime_degradation) M.mind.RemoveSpell(/obj/effect/proc_holder/spell/slime_selfheat) . = ..() + +#undef COOLDOWN_TO_SLIMEPERSON +#undef COOLDOWN_TO_SLIME_MOB diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm index 02482326efa..0e3ab7cd767 100644 --- a/code/game/objects/items/weapons/cash.dm +++ b/code/game/objects/items/weapons/cash.dm @@ -22,8 +22,7 @@ max_amount = CASHMAX merge_type = /obj/item/stack/spacecash -/obj/item/stack/spacecash/update_icon() - ..() +/obj/item/stack/spacecash/update_icon_state() name = "[amount == CASHMAX ? "[CASHMAX]" : amount] Credit[amount > 1 ? "s" : ""]" switch(amount) if(CASH1 to CASH2 - 1) @@ -114,8 +113,7 @@ ..() update_icon() -/obj/item/stack/spacecash/ussp/update_icon() - ..() +/obj/item/stack/spacecash/ussp/update_icon_state() name = "[amount == CASHMAX ? "[CASHMAX]" : amount] Ruble[amount > 1 ? "s" : ""]" switch(amount) if(CASH1 to CASH2 - 1) diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 2635469cbb5..02259af200c 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -63,8 +63,8 @@ TED = new(src.loc) qdel(src) -/obj/item/gun/energy/chrono_gun/update_icon() - return +/obj/item/gun/energy/chrono_gun/update_overlays() + return list() /obj/item/gun/energy/chrono_gun/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override, bonus_spread = 0) if(field) @@ -123,7 +123,7 @@ icon_state = "chronobolt" range = CHRONO_BEAM_RANGE color = null - nodamage = 1 + nodamage = TRUE var/obj/item/gun/energy/chrono_gun/gun = null /obj/item/projectile/energy/chrono_beam/fire() @@ -177,7 +177,7 @@ cached_icon.Insert(mob_icon, "frame[i]") mob_underlay = mutable_appearance(cached_icon, "frame1") - update_icon() + update_icon(UPDATE_ICON_STATE) desc = initial(desc) + "
It appears to contain [target.name]." START_PROCESSING(SSobj, src) @@ -191,7 +191,7 @@ /obj/structure/chrono_field/has_prints() return FALSE -/obj/structure/chrono_field/update_icon() +/obj/structure/chrono_field/update_icon_state() var/ttk_frame = 1 - (tickstokill / initial(tickstokill)) ttk_frame = clamp(CEILING(ttk_frame * CHRONO_FRAME_COUNT, 1), 1, CHRONO_FRAME_COUNT) if(ttk_frame != RPpos) @@ -220,7 +220,7 @@ captured.Paralyse(8 SECONDS) if(captured.loc != src) captured.forceMove(src) - update_icon() + update_icon(UPDATE_ICON_STATE) if(gun) if(gun.field_check(src)) tickstokill-- diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index f30408adbf3..be4efb96aa6 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -151,12 +151,6 @@ LIGHTERS ARE IN LIGHTERS.DM light("[user] lights [user.p_their()] [name] with [N]. Someone please give [user.p_their()] zippo..") - //can't think of any other way to update the overlays :< - user.update_inv_wear_mask() - user.update_inv_l_hand() - user.update_inv_r_hand() - - /obj/item/clothing/mask/cigarette/afterattack(obj/item/reagent_containers/glass/glass, mob/user, proximity) ..() if(!proximity) @@ -172,46 +166,59 @@ LIGHTERS ARE IN LIGHTERS.DM to_chat(user, "[src] is full.") +/obj/item/clothing/mask/cigarette/update_icon_state() + icon_state = lit ? icon_on : icon_off + item_state = lit ? icon_on : initial(item_state) + update_equipped_item() + + +/obj/item/clothing/mask/cigarette/update_name(updates = ALL) + . = ..() + name = lit ? "lit [initial(name)]" : initial(name) + + /obj/item/clothing/mask/cigarette/proc/light(flavor_text = null) - if(!lit) - lit = TRUE - name = "lit [name]" - attack_verb = list("burnt", "singed") - hitsound = 'sound/items/welder.ogg' - damtype = "fire" - force = 4 - if(reagents.get_reagent_amount("plasma")) // the plasma explodes when exposed to fire - var/datum/effect_system/reagents_explosion/e = new() - e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0) - e.start() - if(ismob(loc)) - var/mob/M = loc - M.temporarily_remove_item_from_inventory(src, force = TRUE) - qdel(src) - return - if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently - var/datum/effect_system/reagents_explosion/e = new() - e.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0) - e.start() - if(ismob(loc)) - var/mob/M = loc - M.temporarily_remove_item_from_inventory(src, force = TRUE) - qdel(src) - return - reagents.set_reacting(TRUE) - reagents.handle_reactions() - icon_state = icon_on - item_state = icon_on - if(flavor_text) - var/turf/T = get_turf(src) - T.visible_message(flavor_text) - if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - if(H.wear_mask == src) // Don't update if it's just in their hand - H.wear_mask_update(src) - set_light(2, 0.25, "#E38F46") - START_PROCESSING(SSobj, src) - playsound(src, 'sound/items/lighter/light.ogg', 25, TRUE) + if(lit) + return + + lit = TRUE + attack_verb = list("burnt", "singed") + hitsound = 'sound/items/welder.ogg' + damtype = FIRE + force = 4 + + if(check_reagents_explosion()) + return + + reagents.set_reacting(TRUE) + reagents.handle_reactions() + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) + if(flavor_text) + var/turf/T = get_turf(src) + T.visible_message(flavor_text) + set_light(2, 0.25, "#E38F46") + START_PROCESSING(SSobj, src) + playsound(src, 'sound/items/lighter/light.ogg', 25, TRUE) + + +/obj/item/clothing/mask/cigarette/proc/check_reagents_explosion() + var/reagent = "" + var/reagent_divisor = 2.5 + if(reagents.get_reagent_amount("plasma")) + reagent = "plasma" + else if(reagents.get_reagent_amount("fuel")) + reagent = "fuel" + reagent_divisor = 5 + if(!reagent) + return FALSE + + var/datum/effect_system/reagents_explosion/explosion = new + explosion.set_up(round(reagents.get_reagent_amount(reagent) / reagent_divisor, 1), get_turf(src), 0, 0) + if(ismob(loc)) + var/mob/user = loc + user.temporarily_remove_item_from_inventory(src, force = TRUE) + qdel(src) + return TRUE /obj/item/clothing/mask/cigarette/process() @@ -403,16 +410,11 @@ LIGHTERS ARE IN LIGHTERS.DM /obj/item/clothing/mask/cigarette/pipe/light(flavor_text = null) if(!lit) lit = TRUE - damtype = "fire" - icon_state = icon_on - item_state = icon_on + damtype = FIRE + update_icon(UPDATE_ICON_STATE) if(flavor_text) var/turf/T = get_turf(src) T.visible_message(flavor_text) - if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - if(H.wear_mask == src) // Don't update if it's just in their hand - H.wear_mask_update(src) START_PROCESSING(SSobj, src) /obj/item/clothing/mask/cigarette/pipe/process() @@ -420,13 +422,11 @@ LIGHTERS ARE IN LIGHTERS.DM smoketime-- if(smoketime < 1) new /obj/effect/decal/cleanable/ash(location) + lit = FALSE + update_icon(UPDATE_ICON_STATE) if(ismob(loc)) var/mob/living/M = loc to_chat(M, "Your [name] goes out, and you empty the ash.") - lit = FALSE - icon_state = icon_off - item_state = icon_off - M.update_inv_wear_mask() STOP_PROCESSING(SSobj, src) return smoke() @@ -435,8 +435,7 @@ LIGHTERS ARE IN LIGHTERS.DM if(lit) user.visible_message("[user] puts out [src].") lit = FALSE - icon_state = icon_off - item_state = icon_off + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return if(smoketime <= 0) diff --git a/code/game/objects/items/weapons/conversion_kit.dm b/code/game/objects/items/weapons/conversion_kit.dm index 4eb09ff6f6e..98d4fe87dd3 100644 --- a/code/game/objects/items/weapons/conversion_kit.dm +++ b/code/game/objects/items/weapons/conversion_kit.dm @@ -2,20 +2,19 @@ /obj/item/conversion_kit name = "\improper Revolver Conversion Kit" desc = "A professional conversion kit used to convert any knock off revolver into the real deal capable of shooting lethal .357 rounds without the possibility of catastrophic failure." - icon_state = "kit" + icon_state = "kit_0" flags = CONDUCT w_class = WEIGHT_CLASS_SMALL origin_tech = "combat=2" - var/open = 0 + var/open = FALSE -/obj/item/conversion_kit/New() - ..() - update_icon() -/obj/item/conversion_kit/update_icon() - icon_state = "[initial(icon_state)]_[open]" +/obj/item/conversion_kit/update_icon_state() + icon_state = "kit_[open]" + /obj/item/conversion_kit/attack_self(mob/user) open = !open to_chat(user, "You [open ? "open" : "close"] the conversion kit.") - update_icon() + update_icon(UPDATE_ICON_STATE) + diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 68407db2445..03e5bee0d3f 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -58,17 +58,23 @@ colour = pick(lipstick_colors) name = "[colour] lipstick" + +/obj/item/lipstick/update_icon_state() + . = ..() + icon_state = "lipstick[open ? "_uncap" : ""]" + + +/obj/item/lipstick/update_overlays() + . = ..() + if(open) + . += mutable_appearance(icon, icon_state = "lipstick_uncap_color", color = lipstick_colors[colour]) + + /obj/item/lipstick/attack_self(mob/user) - cut_overlays() to_chat(user, "You twist \the [src] [open ? "closed" : "open"].") open = !open - if(open) - var/mutable_appearance/colored = mutable_appearance('icons/obj/items.dmi', "lipstick_uncap_color") - colored.color = lipstick_colors[colour] - icon_state = "lipstick_uncap" - add_overlay(colored) - else - icon_state = "lipstick" + update_icon() + /obj/item/lipstick/attack(mob/M, mob/user) if(!open || !istype(M)) diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 0a01992d56f..1c9135d5b50 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -16,43 +16,62 @@ "Vox" = 'icons/mob/clothing/species/vox/back.dmi' ) - var/paddles_on_defib = TRUE //if the paddles are on the defib (TRUE) - var/safety = TRUE //if you can zap people with the defibs on harm mode - var/powered = FALSE //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise + /// If the paddles are currently attached to the unit. + var/paddles_on_defib = TRUE + /// if there's a cell in the defib with enough power for a revive; blocks paddles from reviving otherwise + var/powered = FALSE + /// Ref to attached paddles var/obj/item/twohanded/shockpaddles/paddles + /// Ref to internal power cell. var/obj/item/stock_parts/cell/high/cell = null - var/combat = FALSE //can we revive through space suits? - + /// If false, using harm intent will let you zap people. Note that any updates to this after init will only impact icons. + var/safety = TRUE + /// If true, this can be used through hardsuits, and can cause heart attacks in harm intent. + var/combat = FALSE + // If safety is false and combat is true, the chance that this will cause a heart attack. + var/heart_attack_probability = 30 + /// If this is vulnerable to EMPs. + var/hardened = FALSE + /// If this can be emagged. + var/emag_proof = FALSE /// Type of paddles that should be attached to this defib. var/obj/item/twohanded/shockpaddles/paddle_type = /obj/item/twohanded/shockpaddles -/obj/item/defibrillator/get_cell() - return cell -/obj/item/defibrillator/New() //starts without a cell for rnd - ..() +/obj/item/defibrillator/Initialize(mapload) // Base version starts without a cell for rnd + . = ..() paddles = new paddle_type(src) - update_icon() - return + update_icon(UPDATE_OVERLAYS) -/obj/item/defibrillator/loaded/New() //starts with hicap - ..() + +/obj/item/defibrillator/Destroy() + if(!paddles_on_defib) + var/holder = get(paddles.loc, /mob/living/carbon/human) + retrieve_paddles(holder) + QDEL_NULL(paddles) + QDEL_NULL(cell) + return ..() + + +/obj/item/defibrillator/loaded/Initialize(mapload) // Loaded version starts with high-capacity cell. + . = ..() cell = new(src) - update_icon() - return + update_icon(UPDATE_OVERLAYS) + -/obj/item/defibrillator/update_icon() +/obj/item/defibrillator/get_cell() + return cell + + +/obj/item/defibrillator/update_icon(updates = ALL) update_power() - update_overlays() - update_charge() + ..() - for(var/X in actions) - var/datum/action/A = X - A.UpdateButtonIcon() /obj/item/defibrillator/examine(mob/user) . = ..() - . += "Ctrl-click to remove the paddles from the defibrillator." + . += span_info("Ctrl-Click to remove the paddles from the defibrillator.") + /obj/item/defibrillator/proc/update_power() if(cell) @@ -63,190 +82,176 @@ else powered = FALSE + /obj/item/defibrillator/update_overlays() - overlays.Cut() + . = ..() if(paddles_on_defib) - overlays += "[icon_state]-paddles" + . += "[icon_state]-paddles" if(powered) - overlays += "[icon_state]-powered" - if(!cell) - overlays += "[icon_state]-nocell" + . += "[icon_state]-powered" if(!safety) - overlays += "[icon_state]-emagged" - -/obj/item/defibrillator/proc/update_charge() - if(powered && cell) //so it doesn't show charge if it's unpowered + . += "[icon_state]-emagged" + if(powered && cell) var/ratio = cell.charge / cell.maxcharge ratio = CEILING(ratio*4, 1) * 25 - overlays += "[icon_state]-charge[ratio]" + . += "[icon_state]-charge[ratio]" + if(!cell) + . += "[icon_state]-nocell" + /obj/item/defibrillator/CheckParts(list/parts_list) ..() cell = locate(/obj/item/stock_parts/cell) in contents - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/ui_action_click(mob/user) if(!ishuman(user) || !Adjacent(user)) return - toggle_paddles() + toggle_paddles(user) /obj/item/defibrillator/CtrlClick(mob/user) if(!ishuman(user) || !Adjacent(user)) return - toggle_paddles() + toggle_paddles(user) /obj/item/defibrillator/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stock_parts/cell)) var/obj/item/stock_parts/cell/C = W if(cell) - to_chat(user, "[src] already has a cell.") + to_chat(user, span_notice("[src] already has a cell.")) else if(C.maxcharge < paddles.revivecost) - to_chat(user, "[src] requires a higher capacity cell.") + to_chat(user, span_notice("[src] requires a higher capacity cell.")) return if(!user.drop_transfer_item_to_loc(W, src)) return cell = W - to_chat(user, "You install a cell in [src].") - - else if(istype(W, /obj/item/screwdriver)) - if(cell) - cell.update_icon() - cell.loc = get_turf(loc) - cell = null - to_chat(user, "You remove the cell from the [src].") + update_icon(UPDATE_OVERLAYS) + to_chat(user, span_notice("You install a cell in [src].")) else if(W == paddles) - toggle_paddles() - - update_icon() - return + toggle_paddles(user) -/obj/item/defibrillator/emag_act(mob/user) - if(safety) - add_attack_logs(user, src, "emagged") - safety = FALSE - if(user) - to_chat(user, "You silently disable [src]'s safety protocols with the card.") else - add_attack_logs(user, src, "un-emagged") - safety = TRUE - if(user) - to_chat(user, "You silently enable [src]'s safety protocols with the card.") - update_icon() + return ..() + + +/obj/item/defibrillator/screwdriver_act(mob/living/user, obj/item/I) + if(!cell) + to_chat(user, span_notice("[src] doesn't have a cell.")) + return + + // we want an infinite power cell to stay inside (used in advanced compact defib) + if(istype(cell, /obj/item/stock_parts/cell/infinite)) + to_chat(user, span_notice("[src] somehow resists your attempt to remove a cell.")) + return + + cell.update_icon() + cell.forceMove_turf() + cell = null + I.play_tool_sound(src) + to_chat(user, span_notice("You remove the cell from [src].")) + update_icon(UPDATE_OVERLAYS) + return TRUE /obj/item/defibrillator/emp_act(severity) if(cell) deductcharge(1000 / severity) - if(safety) - safety = FALSE - visible_message("[src] beeps: Safety protocols disabled!") - playsound(get_turf(src), 'sound/machines/defib_saftyoff.ogg', 50, 0) - else - safety = TRUE - visible_message("[src] beeps: Safety protocols enabled!") - playsound(get_turf(src), 'sound/machines/defib_saftyon.ogg', 50, 0) - update_icon() + safety = !safety + update_icon(UPDATE_OVERLAYS) + ..() + +/obj/item/defibrillator/emag_act(mob/user) + add_attack_logs(user, src, "[safety ? "" : "un-"]emagged") + safety = !safety ..() + update_icon(UPDATE_OVERLAYS) -/obj/item/defibrillator/verb/toggle_paddles() +/obj/item/defibrillator/verb/toggle_paddles_verb() set name = "Toggle Paddles" set category = "Object" + set src in oview(1) + toggle_paddles(usr) + + +/obj/item/defibrillator/proc/toggle_paddles(mob/living/carbon/human/user = usr) if(!paddles) - to_chat(usr, span_warning("[src] has no paddles!")) + to_chat(user, span_warning("[src] has no paddles!")) return if(paddles_on_defib) - //Detach the paddles into the user's hands + dispence_paddles(user) + else + retrieve_paddles(user) + + for(var/datum/action/action as anything in actions) + action.UpdateButtonIcon() - var/mob/living/carbon/human/user = usr - var/obj/item/organ/external/temp2 = user.bodyparts_by_name[BODY_ZONE_PRECISE_R_HAND] - var/obj/item/organ/external/temp = user.bodyparts_by_name[BODY_ZONE_PRECISE_L_HAND] - if(user.incapacitated()) - return +/obj/item/defibrillator/proc/dispence_paddles(mob/living/carbon/human/user) + if(!paddles || !paddles_on_defib || !ishuman(user) || user.incapacitated()) + return - if(!temp || !temp.is_usable() && !temp2 || !temp2.is_usable()) - to_chat(user, span_warning("You can't use your hand to take out the paddles!")) - return + //Detach the paddles into the user's hands + var/obj/item/organ/external/hand_left = user.get_organ(BODY_ZONE_PRECISE_L_HAND) + var/obj/item/organ/external/hand_right = user.get_organ(BODY_ZONE_PRECISE_R_HAND) - if((user.r_hand != null && user.l_hand != null)) - to_chat(user, span_warning("You need a free hand to hold the paddles!")) - return + if((!hand_left || !hand_left.is_usable()) && (!hand_right || !hand_right.is_usable())) + to_chat(user, span_warning("You can't use your hands to take out the paddles!")) + return - //We need to do this like that since defib paddles have their own behavior on dropped() - if(!is_on_user(user)) - paddles.forceMove_turf() + paddles.loc = get_turf(src) // we need this to play animation properly + if(!user.put_in_hands(paddles, ignore_anim = FALSE)) + paddles.loc = src + to_chat(user, span_warning("You need a free hand to hold the paddles!")) + return - if(!user.put_in_hands(paddles, ignore_anim = FALSE)) - paddles.forceMove(src) - to_chat(user, span_warning("You need a free hand to hold the paddles!")) - return + paddles_on_defib = FALSE + paddles.update_icon(UPDATE_ICON_STATE) + update_icon(UPDATE_OVERLAYS) - paddles_on_defib = FALSE - else //remove in any case because some automatic shit - remove_paddles(usr) - update_icon() +/obj/item/defibrillator/proc/retrieve_paddles(mob/user) + if(!paddles || paddles_on_defib) + return + if(user?.is_in_hands(paddles)) + user.drop_item_ground(paddles) + paddles.do_pickup_animation(src) + paddles.forceMove(src) + paddles_on_defib = TRUE + update_icon(UPDATE_OVERLAYS) + paddles.update_icon(UPDATE_ICON_STATE) /obj/item/defibrillator/equipped(mob/user, slot) - ..() + . = ..() if(slot != slot_back) - remove_paddles(user) - update_icon() + retrieve_paddles(user) -/obj/item/defibrillator/item_action_slot_check(slot, mob/user) - if(slot == slot_back) - return TRUE - -/obj/item/defibrillator/proc/remove_paddles(mob/user) // from your hands - if(user.is_in_hands(paddles)) - return user.drop_item_ground(paddles) - return TRUE +/obj/item/defibrillator/item_action_slot_check(slot, mob/user) + return slot == slot_back -/obj/item/defibrillator/Destroy() - if(!paddles_on_defib) - var/M = get(paddles, /mob) - remove_paddles(M) - QDEL_NULL(paddles) - QDEL_NULL(cell) - return ..() -/obj/item/defibrillator/proc/deductcharge(var/chrgdeductamt) +/obj/item/defibrillator/proc/deductcharge(chrgdeductamt) if(cell) if(cell.charge < (paddles.revivecost+chrgdeductamt)) powered = FALSE - update_icon() + update_icon(UPDATE_OVERLAYS) if(cell.use(chrgdeductamt)) - update_icon() + update_icon(UPDATE_OVERLAYS) return TRUE else - update_icon() + update_icon(UPDATE_OVERLAYS) return FALSE -/obj/item/defibrillator/proc/cooldowncheck(var/mob/user) - paddles.update_icon() - spawn(50) - if(cell) - if(cell.charge >= paddles.revivecost) - user.visible_message("[src] beeps: Unit ready.") - playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50, 0) - else - user.visible_message("[src] beeps: Charge depleted.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - paddles.cooldown = FALSE - paddles.update_icon() - update_icon() - /obj/item/defibrillator/compact name = "compact defibrillator" desc = "A belt-equipped defibrillator that can be rapidly deployed." @@ -260,11 +265,10 @@ if(slot == slot_belt) return TRUE -/obj/item/defibrillator/compact/loaded/New() - ..() +/obj/item/defibrillator/compact/loaded/Initialize(mapload) + . = ..() cell = new(src) - update_icon() - return + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/compact/combat name = "combat defibrillator" @@ -274,12 +278,12 @@ paddle_type = /obj/item/twohanded/shockpaddles/syndicate combat = TRUE safety = FALSE + heart_attack_probability = 100 -/obj/item/defibrillator/compact/combat/loaded/New() - ..() +/obj/item/defibrillator/compact/combat/loaded/Initialize(mapload) + . = ..() cell = new(src) - update_icon() - return + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/compact/advanced name = "advanced compact defibrillator" @@ -290,17 +294,21 @@ combat = TRUE safety = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF //Objective item, better not have it destroyed. + heart_attack_probability = 10 + var/next_emp_message //to prevent spam from the emagging message on the advanced defibrillator + /obj/item/defibrillator/compact/advanced/attackby(obj/item/W, mob/user, params) if(W == paddles) - toggle_paddles() - update_icon() + toggle_paddles(user) -/obj/item/defibrillator/compact/advanced/loaded/New() - ..() + +/obj/item/defibrillator/compact/advanced/loaded/Initialize(mapload) + . = ..() cell = new /obj/item/stock_parts/cell/infinite(src) - update_icon() + update_icon(UPDATE_OVERLAYS) + /obj/item/defibrillator/compact/advanced/emp_act(severity) if(world.time > next_emp_message) @@ -321,11 +329,12 @@ resistance_flags = INDESTRUCTIBLE toolspeed = 1 flags = ABSTRACT - + /// Amount of power used on a shock. var/revivecost = 1000 - var/cooldown = FALSE - var/busy = FALSE + /// Active defib this is connected to. var/obj/item/defibrillator/defib + /// Whether or not the paddles are on cooldown. Used for tracking icon states. + var/on_cooldown = FALSE /obj/item/twohanded/shockpaddles/advanced name = "advanced defibrillator paddles" @@ -339,272 +348,131 @@ icon_state = "syndiepaddles" item_state = "syndiepaddles" + /obj/item/twohanded/shockpaddles/New(mainunit) - ..() - if(check_defib_exists(mainunit, src)) - defib = mainunit - loc = defib - busy = FALSE - update_icon() - return + . = ..() + add_defib_component(mainunit) -/obj/item/twohanded/shockpaddles/proc/spend_charge() +/obj/item/twohanded/shockpaddles/proc/add_defib_component(mainunit) + if(check_defib_exists(mainunit)) + update_icon(UPDATE_ICON_STATE) + AddComponent(/datum/component/defib, actual_unit = defib, combat = defib.combat, safe_by_default = defib.safety, heart_attack_chance = defib.heart_attack_probability, emp_proof = defib.hardened, emag_proof = defib.emag_proof) + else + AddComponent(/datum/component/defib) + RegisterSignal(src, COMSIG_DEFIB_READY, PROC_REF(on_cooldown_expire)) + RegisterSignal(src, COMSIG_DEFIB_SHOCK_APPLIED, PROC_REF(after_shock)) + RegisterSignal(src, COMSIG_DEFIB_PADDLES_APPLIED, PROC_REF(on_application)) + +/obj/item/twohanded/shockpaddles/Destroy() + defib = null + return ..() + +/// Check to see if we should abort this before we've even gotten started +/obj/item/twohanded/shockpaddles/proc/on_application(obj/item/paddles, mob/living/user, mob/living/carbon/human/target, should_cause_harm) + SIGNAL_HANDLER // COMSIG_DEFIB_PADDLES_APPLIED + + if(!HAS_TRAIT(src, TRAIT_WIELDED)) + to_chat(user, "You need to wield the paddles in both hands before you can use them on someone!") + return COMPONENT_BLOCK_DEFIB_MISC + + if(!defib.powered) + return COMPONENT_BLOCK_DEFIB_DEAD + + +/obj/item/twohanded/shockpaddles/proc/on_cooldown_expire(obj/item/paddles) + SIGNAL_HANDLER // COMSIG_DEFIB_READY + on_cooldown = FALSE + if(defib.cell) + if(defib.cell.charge >= revivecost) + defib.visible_message(span_notice("[defib] beeps: Unit ready.")) + playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50) + else + defib.visible_message(span_notice("[defib] beeps: Charge depleted.")) + playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) + update_icon(UPDATE_ICON_STATE) + defib.update_icon(UPDATE_ICON_STATE) + + +/obj/item/twohanded/shockpaddles/proc/after_shock() + SIGNAL_HANDLER // COMSIG_DEFIB_SHOCK_APPLIED + on_cooldown = TRUE defib.deductcharge(revivecost) + update_icon(UPDATE_ICON_STATE) -/obj/item/twohanded/shockpaddles/proc/trigger_cooldown(mob/user) - cooldown = TRUE - defib.cooldowncheck(user) +/obj/item/twohanded/shockpaddles/update_icon_state() + var/is_wielded = HAS_TRAIT(src, TRAIT_WIELDED) + icon_state = "[initial(icon_state)][is_wielded][on_cooldown ? "_cooldown" : ""]" + item_state = "[initial(icon_state)][is_wielded]" -/obj/item/twohanded/shockpaddles/update_icon() - icon_state = "[initial(icon_state)][wielded]" - item_state = "[initial(icon_state)][wielded]" - if(cooldown) - icon_state = "[initial(icon_state)][wielded]_cooldown" /obj/item/twohanded/shockpaddles/suicide_act(mob/user) - user.visible_message("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message(span_suicide("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide.")) defib.deductcharge(revivecost) playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) return OXYLOSS + /obj/item/twohanded/shockpaddles/dropped(mob/user, silent = FALSE) - update_icon() + . = ..() if(defib) - to_chat(user, span_notice("The paddles snap back into the main unit.")) - if(!defib.is_on_user(user)) - do_pickup_animation(defib) - forceMove(defib) - defib.paddles_on_defib = TRUE - defib.update_icon() - else - return ..() + defib.toggle_paddles(user) + if(!silent) + to_chat(user, span_notice("The paddles snap back into the main unit.")) /obj/item/twohanded/shockpaddles/equip_to_best_slot(mob/user, force = FALSE) - user.drop_item_ground(src) + user.drop_item_ground(src) /obj/item/twohanded/shockpaddles/on_mob_move(dir, mob/user) if(defib && !in_range(defib, src)) user.drop_item_ground(src, force = TRUE) -/obj/item/twohanded/shockpaddles/proc/check_defib_exists(mainunit, var/mob/living/carbon/human/M, var/obj/O) - if(!mainunit || !istype(mainunit, /obj/item/defibrillator)) //To avoid weird issues from admin spawns - M.temporarily_remove_item_from_inventory(O, TRUE) - qdel(O) - return FALSE - else - return TRUE - -/obj/item/twohanded/shockpaddles/attack(mob/M, mob/user) - var/tobehealed - var/threshold = -HEALTH_THRESHOLD_DEAD - var/mob/living/carbon/human/H = M - - var/is_combat_borg = FALSE - if(isrobot(user)) - var/mob/living/silicon/robot/R = user - is_combat_borg = istype(R.module, /obj/item/robot_module/syndicate_medical) || istype(R.module, /obj/item/robot_module/ninja) - - var/ignores_hardsuits = defib?.combat || is_combat_borg - - if(busy) - return - if(!isrobot(user) && !defib.powered) - user.visible_message("[defib] beeps: Unit is unpowered.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - return - if(!isrobot(user) && !wielded) - to_chat(user, "You need to wield the paddles in both hands before you can use them on someone!") - return - if(cooldown) - to_chat(user, "[defib || src] is recharging.") - return - if(!ishuman(M)) - if(isrobot(user)) - to_chat(user, "This unit is only designed to work on humanoid lifeforms.") - else - to_chat(user, "The instructions on [defib] don't mention how to revive that...") - return - else - var/can_harm - if(isrobot(user)) - var/mob/living/silicon/robot/R = user - can_harm = R.emagged || is_combat_borg - else - can_harm = !defib.safety - - if(user.a_intent == INTENT_HARM && can_harm) - busy = TRUE - H.visible_message("[user] has touched [H.name] with [src]!", \ - "[user] has touched [H.name] with [src]!") - H.adjustStaminaLoss(50) - H.Weaken(4 SECONDS) - playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) - H.emote("gasp") - if(!H.undergoing_cardiac_arrest() && (prob(10) || defib?.combat)) // Your heart explodes. - H.set_heartattack(TRUE) - H.shock_internal_organs(100) - add_attack_logs(user, M, "Stunned with [src]") - busy = FALSE - spend_charge(user) - trigger_cooldown(user) - return - user.visible_message("[user] begins to place [src] on [M.name]'s chest.", "You begin to place [src] on [M.name]'s chest.") - busy = TRUE - if(do_after(user, 30 * toolspeed * gettoolspeedmod(user), target = M)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process - user.visible_message("[user] places [src] on [M.name]'s chest.", "You place [src] on [M.name]'s chest.") - playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0) - var/mob/dead/observer/ghost = H.get_ghost(TRUE) - if(ghost && !ghost.client) - // In case the ghost's not getting deleted for some reason - H.key = ghost.key - log_runtime(EXCEPTION("Ghost of name [ghost.name] is bound to [H.real_name], but lacks a client. Deleting ghost."), src) - - QDEL_NULL(ghost) - var/tplus = world.time - H.timeofdeath - var/tlimit = DEFIB_TIME_LIMIT - var/tloss = DEFIB_TIME_LOSS - if(do_after(user, 20 * toolspeed * gettoolspeedmod(user), target = M)) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total - for(var/obj/item/carried_item in H.contents) - if(istype(carried_item, /obj/item/clothing/suit/space)) - if(!ignores_hardsuits) - user.visible_message("[defib || src] buzzes: Patient's chest is obscured. Operation aborted.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - busy = FALSE - return - if(H.undergoing_cardiac_arrest()) - if(!H.get_int_organ(/obj/item/organ/internal/heart) && !H.get_int_organ(/obj/item/organ/internal/brain/slime)) //prevents defibing someone still alive suffering from a heart attack attack if they lack a heart - user.visible_message("[defib || src] buzzes: Resuscitation failed - Failed to pick up any heart electrical activity.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - busy = FALSE - return - else - var/obj/item/organ/internal/heart/heart = H.get_int_organ(/obj/item/organ/internal/heart) - if(heart.is_dead()) - user.visible_message("[defib || src] buzzes: Resuscitation failed - Heart necrosis detected.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - busy = FALSE - return - H.set_heartattack(FALSE) - H.shock_internal_organs(100) - user.visible_message("[defib || src] pings: Cardiac arrhythmia corrected.") - M.visible_message("[M]'s body convulses a bit.") - playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) - playsound(get_turf(src), "bodyfall", 50, 1) - playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0) - busy = FALSE - spend_charge(user) - trigger_cooldown(user) - return - if(H.stat == DEAD) - var/health = H.health - M.visible_message("[M]'s body convulses a bit.") - playsound(get_turf(src), "bodyfall", 50, 1) - playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) - var/total_cloneloss = H.cloneloss - var/total_bruteloss = 0 - var/total_burnloss = 0 - for(var/obj/item/organ/external/O as anything in H.bodyparts) - total_bruteloss += O.brute_dam - total_burnloss += O.burn_dam - if(total_cloneloss <= 180 && total_bruteloss <= 180 && total_burnloss <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations) && (H.mind && H.mind.is_revivable()) && (H.get_int_organ(/obj/item/organ/internal/heart) || H.get_int_organ(/obj/item/organ/internal/brain/slime))) - tobehealed = min(health + threshold, 0) // It's HILARIOUS without this min statement, let me tell you - tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived - H.adjustOxyLoss(tobehealed) - H.adjustToxLoss(tobehealed) - user.visible_message("[defib || src] pings: Resuscitation successful.") - playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0) - H.update_revive(TRUE, TRUE) - H.KnockOut() - H.Paralyse(10 SECONDS) - H.emote("gasp") - if(tplus > tloss) - H.setBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100)))) - - if(ishuman(H.pulledby)) // for some reason, pulledby isnt a list despite it being possible to be pulled by multiple people - excess_shock(user, H, H.pulledby) - for(var/obj/item/grab/G in H.grabbed_by) - if(ishuman(G.assailant)) - excess_shock(user, H, G.assailant) - - H.shock_internal_organs(100) - H.med_hud_set_health() - H.med_hud_set_status() - add_attack_logs(user, M, "Revived with [src]") - else - if(tplus > tlimit|| !H.get_int_organ(/obj/item/organ/internal/heart)) - user.visible_message("[defib || src] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation.") - else if(total_cloneloss > 180 || total_bruteloss > 180 || total_burnloss > 180) - user.visible_message("[defib || src] buzzes: Resuscitation failed - Severe tissue damage detected.") - else if(ghost) - if(!ghost.can_reenter_corpse) // DNR or AntagHUD - user.visible_message("[defib || src] buzzes: Resucitation failed: No electrical brain activity detected.") - else - user.visible_message("[defib || src] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.") - to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)") - window_flash(ghost.client) - ghost << sound('sound/effects/genetics.ogg') - else - user.visible_message("[defib || src] buzzes: Resuscitation failed.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - - spend_charge(user) - trigger_cooldown(user) - else - user.visible_message("[defib || src] buzzes: Patient is not in a valid state. Operation aborted.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - busy = FALSE -/* - * user = the person using the defib - * origin = person being revived - * affecting = person being shocked with excess energy from the defib -*/ -/obj/item/twohanded/shockpaddles/proc/excess_shock(mob/user, mob/living/carbon/human/origin, mob/living/carbon/human/affecting) - if(user == affecting) - return - if(electrocute_mob(affecting, defib.cell, origin)) // shock anyone touching them >:) - var/obj/item/organ/internal/heart/HE = affecting.get_organ_slot(INTERNAL_ORGAN_HEART) - if(HE.parent_organ_zone == BODY_ZONE_CHEST && affecting.has_both_hands()) // making sure the shock will go through their heart (drask hearts are in their head), and that they have both arms so the shock can cross their heart inside their chest - affecting.visible_message("[affecting]'s entire body shakes as a shock travels up their arm!", \ - "You feel a powerful shock travel up your [affecting.hand ? affecting.get_organ(BODY_ZONE_L_ARM) : affecting.get_organ(BODY_ZONE_R_ARM)] and back down your [affecting.hand ? affecting.get_organ(BODY_ZONE_L_ARM) : affecting.get_organ(BODY_ZONE_R_ARM)]!") - affecting.set_heartattack(TRUE) +/obj/item/twohanded/shockpaddles/proc/check_defib_exists(obj/item/defibrillator/mainunit) + if(!mainunit || !istype(mainunit)) //To avoid weird issues from admin spawns + qdel(src) + return FALSE + loc = mainunit + defib = mainunit + return TRUE /obj/item/twohanded/shockpaddles/borg desc = "A pair of mounted paddles with flat metal surfaces that are used to deliver powerful electric shocks." icon_state = "defibpaddles0" item_state = "defibpaddles0" - -/obj/item/twohanded/shockpaddles/borg/check_defib_exists() - // No-op. + var/safety = TRUE + var/heart_attack_probability = 10 /obj/item/twohanded/shockpaddles/borg/dropped(mob/user, silent = FALSE) SHOULD_CALL_PARENT(FALSE) // No-op. -/obj/item/twohanded/shockpaddles/borg/spend_charge(mob/user) - var/mob/living/silicon/robot/R = user - R.cell.use(revivecost) - /obj/item/twohanded/shockpaddles/borg/attack_self() // Standard two-handed weapon behavior is disabled. + return -/obj/item/twohanded/shockpaddles/borg/trigger_cooldown(mob/user) - cooldown = TRUE - update_icon() - var/mob/living/silicon/robot/R = user - spawn(50) - if(R.cell.charge >= revivecost) - user.visible_message("[src] beeps: Unit ready.") - playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50, 0) - else - user.visible_message("[src] beeps: Charge depleted.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - cooldown = FALSE - update_icon() +/obj/item/twohanded/shockpaddles/borg/add_defib_component(mainunit) + var/is_combat_borg = istype(loc, /obj/item/robot_module/syndicate_medical) || istype(loc, /obj/item/robot_module/ninja) + + AddComponent(/datum/component/defib, robotic = TRUE, combat = is_combat_borg, safe_by_default = safety, emp_proof = TRUE, heart_attack_chance = heart_attack_probability) + + RegisterSignal(src, COMSIG_DEFIB_READY, PROC_REF(on_cooldown_expire)) + RegisterSignal(src, COMSIG_DEFIB_SHOCK_APPLIED, PROC_REF(after_shock)) + +/obj/item/twohanded/shockpaddles/borg/after_shock(obj/item/defib, mob/user) + on_cooldown = TRUE + if(isrobot(user)) + var/mob/living/silicon/robot/R = user + R.cell.use(revivecost) + update_icon(UPDATE_ICON_STATE) + +/obj/item/twohanded/shockpaddles/borg/on_cooldown_expire(obj/item/paddles) + visible_message(span_notice("[src] beeps: Defibrillation unit ready.")) + playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50, 0) + on_cooldown = FALSE + update_icon(UPDATE_ICON_STATE) + +/obj/item/twohanded/shockpaddles/borg/update_icon_state() + icon_state = "[initial(icon_state)][on_cooldown ? "_cooldown" : ""]" -/obj/item/twohanded/shockpaddles/borg/update_icon() - icon_state = "[initial(icon_state)]" - if(cooldown) - icon_state = "[initial(icon_state)]_cooldown" diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 8e6df9cde26..e7b90a0942c 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -6,25 +6,42 @@ can_hold = list(/obj/item/dice) allow_wrap = FALSE + /obj/item/storage/pill_bottle/dice/populate_contents() + var/special_die = pick("1", "2", "fudge", "00", "100") + if(special_die == "1") + new /obj/item/dice/d1(src) + if(special_die == "2") + new /obj/item/dice/d2(src) new /obj/item/dice/d4(src) new /obj/item/dice/d6(src) + if(special_die == "fudge") + new /obj/item/dice/fudge(src) new /obj/item/dice/d8(src) new /obj/item/dice/d10(src) + if(special_die == "00") + new /obj/item/dice/d00(src) new /obj/item/dice/d12(src) new /obj/item/dice/d20(src) - var/special_die = pick("1","2","fudge","00","100") - switch(special_die) - if("1") - new /obj/item/dice/d1(src) - if("2") - new /obj/item/dice/d2(src) - if("fudge") - new /obj/item/dice/fudge(src) - if("00") - new /obj/item/dice/d00(src) - if("100") - new /obj/item/dice/d100(src) + if(special_die == "100") + new /obj/item/dice/d100(src) + + +/obj/item/storage/box/dice + name = "Коробка игральных костей" + desc = "ЕЩЁ ОДНИ!? ДА БЛЯДЬ!" + icon_state = "box" + + +/obj/item/storage/box/dice/populate_contents() + new /obj/item/dice/d2(src) + new /obj/item/dice/d4(src) + new /obj/item/dice/d8(src) + new /obj/item/dice/d10(src) + new /obj/item/dice/d00(src) + new /obj/item/dice/d12(src) + new /obj/item/dice/d20(src) + /obj/item/storage/pill_bottle/dice/suicide_act(mob/user) user.visible_message("[user] Игра[pluralize_ru(user.gender,"ет","ют")] со смертью! Похоже, он[genderize_ru(user.gender,"","а","о","и")] пыта[pluralize_ru(user.gender,"ется","ются")] покончить жизнь самоубийством!") @@ -44,11 +61,18 @@ var/rigged = DICE_NOT_RIGGED var/rigged_value + /obj/item/dice/Initialize(mapload) . = ..() if(!result) result = roll(sides) - update_icon() + update_icon(UPDATE_OVERLAYS) + + +/obj/item/dice/update_overlays() + . = ..() + . += "[icon_state][result]" + /obj/item/dice/suicide_act(mob/user) user.visible_message("[user] играет со смертью! Похоже [user.p_theyre()] пытается покончить жизнь самоубийством!") @@ -122,8 +146,10 @@ icon_state = "d100" sides = 100 -/obj/item/dice/d100/update_icon() - return + +/obj/item/dice/d100/update_overlays() + return list() + /obj/item/dice/d20/e20 var/triggered = FALSE @@ -151,7 +177,7 @@ comment = "ДВАДЦАТКА!" else if(sides == 20 && result == 1) comment = "М-да, невезуха." - update_icon() + update_icon(UPDATE_OVERLAYS) if(initial(icon_state) == "d00") result = (result - 1) * 10 if(length(special_faces) == sides) @@ -193,20 +219,190 @@ add_attack_logs(user, src, "detonated with a roll of [actual_result]", ATKLOG_FEW) explosion(epicenter, round(result * 0.25), round(result * 0.5), round(result), round(result * 1.5), TRUE, capped, cause = key_name(user)+" E20") -/obj/item/dice/update_icon() - overlays.Cut() - overlays += "[icon_state][result]" -/obj/item/storage/box/dice - name = "Коробка игральных костей" - desc = "ЕЩЁ ОДНИ!? ДА БЛЯДЬ!" - icon_state = "box" +// Die of Fate +/obj/item/dice/d20/fate + name = "\improper Die of Fate" + desc = "A die with twenty sides. You can feel unearthly energies radiating from it. Using this might be VERY risky." + icon_state = "d20" + var/reusable = TRUE + var/used = FALSE + +/obj/item/dice/d20/fate/stealth + name = "d20" + desc = "A die with twenty sides. The preferred die to throw at the GM." + +/obj/item/dice/d20/fate/one_use + reusable = FALSE + +/obj/item/dice/d20/fate/one_use/stealth + name = "d20" + desc = "A die with twenty sides. The preferred die to throw at the GM." + +/obj/item/dice/d20/fate/cursed + name = "cursed Die of Fate" + desc = "A die with twenty sides. You feel that rolling this is a REALLY bad idea." + color = "#00BB00" + + rigged = DICE_TOTALLY_RIGGED + rigged_value = 1 + +/obj/item/dice/d20/fate/diceroll(mob/user) + . = ..() + if(!used) + if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards)) + to_chat(user, "You feel the magic of the dice is restricted to ordinary humans!") + return + + if(!reusable) + used = TRUE + + var/turf/T = get_turf(src) + T.visible_message("[src] flares briefly.") + + addtimer(CALLBACK(src, PROC_REF(effect), user, .), 1 SECONDS) + +/obj/item/dice/d20/fate/equipped(mob/user, slot, initial) + . = ..() + + if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards)) + to_chat(user, "You feel the magic of the dice is restricted to ordinary humans! You should leave it alone.") + user.drop_item_ground(src) + +/obj/item/dice/d20/fate/proc/create_smoke(amount) + var/datum/effect_system/smoke_spread/smoke = new + smoke.set_up(amount, 0, drop_location()) + smoke.start() + +/obj/item/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user, roll) + var/turf/T = get_turf(src) + switch(roll) + if(1) + //Dust + T.visible_message("[user] turns to dust!") + user.dust() + if(2) + //Death + T.visible_message("[user] suddenly dies!") + user.death() + if(3) + //Swarm of creatures + T.visible_message("A swarm of creatures surround [user]!") + for(var/direction in GLOB.alldirs) + new /mob/living/simple_animal/hostile/netherworld(get_step(get_turf(user),direction)) + if(4) + //Destroy Equipment + T.visible_message("Everything [user] is holding and wearing disappears!") + for(var/obj/item/I in user) + if(istype(I, /obj/item/implant) || istype(I, /obj/item/organ)) + continue + qdel(I) + if(5) + //Monkeying + T.visible_message("[user] transforms into a monkey!") + user.monkeyize() + if(6) + //Cut speed + T.visible_message("[user] starts moving slower!") + var/datum/species/S = user.dna.species + S.speed_mod += 1 + if(7) + //Throw + T.visible_message("Unseen forces throw [user]!") + user.Stun(12 SECONDS) + user.adjustBruteLoss(50) + var/throw_dir = GLOB.cardinal + var/atom/throw_target = get_edge_target_turf(user, throw_dir) + user.throw_at(throw_target, 200, 4) + if(8) + //Fueltank Explosion + T.visible_message("An explosion bursts into existence around [user]!") + explosion(get_turf(user),-1,0,2, flame_range = 2, cause = src) + if(9) + //Cold + T.visible_message("[user] looks a little under the weather!") + var/datum/disease/virus/cold/D = new + D.Contract(user) + if(10) + //Nothing + T.visible_message("Nothing seems to happen.") + if(11) + //Cookie + T.visible_message("A cookie appears out of thin air!") + var/obj/item/reagent_containers/food/snacks/cookie/C = new(drop_location()) + create_smoke(2) + C.name = "Cookie of Fate" + if(12) + //Healing + T.visible_message("[user] looks very healthy!") + user.revive() + if(13) + //Mad Dosh + T.visible_message("Mad dosh shoots out of [src]!") + var/turf/Start = get_turf(src) + for(var/direction in GLOB.alldirs) + var/turf/dirturf = get_step(Start,direction) + if(rand(0,1)) + new /obj/item/stack/spacecash/c1000(dirturf) + else + var/obj/item/storage/bag/money/M = new(dirturf) + for(var/i in 1 to rand(5,50)) + new /obj/item/coin/gold(M) + if(14) + //Free Gun + T.visible_message("An impressive gun appears!") + create_smoke(2) + new /obj/item/gun/projectile/revolver/mateba(drop_location()) + if(15) + //Random One-use spellbook + T.visible_message("A magical looking book drops to the floor!") + create_smoke(2) + new /obj/item/spellbook/oneuse/random(drop_location()) + if(16) + //Servant & Servant Summon + T.visible_message("A Dice Servant appears in a cloud of smoke!") + var/mob/living/carbon/human/H = new(drop_location()) + create_smoke(2) + + H.equipOutfit(/datum/outfit/butler) + var/datum/mind/servant_mind = new /datum/mind() + var/datum/objective/O = new + O.owner = servant_mind + O.target = user.mind + O.explanation_text = "Serve [user.real_name]." + servant_mind.objectives += O + servant_mind.transfer_to(H) + + var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the servant of [user.real_name]?", ROLE_WIZARD, poll_time = 30 SECONDS, source = H) + if(LAZYLEN(candidates)) + var/mob/dead/observer/C = pick(candidates) + message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Dice Servant") + H.key = C.key + to_chat(H, "You are a servant of [user.real_name]. You must do everything in your power to follow their orders.") + + var/obj/effect/proc_holder/spell/summonmob/S = new + S.target_mob = H + user.mind.AddSpell(S) + + if(17) + //Tator Kit + T.visible_message("A suspicious box appears!") + new /obj/item/storage/box/syndicate(drop_location()) + create_smoke(2) + if(18) + //Captain ID + T.visible_message("A golden identification card appears!") + new /obj/item/card/id/captains_spare(drop_location()) + create_smoke(2) + if(19) + //Instrinct Resistance + T.visible_message("[user] looks very robust!") + var/datum/species/S = user.dna.species + S.brute_mod *= 0.5 + S.burn_mod *= 0.5 + + if(20) + //Free wizard! + T.visible_message("Magic flows out of [src] and into [user]!") + user.mind.make_Wizard() -/obj/item/storage/box/dice/populate_contents() - new /obj/item/dice/d2(src) - new /obj/item/dice/d4(src) - new /obj/item/dice/d8(src) - new /obj/item/dice/d10(src) - new /obj/item/dice/d00(src) - new /obj/item/dice/d12(src) - new /obj/item/dice/d20(src) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index a6a59400212..c2113a08ee8 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -33,6 +33,16 @@ QDEL_NULL(buf) return ..() + +/obj/item/dnainjector/update_icon_state() + icon_state = "[initial(icon_state)][used ? "0" : ""]" + + +/obj/item/dnainjector/update_desc(updates = ALL) + . = ..() + desc = used ? "[initial(desc)] This one is used up." : initial(desc) + + /obj/item/dnainjector/proc/GetRealBlock(selblock) if(selblock == 0) return block @@ -67,51 +77,62 @@ else return buf.dna.SetUIValue(real_block,val) -/obj/item/dnainjector/proc/inject(mob/living/M, mob/user) + +/obj/item/dnainjector/proc/inject(mob/living/carbon/human/target, mob/user) if(used) return - if(isliving(M)) - M.apply_effect(rand(20 / (damage_coeff ** 2), 50 / (damage_coeff ** 2)), IRRADIATE, 0, 1) - var/mob/living/carbon/human/H - if(ishuman(M)) - H = M + + if(isliving(target)) + target.apply_effect(rand(20 / (damage_coeff ** 2), 50 / (damage_coeff ** 2)), IRRADIATE, 0, 1) + + if(!ishuman(target)) + return if(!buf) - log_runtime(EXCEPTION("[src] used by [user] on [M] failed to initialize properly."), src) + log_runtime(EXCEPTION("[src] used by [user] on [target] failed to initialize properly."), src) return used = TRUE - icon_state = "[icon_state]0" - desc += " This one is used up." - - spawn(0) //Some mutations have sleeps in them, like monkey - if(!(NOCLONE in M.mutations) && !(H && (NO_DNA in H.dna.species.species_traits))) // prevents drained people from having their DNA changed - var/prev_ue = M.dna.unique_enzymes - // UI in syringe. - if(buf.types & DNA2_BUF_UI) - if(!block) //isolated block? - M.dna.UI = buf.dna.UI.Copy() - M.dna.UpdateUI() - M.UpdateAppearance() - if(buf.types & DNA2_BUF_UE) //unique enzymes? yes - - M.real_name = buf.dna.real_name - M.name = buf.dna.real_name - M.dna.real_name = buf.dna.real_name - M.dna.unique_enzymes = buf.dna.unique_enzymes - else - M.dna.SetUIValue(block,src.GetValue()) - M.UpdateAppearance() - if(buf.types & DNA2_BUF_SE) - if(!block) //isolated block? - M.dna.SE = buf.dna.SE.Copy() - M.dna.UpdateSE() - else - M.dna.SetSEValue(block,src.GetValue()) - domutcheck(M, null, forcedmutation ? MUTCHK_FORCED : 0) - M.update_mutations() - if(H) - H.sync_organ_dna(assimilate = 0, old_ue = prev_ue) + update_appearance(UPDATE_ICON_STATE|UPDATE_DESC) + INVOKE_ASYNC(src, PROC_REF(async_update), target) //Some mutations have sleeps in them, like monkey + + +/obj/item/dnainjector/proc/async_update(mob/living/carbon/human/target) + // prevents drained people from having their DNA changed + if(!target.dna || (NOCLONE in target.mutations) || (NO_DNA in target.dna.species.species_traits)) + return + + var/datum/dna/target_dna = target.dna + var/prev_UE = target_dna.unique_enzymes + + // UI in syringe + if(buf.types & DNA2_BUF_UI) + if(!block) //isolated block? + target_dna.UI = buf.dna.UI.Copy() + target_dna.UpdateUI() + target.UpdateAppearance() + + if(buf.types & DNA2_BUF_UE) //unique enzymes? yes + target.real_name = buf.dna.real_name + target.name = buf.dna.real_name + target_dna.real_name = buf.dna.real_name + target_dna.unique_enzymes = buf.dna.unique_enzymes + else + target_dna.SetUIValue(block, GetValue()) + target.UpdateAppearance() + + // SE in syringe + if(buf.types & DNA2_BUF_SE) + if(!block) //isolated block? + target_dna.SE = buf.dna.SE.Copy() + target_dna.UpdateSE() + else + target_dna.SetSEValue(block, GetValue()) + domutcheck(target, null, forcedmutation ? MUTCHK_FORCED : NONE) + target.update_mutations() + + target.sync_organ_dna(assimilate = FALSE, old_ue = prev_UE) + /obj/item/dnainjector/attack(mob/M, mob/user) if(used) diff --git a/code/game/objects/items/weapons/dna_upgrader.dm b/code/game/objects/items/weapons/dna_upgrader.dm index 3ca2bf1cdb4..4821d4d498c 100644 --- a/code/game/objects/items/weapons/dna_upgrader.dm +++ b/code/game/objects/items/weapons/dna_upgrader.dm @@ -13,6 +13,16 @@ icon_state = "dnaupgrader" var/used = FALSE + +/obj/item/dna_upgrader/update_icon_state() + icon_state = "dnaupgrader[used ? "0" : ""]" + + +/obj/item/dna_upgrader/update_name(updates = ALL) + . = ..() + name = used ? "used [initial(name)]" : initial(name) + + /obj/item/dna_upgrader/attack_self(mob/user) if(!used) ui_interact(user) @@ -79,7 +89,7 @@ H.gene_stability += 25 to_chat(H, span_notice("You feel like your body rebasing.")) used = TRUE - icon_state = "[icon_state]0" + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) return TRUE #undef VAULT_TOXIN diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm index 1dcc4a942c2..cefe9f7abc8 100644 --- a/code/game/objects/items/weapons/dnascrambler.dm +++ b/code/game/objects/items/weapons/dnascrambler.dm @@ -4,15 +4,22 @@ icon = 'icons/obj/hypo.dmi' item_state = "syringe_0" icon_state = "lepopen" - var/used = null + var/used = FALSE -/obj/item/dnascrambler/update_icon() + +/obj/item/dnascrambler/update_icon_state() if(used) icon_state = "lepopen0" else icon_state = "lepopen" -/obj/item/dnascrambler/attack(mob/M as mob, mob/user as mob) + +/obj/item/dnascrambler/update_name(updates = ALL) + . = ..() + name = used ? "used [initial(name)]" : initial(name) + + +/obj/item/dnascrambler/attack(mob/M, mob/user) if(!M || !user) return @@ -53,6 +60,6 @@ target.update_icons() add_attack_logs(user, target, "injected with [src]") - used = 1 - update_icon() - name = "used " + name + used = TRUE + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) + diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index e2478d00882..edf464fd696 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -4,89 +4,108 @@ icon_state = "plastic-explosive0" item_state = "plastic-explosive" flags = NOBLUDGEON - det_time = 10 + det_time = 10 SECONDS display_timer = 0 origin_tech = "syndicate=1" toolspeed = 1 - var/atom/target = null - var/image_overlay = null - var/obj/item/assembly_holder/nadeassembly = null + var/atom/target + var/image_overlay + var/obj/item/assembly_holder/nadeassembly var/assemblyattacher var/notify_admins = TRUE -/obj/item/grenade/plastic/New() + +/obj/item/grenade/plastic/Initialize(mapload) + . = ..() image_overlay = image('icons/obj/weapons/grenade.dmi', "[item_state]2") - ..() + /obj/item/grenade/plastic/Destroy() QDEL_NULL(nadeassembly) target = null return ..() + /obj/item/grenade/plastic/attackby(obj/item/I, mob/user, params) if(!nadeassembly && istype(I, /obj/item/assembly_holder)) - var/obj/item/assembly_holder/A = I - if(!user.drop_item_ground(I)) + var/obj/item/assembly_holder/assembly_holder = I + if(!user.drop_transfer_item_to_loc(I, src)) return ..() - nadeassembly = A - A.master = src - A.loc = src + nadeassembly = assembly_holder + assembly_holder.master = src assemblyattacher = user.ckey - to_chat(user, "You add [A] to the [name].") + to_chat(user, "You add [assembly_holder] to the [name].") playsound(src, 'sound/weapons/tap.ogg', 20, 1) - update_icon() + update_icon(UPDATE_ICON_STATE) return - if(nadeassembly && istype(I, /obj/item/wirecutters)) + if(nadeassembly && I.tool_behaviour == TOOL_WIRECUTTER) playsound(src, I.usesound, 20, 1) - nadeassembly.loc = get_turf(src) + nadeassembly.forceMove_turf() nadeassembly.master = null nadeassembly = null - update_icon() + update_icon(UPDATE_ICON_STATE) return ..() + //assembly stuff /obj/item/grenade/plastic/receive_signal() prime() + /obj/item/grenade/plastic/Crossed(atom/movable/AM, oldloc) if(nadeassembly) nadeassembly.Crossed(AM, oldloc) + /obj/item/grenade/plastic/on_found(mob/finder) if(nadeassembly) nadeassembly.on_found(finder) + /obj/item/grenade/plastic/attack_self(mob/user) if(nadeassembly) nadeassembly.attack_self(user) return - var/newtime = input(usr, "Please set the timer.", "Timer", det_time) as num + var/newtime = input(usr, "Please set the timer (in seconds).", "Timer", det_time/10) as null|num + if(isnull(newtime)) + return if(user.is_in_active_hand(src)) - newtime = clamp(newtime, initial(det_time), 60000) - det_time = newtime - to_chat(user, "Timer set for [det_time] seconds.") + newtime = round(newtime) + det_time = clamp(newtime SECONDS, initial(det_time), 10 MINUTES) + to_chat(user, "Timer set for [newtime] seconds.") + + /obj/item/grenade/plastic/afterattack(atom/movable/AM, mob/user, flag) - if (!flag) + if(!flag) + return + if(iscarbon(AM)) + to_chat(user, "You can't get the [src] to stick to [AM]!") return - if (istype(AM, /mob/living/carbon)) + if(isobserver(AM)) + to_chat(user, "Your hand just phases through [AM]!") return - to_chat(user, "You start planting the [src]. The timer is set to [det_time]...") - - if(do_after(user, 50 * toolspeed * gettoolspeedmod(user), target = AM)) - if(!user.drop_item_ground(src)) - return - src.target = AM - loc = null - if(notify_admins) - message_admins("[ADMIN_LOOKUPFLW(user)] planted [src.name] on [target.name] at [ADMIN_COORDJMP(target)] with [det_time] second fuse") - add_game_logs("planted [name] on [target.name] at [COORD(target)] with [det_time] second fuse", user) - - target.overlays += image_overlay - if(!nadeassembly) - to_chat(user, "You plant the bomb. Timer counting down from [det_time].") - addtimer(CALLBACK(src, PROC_REF(prime)), det_time*10) + to_chat(user, "You start planting [src].[isnull(nadeassembly) ? " The timer is set to [det_time/10]..." : ""]") + + if(!do_after(user, 50 * toolspeed * gettoolspeedmod(user), target = AM)) + return + + if(!user.drop_item_ground(src)) + return + + target = AM + do_pickup_animation(AM) + loc = null + if(notify_admins) + message_admins("[ADMIN_LOOKUPFLW(user)] planted [src.name] on [target.name] at [ADMIN_COORDJMP(target)] with [det_time/10] second fuse") + add_game_logs("planted [name] on [target.name] at [COORD(target)] with [det_time/10] second fuse", user) + + AddComponent(/datum/component/persistent_overlay, image_overlay, target) + if(!nadeassembly) + to_chat(user, "You plant the bomb. Timer counting down from [det_time/10].") + addtimer(CALLBACK(src, PROC_REF(prime)), det_time) + /obj/item/grenade/plastic/suicide_act(mob/user) message_admins("[ADMIN_LOOKUPFLW(user)] suicided with [src.name] at [ADMIN_COORDJMP(user)]") @@ -119,12 +138,14 @@ user.gib() return OBLITERATION -/obj/item/grenade/plastic/update_icon() + +/obj/item/grenade/plastic/update_icon_state() if(nadeassembly) icon_state = "[item_state]1" else icon_state = "[item_state]0" + ////////////////////////// ///// The Explosives ///// ////////////////////////// @@ -145,7 +166,6 @@ location = get_turf(target) // Set the explosion location to turf if planted directly on a wall or floor else location = get_atom_on_turf(target) // Otherwise, make sure we're blowing up what's on top of the turf - target.overlays -= image_overlay else location = get_atom_on_turf(src) if(location) @@ -250,7 +270,7 @@ /obj/item/grenade/plastic/x4/thermite name = "T4" desc = "A wall breaching charge, containing fuel, metal oxide and metal powder mixed in just the right way. One hell of a combination. Effective against walls, ineffective against airlocks..." - det_time = 2 + det_time = 2 SECONDS icon_state = "t4breach0" item_state = "t4breach" @@ -259,7 +279,6 @@ if(target) if(!QDELETED(target)) location = get_turf(target) - target.overlays -= image_overlay else location = get_turf(src) if(location) @@ -268,7 +287,7 @@ if(target && target.density) var/turf/T = get_step(location, aim_dir) for(var/turf/simulated/wall/W in range(1, location)) - W.thermitemelt(speed = 30) + W.thermitemelt(time = 3 SECONDS) addtimer(CALLBACK(GLOBAL_PROC, /proc/explosion, T, 0, 0, 2), 3) addtimer(CALLBACK(smoke, TYPE_PROC_REF(/datum/effect_system/smoke_spread, start)), 3) else @@ -276,7 +295,6 @@ addtimer(CALLBACK(GLOBAL_PROC, /proc/explosion, T, 0, 0, 2), 3) addtimer(CALLBACK(smoke, TYPE_PROC_REF(/datum/effect_system/smoke_spread, start)), 3) - if(isliving(target)) var/mob/living/M = target M.adjust_fire_stacks(2) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 5e41af4e072..602e834f465 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -40,21 +40,34 @@ sprite_name = "miniFE" dog_fashion = null + +/obj/item/extinguisher/Initialize(mapload) + . = ..() + if(!reagents) + create_reagents(max_water) + reagents.add_reagent("water", max_water) + + /obj/item/extinguisher/examine(mob/user) . = ..() . += "The safety is [safety ? "on" : "off"]." -/obj/item/extinguisher/New() - ..() - create_reagents(max_water) - reagents.add_reagent("water", max_water) + +/obj/item/extinguisher/update_icon_state() + icon_state = "[sprite_name][!safety]" + + +/obj/item/extinguisher/update_desc(updates = ALL) + . = ..() + desc = "The safety is [safety ? "on" : "off"]." + + /obj/item/extinguisher/attack_self(mob/user as mob) safety = !safety - src.icon_state = "[sprite_name][!safety]" - src.desc = "The safety is [safety ? "on" : "off"]." + update_appearance(UPDATE_ICON_STATE|UPDATE_DESC) to_chat(user, "The safety is [safety ? "on" : "off"].") - return + /obj/item/extinguisher/attack_obj(obj/O, mob/living/user, params) if(AttemptRefill(O, user)) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index ca0f4756b24..3a02ab76dd3 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -48,21 +48,25 @@ igniter.flamethrower_process(location) -/obj/item/flamethrower/update_icon() - cut_overlays() +/obj/item/flamethrower/update_icon(updates = ALL) + . = ..() + update_equipped_item() + + + +/obj/item/flamethrower/update_icon_state() + item_state = "flamethrower_[lit]" + + +/obj/item/flamethrower/update_overlays() + . = ..() if(igniter) - add_overlay("+igniter[status]") + . += "+igniter[status]" if(ptank) - add_overlay("+ptank") + . += "+ptank" if(lit) - add_overlay("+lit") - item_state = "flamethrower_1" - else - item_state = "flamethrower_0" - if(ismob(loc)) - var/mob/M = loc - M.update_inv_l_hand() - M.update_inv_r_hand() + . += "+lit" + /obj/item/flamethrower/can_enter_storage(obj/item/storage/S, mob/user) if(lit) diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index 132ec7649fa..09b93ee0444 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -19,12 +19,11 @@ strangling = null return ..() -/obj/item/twohanded/garrote/update_icon() +/obj/item/twohanded/garrote/update_icon_state() if(strangling) // If we're strangling someone we want our icon to stay wielded icon_state = "garrot_unwrap" return - - icon_state = "garrot_[wielded ? "un" : ""]wrap" + icon_state = "garrot_[HAS_TRAIT(src, TRAIT_WIELDED) ? "un" : ""]wrap" /obj/item/twohanded/garrote/improvised // Made via tablecrafting name = "garrote" @@ -32,12 +31,11 @@ icon_state = "garrot_I_wrap" improvised = 1 -/obj/item/twohanded/garrote/improvised/update_icon() +/obj/item/twohanded/garrote/improvised/update_icon_state() if(strangling) icon_state = "garrot_I_unwrap" return - - icon_state = "garrot_I_[wielded ? "un" : ""]wrap" + icon_state = "garrot_I_[HAS_TRAIT(src, TRAIT_WIELDED) ? "un" : ""]wrap" /obj/item/twohanded/garrote/unwield(obj/item/source, mob/living/carbon/user) @@ -46,7 +44,7 @@ "You remove the [src] from [strangling]'s neck.") strangling.garroted_by.Remove(src) strangling = null - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) @@ -102,7 +100,7 @@ garrote_time = world.time + 10 START_PROCESSING(SSobj, src) strangling = M - update_icon() + update_icon(UPDATE_ICON_STATE) playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1) @@ -110,19 +108,18 @@ "[U] begins garroting you with the [src]![improvised ? "" : " You are unable to speak!"]", \ "You hear struggling and wire strain against flesh!") - return /obj/item/twohanded/garrote/process() if(!strangling) // Our mark got gibbed or similar - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return if(!istype(loc, /mob/living/carbon/human)) strangling = null - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return @@ -141,7 +138,7 @@ strangling.garroted_by.Remove(src) strangling = null - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return @@ -152,7 +149,7 @@ strangling.garroted_by.Remove(src) strangling = null - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 2291671194d..649897ee351 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -42,7 +42,7 @@ /obj/effect/spresent/attackby(obj/item/W as obj, mob/user as mob, params) ..() - if(!istype(W, /obj/item/wirecutters)) + if(W.tool_behaviour != TOOL_WIRECUTTER) to_chat(user, "I need wirecutters for that.") return diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm index ea2cbc5f6cf..6c954b8c497 100644 --- a/code/game/objects/items/weapons/grenades/bananade.dm +++ b/code/game/objects/items/weapons/grenades/bananade.dm @@ -45,7 +45,7 @@ qdel(I) else to_chat(usr, "The bananade is full, screwdriver it shut to lock it down.") - if(istype(I, /obj/item/screwdriver)) + if(I.tool_behaviour == TOOL_SCREWDRIVER) if(fillamt) var/obj/item/grenade/bananade/G = new /obj/item/grenade/bananade(drop_location()) if(!remove_item_from_storage(user)) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index ffa8a8b4b5f..15fec3a3187 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -25,22 +25,26 @@ var/contained = "" // For logging var/cores = "" // Also for logging -/obj/item/grenade/chem_grenade/New() - ..() + +/obj/item/grenade/chem_grenade/Initialize(mapload) + . = ..() create_reagents(1000) if(payload_name) payload_name += " " // formatting, ignore me update_icon() + /obj/item/grenade/chem_grenade/Destroy() QDEL_NULL(nadeassembly) if (!no_splash) QDEL_LIST(beakers) return ..() + /obj/item/grenade/chem_grenade/examine(mob/user) - . = ..() display_timer = (stage == READY && !nadeassembly) //show/hide the timer based on assembly state + . = ..() + /obj/item/grenade/chem_grenade/proc/get_trigger() if(!nadeassembly) return null @@ -49,21 +53,11 @@ return O return null -/obj/item/grenade/chem_grenade/update_overlays() - underlays = list() - if(nadeassembly) - underlays += "[nadeassembly.a_left.icon_state]_left" - for(var/O in nadeassembly.a_left.attached_overlays) - underlays += "[O]_l" - underlays += "[nadeassembly.a_right.icon_state]_right" - for(var/O in nadeassembly.a_right.attached_overlays) - underlays += "[O]_r" -/obj/item/grenade/chem_grenade/update_icon() +/obj/item/grenade/chem_grenade/update_icon_state() if(nadeassembly) icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = bomb_state - update_overlays() var/obj/item/assembly/A = get_trigger() if(stage != READY) name = "bomb casing[label]" @@ -75,7 +69,6 @@ else icon = 'icons/obj/weapons/grenade.dmi' icon_state = initial(icon_state) - overlays = list() switch(stage) if(EMPTY) name = "grenade casing[label]" @@ -89,12 +82,21 @@ icon_state += "_locked" name = payload_name + "grenade" + label + underlays.Cut() + if(nadeassembly) + underlays += "[nadeassembly.a_left.icon_state]_left" + for(var/O in nadeassembly.a_left.attached_overlays) + underlays += "[O]_l" + underlays += "[nadeassembly.a_right.icon_state]_right" + for(var/O in nadeassembly.a_right.attached_overlays) + underlays += "[O]_r" + /obj/item/grenade/chem_grenade/attack_self(mob/user) if(stage == READY && !active) if(nadeassembly) nadeassembly.attack_self(user) - update_icon() + update_icon(UPDATE_ICON_STATE) else if(clown_check(user)) // This used to go before the assembly check, but that has absolutely zero to do with priming the damn thing. You could spam the admins with it. investigate_log("[key_name_log(usr)] has primed a [name] for detonation [contained].", INVESTIGATE_BOMB) @@ -127,38 +129,9 @@ else if(label) label = null - update_icon() + update_icon(UPDATE_ICON_STATE) to_chat(user, "You remove the label from [src].") return 1 - if(istype(I, /obj/item/screwdriver)) - if(stage == WIRED) - if(beakers.len) - to_chat(user, "You lock the assembly.") - playsound(loc, prime_sound, 25, -3) - stage = READY - update_icon() - contained = "" - cores = "" // clear them out so no recursive logging by accidentally - for(var/obj/O in beakers) - if(!O.reagents) continue - if(istype(O,/obj/item/slime_extract)) - cores += " [O]" - for(var/R in O.reagents.reagent_list) - var/datum/reagent/reagent = R - contained += "[reagent.volume] [reagent], " - if(contained) - if(cores) - contained = "\[[cores]; [contained]\]" - else - contained = "\[ [contained]\]" - add_attack_logs(user, src, "has completed with [contained]", ATKLOG_FEW) - else - to_chat(user, "You need to add at least one beaker before locking the assembly.") - else if(stage == READY && !nadeassembly) - det_time = det_time == 50 ? 30 : 50 //toggle between 30 and 50 - to_chat(user, "You modify the time delay. It's set for [det_time / 10] second\s.") - else if(stage == EMPTY) - to_chat(user, "You need to add an activation mechanism.") else if(stage == WIRED && is_type_in_list(I, allowed_containers)) if(beakers.len == 2) @@ -187,7 +160,7 @@ assemblyattacher = user.ckey stage = WIRED to_chat(user, "You add [A] to [src]!") - update_icon() + update_icon(UPDATE_ICON_STATE) else if(stage == EMPTY && istype(I, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = I @@ -195,14 +168,14 @@ stage = WIRED to_chat(user, "You rig [src].") - update_icon() + update_icon(UPDATE_ICON_STATE) - else if(stage == READY && istype(I, /obj/item/wirecutters)) + else if(stage == READY && I.tool_behaviour == TOOL_WIRECUTTER) to_chat(user, "You unlock the assembly.") stage = WIRED - update_icon() + update_icon(UPDATE_ICON_STATE) - else if(stage == WIRED && istype(I, /obj/item/wrench)) + else if(stage == WIRED && I.tool_behaviour == TOOL_WRENCH) to_chat(user, "You open the grenade and remove the contents.") stage = EMPTY payload_name = null @@ -218,7 +191,47 @@ for(var/obj/O in beakers) O.loc = get_turf(src) beakers = list() - update_icon() + update_icon(UPDATE_ICON_STATE) + + +/obj/item/grenade/chem_grenade/screwdriver_act(mob/living/user, obj/item/I) + if(stage == WIRED) + if(!length(beakers)) + to_chat(user, "You need to add at least one beaker before locking the assembly.") + return TRUE + + to_chat(user, "You lock the assembly.") + playsound(loc, prime_sound, 25, -3) + stage = READY + update_icon(UPDATE_ICON_STATE) + contained = "" + cores = "" // clear them out so no recursive logging by accidentally + for(var/obj/O in beakers) + if(!O.reagents) + continue + if(istype(O, /obj/item/slime_extract)) + cores += " [O]" + for(var/R in O.reagents.reagent_list) + var/datum/reagent/reagent = R + contained += "[reagent.volume] [reagent], " + if(contained) + if(cores) + contained = "\[[cores]; [contained]\]" + else + contained = "\[ [contained]\]" + var/turf/bombturf = get_turf(loc) + add_attack_logs(user, src, "has completed with [contained]", ATKLOG_MOST) + log_game("[key_name(usr)] has completed [name] at [bombturf.x], [bombturf.y], [bombturf.z]. [contained]") + return TRUE + + else if(stage == READY && !nadeassembly) + det_time = det_time == 5 SECONDS ? 3 SECONDS : 5 SECONDS + to_chat(user, "You modify the time delay. It's set for [det_time / 10] second\s.") + return TRUE + + else if(stage == EMPTY) + to_chat(user, "You need to add an activation mechanism.") + return TRUE //assembly stuff @@ -281,7 +294,7 @@ O.forceMove(get_turf(src)) beakers = list() stage = EMPTY - update_icon() + update_icon(UPDATE_ICON_STATE) return if(nadeassembly) @@ -430,8 +443,9 @@ desc = "Used for emergency sealing of air breaches." stage = READY -/obj/item/grenade/chem_grenade/metalfoam/New() - ..() +/obj/item/grenade/chem_grenade/metalfoam/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -441,7 +455,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/firefighting @@ -449,8 +463,9 @@ desc = "Can help to put out dangerous fires from a distance." stage = READY -/obj/item/grenade/chem_grenade/firefighting/New() - ..() +/obj/item/grenade/chem_grenade/firefighting/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -459,15 +474,16 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/incendiary payload_name = "incendiary" desc = "Used for clearing rooms of living things." stage = READY -/obj/item/grenade/chem_grenade/incendiary/New() - ..() +/obj/item/grenade/chem_grenade/incendiary/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) @@ -478,7 +494,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/antiweed @@ -486,8 +502,9 @@ desc = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents." stage = READY -/obj/item/grenade/chem_grenade/antiweed/New() - ..() +/obj/item/grenade/chem_grenade/antiweed/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) @@ -499,7 +516,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/cleaner @@ -507,8 +524,9 @@ desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas." stage = READY -/obj/item/grenade/chem_grenade/cleaner/New() - ..() +/obj/item/grenade/chem_grenade/cleaner/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -518,7 +536,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/teargas @@ -526,8 +544,9 @@ desc = "Used for nonlethal riot control. Contents under pressure. Do not directly inhale contents." stage = READY -/obj/item/grenade/chem_grenade/teargas/New() - ..() +/obj/item/grenade/chem_grenade/teargas/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) @@ -539,15 +558,16 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/facid payload_name = "acid smoke" desc = "Use to chew up opponents from the inside out." stage = READY -/obj/item/grenade/chem_grenade/facid/New() - ..() +/obj/item/grenade/chem_grenade/facid/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) @@ -559,15 +579,16 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/saringas payload_name = "sarin gas" desc = "Contains sarin gas; extremely deadly and fast acting; use with extreme caution." stage = READY -/obj/item/grenade/chem_grenade/saringas/New() - ..() +/obj/item/grenade/chem_grenade/saringas/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -579,7 +600,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) #undef EMPTY #undef WIRED diff --git a/code/game/objects/items/weapons/grenades/custom_grenades.dm b/code/game/objects/items/weapons/grenades/custom_grenades.dm index 3cb0be484b0..41d473d0411 100644 --- a/code/game/objects/items/weapons/grenades/custom_grenades.dm +++ b/code/game/objects/items/weapons/grenades/custom_grenades.dm @@ -39,7 +39,7 @@ payload_name = "holy water" desc = "Then shalt thou count to three, no more, no less." stage = 2 - det_time = 30 + det_time = 3 SECONDS /obj/item/grenade/chem_grenade/holywater/New() ..() @@ -51,7 +51,7 @@ payload_name = "hell water" desc = "And he struck them down with an unholy fury that burn like one-thousands badmins." stage = 2 - det_time = 30 + det_time = 3 SECONDS /obj/item/grenade/chem_grenade/hellwater/New() ..() diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 10488d8e01e..681bb8edf63 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -78,9 +78,8 @@ if(istype(ears)) ears.receive_damage(5) if(ears.damage >= 15) - to_chat(M, "Your ears start to ring badly!") + to_chat(M, span_warning("Your ears start to ring badly!")) if(prob(ears.damage - 5)) - to_chat(M, "You can't hear anything!") - M.BecomeDeaf() + to_chat(M, span_warning("You can't hear anything!")) else if(ears.damage >= 5) - to_chat(M, "Your ears start to ring!") + to_chat(M, span_warning("Your ears start to ring!")) diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index 09ce7f8f6e0..31da0cf28e6 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -12,7 +12,7 @@ flags = CONDUCT slot_flags = SLOT_BELT active = 0 - det_time = 50 + det_time = 5 SECONDS display_timer = 0 var/list/times @@ -20,10 +20,10 @@ ..() overlays += "improvised_grenade_filled" overlays += "improvised_grenade_wired" - times = list("5" = 10, "-1" = 20, "[rand(30, 80)]" = 50, "[rand(65, 180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value] + times = list("5" = 1 SECONDS, "-1" = 2 SECONDS, "[rand(3 SECONDS, 8 SECONDS)]" = 5 SECONDS, "[rand(6.5 SECONDS, 18 SECONDS)]" = 2 SECONDS)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value] det_time = text2num(pickweight(times)) if(det_time < 0) //checking for 'duds' - det_time = rand(30,80) + det_time = rand(3 SECONDS, 8 SECONDS) /obj/item/grenade/iedcasing/CheckParts(list/parts_list) ..() @@ -37,6 +37,11 @@ underlays += can_underlay +/obj/item/grenade/iedcasing/update_overlays() + . = ..() + + + /obj/item/grenade/iedcasing/attack_self(mob/user) // if(!active) if(clown_check(user)) @@ -44,6 +49,7 @@ active = TRUE overlays -= "improvised_grenade_filled" icon_state = initial(icon_state) + "_active" + update_icon() add_fingerprint(user) investigate_log("[key_name_log(user)] has primed a [name] for detonation", INVESTIGATE_BOMB) add_attack_logs(user, src, "has primed for detonation", ATKLOG_FEW) @@ -67,7 +73,7 @@ icon_state = "improvised_satchel" item_state = "plastic-explosive" toolspeed = 1 - det_time = 80 + det_time = 8 SECONDS var/atom/target = null var/image_overlay = null var/planted = FALSE @@ -80,6 +86,17 @@ if(burned_out) . += span_notice("Looks like wick has burned out") + +/obj/item/grenade/iedsatchel/update_icon_state() + if(active) + icon_state = "[initial(icon_state)]_active" + return + if(anchored || burned_out) + icon_state = "[initial(icon_state)]_burned" + return + icon_state = initial(icon_state) + + /obj/item/grenade/iedsatchel/afterattack(atom/T, mob/user, proximity) if(!proximity) return @@ -98,12 +115,12 @@ layer = ABOVE_OBJ_LAYER add_game_logs("planted [src] on [T.name] at [T.loc]", user) - icon_state = initial(icon_state) + "_burned" + update_icon(UPDATE_ICON_STATE) to_chat(user, span_notice("You plant the [src].")) -/obj/item/grenade/iedsatchel/attack_hand(var/mob/user) +/obj/item/grenade/iedsatchel/attack_hand(mob/user) if(anchored) - icon_state = initial(icon_state) + "_burned" + update_icon(UPDATE_ICON_STATE) return ..() @@ -114,7 +131,7 @@ to_chat(user, span_notice("You tickled a makeshift wick made of wires, it looks like it needs to be set on fire.")) /obj/item/grenade/iedsatchel/attackby(obj/item/W, user) - if(active == 1) + if(active) return if(istype(W, /obj/item/lighter)) var/obj/item/lighter/I = W @@ -126,7 +143,7 @@ var/obj/item/match/I = W if(!I.lit) return - trigger() + trigger(user) return if(istype(W, /obj/item/weldingtool)) var/obj/item/weldingtool/I = W @@ -142,17 +159,18 @@ if(I.use(5)) to_chat(user, span_notice("You made a new wick from the cable")) burned_out = FALSE + update_icon(UPDATE_ICON_STATE) return to_chat(user, span_notice("There is not enough cables to make a wick.")) - if(istype(W, /obj/item/wirecutters)) + if(W.tool_behaviour == TOOL_WIRECUTTER) if(!anchored) return pixel_w = 0 pixel_z = 0 to_chat(user, span_notice("You unattached [src].")) - icon_state = "improvised_satchel" layer = TURF_LAYER anchored = FALSE + update_icon(UPDATE_ICON_STATE) target = null /obj/item/grenade/iedsatchel/proc/trigger(mob/user) @@ -160,9 +178,9 @@ to_chat(user, span_notice("There is no wick to ignite [src].")) return var/N = roll(11) - 1 - active = 1 + active = TRUE to_chat(user, span_danger("You ignite wires on [src]!")) - icon_state = initial(icon_state) + "_active" + update_icon(UPDATE_ICON_STATE) add_game_logs("Triggered [name] at [COORD(target)]", user) if(N <= 3) active = 1 @@ -175,10 +193,10 @@ prime() /obj/item/grenade/iedsatchel/proc/prime_fake() - src.visible_message(span_notice("The wires on [src] burned out, but nothing happened.")) - active = 0 + visible_message(span_notice("The wires on [src] burned out, but nothing happened.")) + active = FALSE burned_out = TRUE - icon_state = initial(icon_state) + "_burned" + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/iedsatchel/prime() update_mob() diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 7a02c0a4381..0280830be32 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -12,9 +12,16 @@ slot_flags = SLOT_BELT resistance_flags = FLAMMABLE max_integrity = 40 - var/active = 0 - var/det_time = 50 - var/display_timer = 1 + var/active = FALSE + var/det_time = 5 SECONDS + var/display_timer = TRUE + + +/obj/item/grenade/Destroy() + ///We need to clear the walk_to on destroy to allow a grenade which uses walk_to or related to properly GC + walk_to(src, 0) + return ..() + /obj/item/grenade/deconstruct(disassembled = TRUE) if(!disassembled) @@ -22,65 +29,56 @@ if(!QDELETED(src)) qdel(src) -/obj/item/grenade/proc/clown_check(var/mob/living/user) + +/obj/item/grenade/proc/clown_check(mob/living/user) if((CLUMSY in user.mutations) && prob(50)) - to_chat(user, "Huh? How does this thing work?") - active = 1 - icon_state = initial(icon_state) + "_active" - playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) - spawn(5) - if(user) - user.drop_from_active_hand() - prime() - return 0 - return 1 - - -/*/obj/item/grenade/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) - if(istype(target, /obj/item/storage)) return ..() // Trying to put it in a full container - if(istype(target, /obj/item/gun/grenadelauncher)) return ..() - if((user.is_in_active_hand(src)) && (!active) && (clown_check(user)) && target.loc != src.loc) - to_chat(user, "You prime the [name]! [det_time/10] seconds!") - active = 1 - icon_state = initial(icon_state) + "_active" - playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) - spawn(det_time) - prime() - return - user.dir = get_dir(user, target) - user.drop_from_active_hand() - var/t = (isturf(target) ? target : target.loc) - walk_towards(src, t, 3) - return*/ + to_chat(user, span_warning("Huh? How does this thing work?")) + active = TRUE + update_icon(UPDATE_ICON_STATE) + playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3) + addtimer(CALLBACK(src, PROC_REF(delayed_boom)), 0.5 SECONDS) + return FALSE + return TRUE + + +/obj/item/grenade/proc/delayed_boom(mob/living/user) + if(!QDELETED(user)) + user.drop_item_ground(src) + prime() + + +/obj/item/grenade/update_icon_state() + icon_state = "[initial(icon_state)][active ? "_active" : ""]" /obj/item/grenade/examine(mob/user) . = ..() if(display_timer) if(det_time > 1) - . += "The timer is set to [det_time/10] second\s." + . += span_notice("The timer is set to [det_time/10] second\s.") else - . += "\The [src] is set for instant detonation." - -/obj/item/grenade/attack_self(mob/user as mob) - if(!active) - if(clown_check(user)) - to_chat(user, "You prime the [name]! [det_time/10] seconds!") - active = 1 - icon_state = initial(icon_state) + "_active" - add_fingerprint(user) - var/turf/bombturf = get_turf(src) - message_admins("[key_name_admin(usr)] has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)]") - investigate_log("[key_name_log(usr)] has primed a [name] for detonation", INVESTIGATE_BOMB) - add_attack_logs(user, src, "has primed for detonation", ATKLOG_FEW) - if(iscarbon(user)) - var/mob/living/carbon/C = user - C.throw_mode_on() - spawn(det_time) - prime() + . += span_warning("[src] is set for instant detonation.") + + +/obj/item/grenade/attack_self(mob/user) + if(!active && clown_check(user)) + to_chat(user, "You prime the [name]! [det_time/10] seconds!") + active = TRUE + update_icon(UPDATE_ICON_STATE) + add_fingerprint(user) + var/turf/bombturf = get_turf(src) + message_admins("[key_name_admin(usr)] has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)]") + investigate_log("[key_name_log(usr)] has primed a [name] for detonation", INVESTIGATE_BOMB) + add_attack_logs(user, src, "has primed for detonation", ATKLOG_FEW) + if(iscarbon(user)) + var/mob/living/carbon/c_user = user + c_user.throw_mode_on() + addtimer(CALLBACK(src, PROC_REF(prime)), det_time) /obj/item/grenade/proc/prime(mob/user) + return + /obj/item/grenade/proc/update_mob() if(ismob(loc)) @@ -88,24 +86,25 @@ M.drop_item_ground(src) -/obj/item/grenade/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/screwdriver)) - switch(det_time) - if("1") - det_time = 10 - to_chat(user, "You set the [name] for 1 second detonation time.") - if("10") - det_time = 30 - to_chat(user, "You set the [name] for 3 second detonation time.") - if("30") - det_time = 50 - to_chat(user, "You set the [name] for 5 second detonation time.") - if("50") - det_time = 1 - to_chat(user, "You set the [name] for instant detonation.") - add_fingerprint(user) - ..() +/obj/item/grenade/screwdriver_act(mob/living/user, obj/item/I) + switch(det_time) + if(0.1 SECONDS) + det_time = 1 SECONDS + to_chat(user, span_notice("You set [src] for 1 second detonation time.")) + if(1 SECONDS) + det_time = 3 SECONDS + to_chat(user, span_notice("You set [src] for 3 second detonation time.")) + if(3 SECONDS) + det_time = 5 SECONDS + to_chat(user, span_notice("You set [src] for 5 second detonation time.")) + if(5 SECONDS) + det_time = 0.1 SECONDS + to_chat(user, span_notice("You set [src] for instant detonation.")) + add_fingerprint(user) + return TRUE + /obj/item/grenade/attack_hand() walk(src, null, null) ..() + diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index 715a18e9ca6..eb486c54b09 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -3,7 +3,7 @@ name = "smoke bomb" icon = 'icons/obj/weapons/grenade.dmi' icon_state = "flashbang" - det_time = 20 + det_time = 2 SECONDS item_state = "flashbang" slot_flags = SLOT_BELT var/datum/effect_system/smoke_spread/bad/smoke diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 72a36fdb90b..8b9f985e683 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -51,7 +51,7 @@ if(istype(loc, /obj/item/implanter)) var/obj/item/implanter/implanter = loc implanter.imp = null - implanter.update_icon() + implanter.update_state() if(istype(loc, /obj/item/implantpad)) var/obj/item/implantcase/implantcase = loc implantcase.imp = null @@ -92,15 +92,13 @@ to_chat(user, span_warning("You can't trigger [src] with a custom emote.")) return FALSE - if(!(emote_key in user.usable_emote_keys(trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL))) + var/intentional_cause = (trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL) && !(trigger_causes & BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL) + if(!(emote_key in user.usable_emote_keys(intentional_cause))) if(!silent) - to_chat(user, span_warning("You can't trigger [src] with that emote! Try *help to see emotes you can use.")) + to_chat(user, span_warning("You can't trigger [src] with that emote [intentional_cause ? "intentionally" : "unintentionally"]! Try *help to see emotes you can use.")) return FALSE - if(!(emote_key in user.usable_emote_keys(trigger_causes & BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL))) - CRASH("User was given an bio-chip for an unintentional emote that they can't use.") - - LAZYADD(trigger_emotes, emote_key) + LAZYADDOR(trigger_emotes, emote_key) RegisterSignal(user, COMSIG_MOB_EMOTED(emote_key), PROC_REF(on_emote)) @@ -113,7 +111,7 @@ if(!(intentional && (trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL)) && !(!intentional && (trigger_causes & BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL))) return - add_attack_logs(user, user, "[intentional ? "intentionally" : "unintentionally"] [src] was [intentional ? "intentionally" : "unintentionally"] triggered with the emote [fired_emote].") + add_attack_logs(user, user, "[src] was [intentional ? "intentionally" : "unintentionally"] triggered with the emote [fired_emote].") emote_trigger(key, user, intentional) @@ -136,7 +134,7 @@ death_trigger(source, gibbed) -/obj/item/implant/proc/emote_trigger(emote, mob/source, force) +/obj/item/implant/proc/emote_trigger(emote, mob/source, intentional) return @@ -183,13 +181,13 @@ if(trigger_emotes) if(!(trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL|BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL)) CRASH("Bio-chip [src] has trigger emotes defined but no trigger cause with which to use them!") - if(!activated && (trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL)) + if(activated == BIOCHIP_ACTIVATED_PASSIVE && (trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL)) CRASH("Bio-chip [src] has intentional emote triggers on a passive bio-chip") // If you can't activate the implant manually, you shouldn't be able to deliberately activate it with an emote for(var/emote in trigger_emotes) set_trigger(source, emote, on_implant = TRUE) - if(activated) + if(activated == BIOCHIP_ACTIVATED_ACTIVE) for(var/datum/action/action as anything in actions) action.Grant(source) update_button(action) diff --git a/code/game/objects/items/weapons/implants/implant_sad_trombone.dm b/code/game/objects/items/weapons/implants/implant_sad_trombone.dm index 097324fe1ce..e4868acb04f 100644 --- a/code/game/objects/items/weapons/implants/implant_sad_trombone.dm +++ b/code/game/objects/items/weapons/implants/implant_sad_trombone.dm @@ -8,15 +8,15 @@ implant_state = "implant-honk" -/obj/item/implant/sad_trombone/emote_trigger(emote, mob/source, force) - activate(emote) +/obj/item/implant/sad_trombone/emote_trigger(emote, mob/source, intentional) + activate() /obj/item/implant/sad_trombone/death_trigger(mob/user, gibbed) - activate(gibbed) + activate() -/obj/item/implant/sad_trombone/activate() +/obj/item/implant/sad_trombone/activate(cause) playsound(loc, 'sound/misc/sadtrombone.ogg', 50, FALSE) diff --git a/code/game/objects/items/weapons/implants/implant_stealth.dm b/code/game/objects/items/weapons/implants/implant_stealth.dm index 7fe0ed65984..5ac03283359 100644 --- a/code/game/objects/items/weapons/implants/implant_stealth.dm +++ b/code/game/objects/items/weapons/implants/implant_stealth.dm @@ -155,7 +155,8 @@ qdel(src) -/obj/structure/closet/cardboard/agent/update_icon() // When the box is opened, it's deleted, so we never need to update this. +// When the box is opened, it's deleted, so we never need to update this. +/obj/structure/closet/cardboard/agent/update_icon_state() return diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 5c50ffdd780..5d610eb97a4 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -36,15 +36,13 @@ origin_tech = initial(origin_tech) flags = initial(flags) reagents = null - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/item/implantcase/update_icon() - ..() - cut_overlays() +/obj/item/implantcase/update_overlays() + . = ..() if(imp) - var/image/implant_overlay = image('icons/obj/implants.dmi', imp.implant_state) - add_overlay(implant_overlay) + . += image('icons/obj/implants.dmi', imp.implant_state) /obj/item/implantcase/attackby(obj/item/I, mob/user) @@ -58,7 +56,8 @@ implater.imp.forceMove(src) imp = implater.imp implater.imp = null - implater.update_icon() + update_state() + implater.update_state() else if(imp) if(implater.imp) @@ -66,8 +65,8 @@ imp.forceMove(implater) implater.imp = imp imp = null - implater.update_icon() - update_state() + update_state() + implater.update_state() else return ..() diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 63de271a625..f11a3e75097 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -33,12 +33,8 @@ LAZYADD(implants_list, bio_chip) -/obj/machinery/implantchair/update_icon() - . = ..() - if(occupant) - icon_state = "implantchair_on" - else - icon_state = "implantchair" +/obj/machinery/implantchair/update_icon_state() + icon_state = "implantchair[occupant ? "_on" : ""]" /obj/machinery/implantchair/attack_hand(mob/user) @@ -124,7 +120,7 @@ return FALSE -/obj/machinery/implantchair/MouseDrop_T(mob/living/carbon/human/dropping, mob/living/user) +/obj/machinery/implantchair/MouseDrop_T(mob/living/carbon/human/dropping, mob/living/user, params) return put_mob(dropping, user) @@ -136,7 +132,7 @@ target.forceMove(src) occupant = target add_fingerprint(user) - update_icon() + update_icon(UPDATE_ICON_STATE) updateUsrDialog() return TRUE @@ -178,7 +174,7 @@ occupant.forceMove(loc) add_fingerprint(user) occupant = null - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 418fb1321fa..1cc51f73a03 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -18,7 +18,7 @@ . = ..() if(ispath(imp, /obj/item/implant)) imp = new imp(src) - update_icon() + update_state() /obj/item/implanter/Destroy() @@ -26,13 +26,13 @@ return ..() -/obj/item/implanter/update_icon() - if(imp) - icon_state = "implanter1" - origin_tech = imp.origin_tech - else - icon_state = "implanter0" - origin_tech = initial(origin_tech) +/obj/item/implanter/proc/update_state() + origin_tech = imp ? imp.origin_tech : initial(origin_tech) + update_icon(UPDATE_ICON_STATE) + + +/obj/item/implanter/update_icon_state() + icon_state = "implanter[imp ? "1" : "0"]" /obj/item/implanter/attack(mob/living/carbon/target, mob/user) @@ -50,7 +50,7 @@ else target.visible_message("[user] has implanted [target].", span_notice("[user] bio-chips you.")) imp = null - update_icon() + update_state() /obj/item/implanter/attackby(obj/item/I, mob/user, params) diff --git a/code/game/objects/items/weapons/implants/implantfluff.dm b/code/game/objects/items/weapons/implants/implantfluff.dm index db189b35b4a..86d1865dbbd 100644 --- a/code/game/objects/items/weapons/implants/implantfluff.dm +++ b/code/game/objects/items/weapons/implants/implantfluff.dm @@ -151,13 +151,6 @@ function = "Plays a sad trombone noise upon death of the implantee, allows clowns to entertain the crew even post-mortem." -/datum/implant_fluff/pathfinder - name = "Paizo Productions 5-E Pathfinder Implant" - life = "Lasts 2-12 months. Known to fail at the worst possible time, space radation may be a factor." - notes = "By use of an internal private GPS signal, allows the pathfinder module to have the MODsuit find the user. Also wirelessly transfers ID information to the suit, to allow doors to open." - function = "Allows for the recall of a Modular Outerwear Device by the implant owner at any time." - - /datum/implant_fluff/stealth name = "Syndicate S3 \"Stealth\" Bio-chip" life = "Unknown. No collected sample has been active long enough to determine lifespan." diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index a14bcaeb9d6..75adb54aa87 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -17,11 +17,8 @@ return ..() -/obj/item/implantpad/update_icon() - if(case) - icon_state = "implantpad-on" - else - icon_state = "implantpad-off" +/obj/item/implantpad/update_icon_state() + icon_state = "implantpad-[case ? "on" : "off"]" /obj/item/implantpad/attack_self(mob/user) @@ -43,7 +40,7 @@ return user.drop_transfer_item_to_loc(new_case, src) case = new_case - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/implantpad/proc/eject_case(mob/user) @@ -57,7 +54,7 @@ case.add_fingerprint(user) case = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/implantpad/AltClick(mob/living/user) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 992b04842f7..d72f997ab0b 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -293,17 +293,20 @@ drop_sound = 'sound/items/handling/bone_drop.ogg' var/size + /obj/item/kitchen/knife/glassshiv/Initialize(mapload, obj/item/shard/sh) . = ..() if(sh) size = sh.icon_state - update_icon() - -/obj/item/kitchen/knife/glassshiv/update_icon() if(!size) size = pick("large", "medium", "small") + update_icon(UPDATE_ICON_STATE) + + +/obj/item/kitchen/knife/glassshiv/update_icon_state() icon_state = "[size]_[initial(icon_state)]" + /obj/item/kitchen/knife/glassshiv/plasma name = "plasma glass shiv" desc = "A plasma glass shard with some cloth wrapped around it" diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index e18f2c03c14..dd7ccbd9968 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -42,11 +42,16 @@ return BRUTELOSS +/obj/item/restraints/legcuffs/beartrap/update_icon_state() + icon_state = "[initial(icon_state)][armed]" + + + /obj/item/restraints/legcuffs/beartrap/attack_self(mob/user) ..() if(ishuman(user) && !user.stat && !user.restrained()) armed = !armed - icon_state = "[initial(icon_state)][armed]" + update_icon(UPDATE_ICON_STATE) to_chat(user, span_notice("[src] is now [armed ? "armed" : "disarmed"]")) @@ -116,7 +121,7 @@ return armed = FALSE - icon_state = "[initial(icon_state)][armed]" + update_icon(UPDATE_ICON_STATE) playsound(src.loc, 'sound/effects/snap.ogg', 50, TRUE) moving_thing.visible_message(span_danger("[moving_thing] triggers [src]."), span_userdanger("You trigger [src]!")) @@ -185,6 +190,11 @@ RegisterSignal(src, COMSIG_CARBON_TOGGLE_THROW, PROC_REF(spin_up_wrapper)) +/obj/item/restraints/legcuffs/bola/update_icon_state() + item_state = spinning ? "[initial(item_state)]_spin" : initial(item_state) + update_equipped_item() + + /obj/item/restraints/legcuffs/bola/proc/spin_up_wrapper(datum/source, throw_mode_state) // so that signal handler works SIGNAL_HANDLER if(throw_mode_state) // if we actually turned throw mode on @@ -196,8 +206,7 @@ return var/mob/living/owner = loc // can only be called if the mob is holding the bola. spinning = TRUE - item_state = "[initial(item_state)]_spin" - owner.update_inv_hands() + update_icon(UPDATE_ICON_STATE) playsound(owner, spin_sound, 30, list(38000, 48000), SHORT_RANGE_SOUND_EXTRARANGE) spin_timer_id = addtimer(CALLBACK(src, PROC_REF(spin_loop), owner), 1 SECONDS, TIMER_UNIQUE|TIMER_LOOP|TIMER_STOPPABLE|TIMER_DELETE_ME) do_spin_cycle(owner) @@ -244,10 +253,9 @@ /obj/item/restraints/legcuffs/bola/proc/reset_values(mob/living/user) throw_range = initial(throw_range) throw_speed = initial(throw_speed) - item_state = initial(item_state) spin_cycle = 0 spinning = FALSE - user?.update_inv_hands() + update_icon(UPDATE_ICON_STATE) if(spin_timer_id) deltimer(spin_timer_id) diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index d4d3126cab5..02c8dbf7c05 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -280,6 +280,7 @@ pickup_sound = 'sound/items/handling/generic_small_pickup.ogg' drop_sound = 'sound/items/handling/generic_small_drop.ogg' + /obj/item/match/process() var/turf/location = get_turf(src) smoketime-- @@ -287,50 +288,65 @@ matchburnout() if(location) location.hotspot_expose(700, 5) - return + /obj/item/match/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) ..() matchignite() + /obj/item/match/extinguish_light(force = FALSE) if(!force) return matchburnout() + +/obj/item/match/update_icon_state() + icon_state = lit ? "match_lit" : "match_burnt" + item_state = lit ? "cigon" : "cigoff" + + +/obj/item/match/update_name(updates = ALL) + . = ..() + var/init_name = initial(name) + name = lit ? "lit [init_name]" : burnt ? "burnt [init_name]" : initial(name) + + +/obj/item/match/update_desc(updates = ALL) + . = ..() + var/init_name = initial(name) + desc = lit ? "A [init_name]. This one is lit." : burnt ? "A [init_name]. This one has seen better days." : initial(desc) + + /obj/item/match/proc/matchignite() if(!lit && !burnt) lit = TRUE - icon_state = "match_lit" - damtype = "fire" + damtype = FIRE force = 3 hitsound = 'sound/weapons/tap.ogg' - item_state = "cigon" - name = "lit match" - desc = "A match. This one is lit." attack_verb = list("burnt","singed") START_PROCESSING(SSobj, src) - update_icon() + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) return TRUE + /obj/item/match/proc/matchburnout() if(lit) lit = FALSE burnt = TRUE - damtype = "brute" + damtype = BRUTE force = initial(force) - icon_state = "match_burnt" - item_state = "cigoff" - name = "burnt match" - desc = "A match. This one has seen better days." attack_verb = list("flicked") STOP_PROCESSING(SSobj, src) + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) return TRUE + /obj/item/match/dropped(mob/user, silent = FALSE) matchburnout() . = ..() + /obj/item/match/attack(mob/living/carbon/M, mob/living/carbon/user) if(!isliving(M)) return ..() @@ -359,6 +375,7 @@ else ..() + /obj/item/match/decompile_act(obj/item/matter_decompiler/C, mob/user) if(burnt) C.stored_comms["wood"] += 1 @@ -366,20 +383,24 @@ return TRUE return ..() + /obj/item/proc/help_light_cig(mob/living/M) var/mask_item = M.get_item_by_slot(slot_wear_mask) if(istype(mask_item, /obj/item/clothing/mask/cigarette)) return mask_item + /obj/item/match/firebrand name = "firebrand" desc = "An unlit firebrand. It makes you wonder why it's not just called a stick." smoketime = 20 //40 seconds -/obj/item/match/firebrand/New() - ..() + +/obj/item/match/firebrand/Initialize(mapload) + . = ..() matchignite() + /obj/item/match/unathi name = "small blaze" desc = "A little flame of your own, currently located dangerously in your mouth." @@ -391,16 +412,24 @@ lit = TRUE w_class = WEIGHT_CLASS_BULKY //to prevent it going to pockets + /obj/item/match/unathi/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) + +/obj/item/match/unathi/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) + return // we are already burning + + /obj/item/match/unathi/matchburnout() if(!lit) return lit = FALSE //to avoid a qdel loop qdel(src) + /obj/item/match/unathi/Destroy() . = ..() STOP_PROCESSING(SSobj, src) + diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index d6caf9caf68..4357fb33819 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -38,6 +38,21 @@ "[user] is falling on the [name]! It looks like [user.p_theyre()] trying to commit suicide.")) return BRUTELOSS|FIRELOSS + +/obj/item/melee/energy/update_icon_state() + if(!active) + icon_state = initial(icon_state) + set_light(0) + return + if(icon_state_on) + icon_state = icon_state_on + set_light(brightness_on, l_color = item_color ? colormap[item_color] : null) + else + icon_state = "sword[item_color]" + set_light(brightness_on, l_color = colormap[item_color]) + update_equipped_item() + + /obj/item/melee/energy/attack_self(mob/living/carbon/user) if((CLUMSY in user.mutations) && prob(50)) to_chat(user, "You accidentally cut yourself with [src], like a doofus!") @@ -48,14 +63,6 @@ throwforce = throwforce_on hitsound = 'sound/weapons/blade1.ogg' throw_speed = 4 - if(attack_verb_on.len) - attack_verb = attack_verb_on - if(icon_state_on) - icon_state = icon_state_on - set_light(brightness_on, l_color = item_color ? colormap[item_color] : null) - else - icon_state = "sword[item_color]" - set_light(brightness_on, l_color=colormap[item_color]) w_class = w_class_on playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness to_chat(user, "[src] is now active.") @@ -66,17 +73,12 @@ throw_speed = initial(throw_speed) if(attack_verb_on.len) attack_verb = list() - icon_state = initial(icon_state) w_class = initial(w_class) playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) //changed it from 50% volume to 35% because deafness - set_light(0) to_chat(user, "[src] can now be concealed.") - if(istype(user,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = user - H.update_inv_l_hand() - H.update_inv_r_hand() add_fingerprint(user) - return + update_icon(UPDATE_ICON_STATE) + /obj/item/melee/energy/axe name = "energy axe" @@ -119,7 +121,7 @@ origin_tech = "combat=3;magnets=4;syndicate=4" block_chance = 50 sharp = 1 - var/hacked = 0 + var/hacked = FALSE /obj/item/melee/energy/sword/New() ..() @@ -201,32 +203,24 @@ user.adjustBrainLoss(10) else to_chat(user, "You attach the ends of the two energy swords, making a single double-bladed weapon! You're cool.") - var/obj/item/twohanded/dualsaber/newSaber = new /obj/item/twohanded/dualsaber(drop_location()) - if(src.hacked) // That's right, we'll only check the "original" esword. - newSaber.hacked = 1 - newSaber.item_color = "rainbow" + var/obj/item/twohanded/dualsaber/newSaber = new(drop_location()) + if(hacked) // That's right, we'll only check the "original" esword. + newSaber.hacked = TRUE + newSaber.blade_color = "rainbow" user.temporarily_remove_item_from_inventory(W) user.temporarily_remove_item_from_inventory(src) qdel(W) qdel(src) user.put_in_hands(newSaber, ignore_anim = FALSE) - else if(istype(W, /obj/item/multitool)) - if(hacked == 0) - hacked = 1 - item_color = "rainbow" - to_chat(user, "RNBW_ENGAGE") - - if(active) - icon_state = "swordrainbow" - // Updating overlays, copied from welder code. - // I tried calling attack_self twice, which looked cool, except it somehow didn't update the overlays!! - if(user.r_hand == src) - user.update_inv_r_hand() - else if(user.l_hand == src) - user.update_inv_l_hand() - - else + else if(W.tool_behaviour == TOOL_MULTITOOL) + if(hacked) to_chat(user, "It's already fabulous!") + return + + hacked = TRUE + item_color = "rainbow" + to_chat(user, "RNBW_ENGAGE") + update_icon(UPDATE_ICON_STATE) /obj/item/melee/energy/sword/saber/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) @@ -337,12 +331,6 @@ throw_speed = 4 if(attack_verb_on.len) attack_verb = attack_verb_on - if(icon_state_on) - icon_state = icon_state_on - set_light(brightness_on, l_color = item_color ? colormap[item_color] : null) - else - icon_state = "sword[item_color]" - set_light(brightness_on, l_color=colormap[item_color]) w_class = w_class_on playsound(user, 'sound/magic/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000)) to_chat(user, "You open [src]. It will now cleave enemies in a wide arc and deal additional damage to fauna.") @@ -353,17 +341,10 @@ throw_speed = initial(throw_speed) if(attack_verb_on.len) attack_verb = list() - icon_state = initial(icon_state) w_class = initial(w_class) playsound(user, 'sound/magic/fellowship_armory.ogg', 35, 1) //changed it from 50% volume to 35% because deafness - set_light(0) to_chat(user, "You close [src]. It will now attack rapidly and cause fauna to bleed.") - - if(ishuman(user)) - var/mob/living/carbon/human/H = user - H.update_inv_l_hand() - H.update_inv_r_hand() - + update_icon(UPDATE_ICON_STATE) add_fingerprint(user) /obj/item/melee/energy/cleaving_saw/examine(mob/user) diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 60a67ff64ee..e19f946512c 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -92,12 +92,19 @@ icon = 'icons/obj/lightning.dmi' icon_state = "lightning" desc = "test lightning" + var/angle -/obj/item/lightning/New() - ..() + +/obj/item/lightning/Initialize(mapload) + . = ..() icon_state = "1" -/obj/item/lightning/afterattack(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, flag, params) + +/obj/item/lightning/update_icon_state() + icon_state = "[angle]" + + +/obj/item/lightning/afterattack(atom/A, mob/living/user, flag, params) var/angle = get_angle(A, user) //to_chat(world, angle) angle = round(angle) + 45 @@ -108,9 +115,7 @@ if(!angle) angle = 1 - //to_chat(world, "adjusted [angle]") - icon_state = "[angle]" - //to_chat(world, "[angle] [(get_dist(user, A) - 1)]") + update_icon(UPDATE_ICON_STATE) user.Beam(A, "lightning", 'icons/obj/zap.dmi', 50, 15) /obj/item/newton diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 5593fe302d7..f4b6aa1dcfc 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -24,16 +24,20 @@ GLOB.janitorial_equipment -= src return ..() -/obj/item/mop/proc/wet_mop(obj/o, mob/user) - if(o.reagents.total_volume < 1) - to_chat(user, "[o] is out of water!") - if(!istype(o, /obj/item/reagent_containers/glass/bucket)) - janicart_insert(user, o) + +/obj/item/mop/proc/wet_mop(obj/target, mob/user) + if(target.reagents.total_volume < 1) + to_chat(user, "[target] is out of water!") + if(istype(target, /obj/structure/mopbucket)) + mopbucket_insert(user, target) + if(!istype(target, /obj/item/reagent_containers/glass/bucket)) + janicart_insert(user, target) return - o.reagents.trans_to(src, 5) - to_chat(user, "You wet [src] in [o].") - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + target.reagents.trans_to(src, 5) + to_chat(user, "You wet [src] in [target].") + playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE) + /obj/item/mop/proc/clean(turf/simulated/A) if(reagents.has_reagent("water", 1) || reagents.has_reagent("cleaner", 1) || reagents.has_reagent("holywater", 1)) @@ -69,10 +73,16 @@ else return ..() -/obj/item/mop/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J) - J.put_in_cart(src, user) - J.mymop=src - J.update_icon() + +/obj/item/mop/proc/janicart_insert(mob/user, obj/structure/janitorialcart/cart) + cart.mymop = src + cart.put_in_cart(src, user) + + +/obj/item/mop/proc/mopbucket_insert(mob/user, obj/structure/mopbucket/bucket) + bucket.mymop = src + bucket.put_in_cart(src, user) + /obj/item/mop/wash(mob/user, atom/source) reagents.add_reagent("water", 5) diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index 30c97a48fa7..93a1cd0acd6 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -182,14 +182,14 @@ return to_chat(user, span_notice("You hook [thetank] up to [src].")) tank = thetank - update_icons() + update_icon(UPDATE_OVERLAYS) + + +/obj/item/pneumatic_cannon/update_overlays() + . = ..() + if(tank) + . += "[tank.icon_state]" -/obj/item/pneumatic_cannon/proc/update_icons() - overlays.Cut() - if(!tank) - return - overlays += image('icons/obj/weapons/pneumaticCannon.dmi', "[tank.icon_state]") - update_icon() #undef LOW_PRESSURE #undef MID_PRESSURE diff --git a/code/game/objects/items/weapons/pneumaticRifle.dm b/code/game/objects/items/weapons/pneumaticRifle.dm index 81992d550e4..01ed69bfabb 100644 --- a/code/game/objects/items/weapons/pneumaticRifle.dm +++ b/code/game/objects/items/weapons/pneumaticRifle.dm @@ -65,7 +65,7 @@ to_chat(user, span_notice("You strapped [src], so now you can wear it on your back")) isBelted = TRUE slot_flags |= SLOT_BACK - update_icons() + update_icon(UPDATE_OVERLAYS) return else to_chat(user, span_warning("[src] is already strapped!")) @@ -166,7 +166,7 @@ return to_chat(user, span_notice("You hook [thetank] up to [src].")) tank = thetank - update_icons() + update_icon(UPDATE_OVERLAYS) /datum/crafting_recipe/pneumatic_rifle name = "Pneumatic Rifle" @@ -181,10 +181,11 @@ category = CAT_WEAPONRY subcategory = CAT_WEAPON -/obj/item/gun/pneumatic_rifle/proc/update_icons() - overlays.Cut() + +/obj/item/gun/pneumatic_rifle/update_overlays() + . = ..() if(tank) - overlays += image('icons/obj/weapons/pneumaticRifle.dmi', "[tank.icon_state]") + . += "[tank.icon_state]" if(isBelted) - overlays += image('icons/obj/weapons/pneumaticRifle.dmi', "belt") - update_icon() + . += "belt" + diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm index def5938bfd3..add53a5ba3c 100644 --- a/code/game/objects/items/weapons/rpd.dm +++ b/code/game/objects/items/weapons/rpd.dm @@ -16,7 +16,7 @@ icon_state = "rpd" opacity = 0 density = 0 - anchored = 0 + anchored = FALSE flags = CONDUCT force = 10 throwforce = 10 diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 7e8fb75cb2e..cc0f5e69a7d 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -37,7 +37,7 @@ attack_verb = list("shoved", "bashed") var/cooldown = 0 //shield bash cooldown. based on world.time -/obj/item/shield/riot/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/shield/riot/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/melee/baton)) if(cooldown < world.time - 25) user.visible_message("[user] bashes [src] with [W]!") @@ -130,14 +130,14 @@ add_fingerprint(user) return -/obj/item/shield/energy/update_icon() +/obj/item/shield/energy/update_icon_state() icon_state = "eshield[active]" /obj/item/shield/energy/syndie icon_state = "syndieshield0" desc = "Reverse-engineered shield that reflects almost all energy projectiles, but is useless against physical attacks. It can be retracted, expanded, and stored anywhere. Property of Gorlex marauders." -/obj/item/shield/energy/syndie/update_icon() +/obj/item/shield/energy/syndie/update_icon_state() icon_state = "syndieshield[active]" /obj/item/shield/riot/tele @@ -160,9 +160,14 @@ return ..() return FALSE + +/obj/item/shield/riot/tele/update_icon_state() + icon_state = "teleriot[active]" + + /obj/item/shield/riot/tele/attack_self(mob/living/user) active = !active - icon_state = "teleriot[active]" + update_icon(UPDATE_ICON_STATE) playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1) if(active) @@ -179,9 +184,6 @@ w_class = WEIGHT_CLASS_NORMAL slot_flags = null to_chat(user, "[src] can now be concealed.") - if(istype(user,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = user - H.update_inv_l_hand() - H.update_inv_r_hand() + update_equipped_item() add_fingerprint(user) - return + diff --git a/code/game/objects/items/weapons/spacechips.dm b/code/game/objects/items/weapons/spacechips.dm index b33ec81a7fe..f84f9478631 100644 --- a/code/game/objects/items/weapons/spacechips.dm +++ b/code/game/objects/items/weapons/spacechips.dm @@ -15,8 +15,7 @@ merge_type = /obj/item/stack/spacechips -/obj/item/stack/spacechips/update_icon()//changes icon depending on the amount of chips - ..() +/obj/item/stack/spacechips/update_icon_state()//changes icon depending on the amount of chips name = "[amount == max_amount ? "1000000" : amount] Chip[amount > 1 ? "s" : ""]" if(amount >= 1 && amount <= 20) icon_state = "c20" @@ -31,6 +30,7 @@ else icon_state = "c1000" + /obj/item/stack/spacechips/c10 amount = 10 diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm index 3c0a03d3785..edf7cdadb62 100644 --- a/code/game/objects/items/weapons/staff.dm +++ b/code/game/objects/items/weapons/staff.dm @@ -19,37 +19,38 @@ icon_state = "broom" item_state = "broom0" + +/obj/item/twohanded/staff/broom/update_icon_state() + item_state = "broom[HAS_TRAIT(src, TRAIT_WIELDED)]" + update_equipped_item() + + /obj/item/twohanded/staff/broom/wield(obj/item/source, mob/living/carbon/user) - item_state = "broom[wielded ? 1 : 0]" - force = wielded ? 5 : 3 - attack_verb = wielded ? list("rammed into", "charged at") : list("bludgeoned", "whacked", "cleaned") - if(user) - user.update_inv_l_hand() - user.update_inv_r_hand() - if(user.mind in SSticker.mode.wizards) - user.flying = wielded ? 1 : 0 - if(wielded) - to_chat(user, "You hold \the [src] between your legs.") - user.say("QUID 'ITCH") - animate(user, pixel_y = pixel_y + 10 , time = 10, loop = 1, easing = SINE_EASING) - else - animate(user, pixel_y = pixel_y + 10 , time = 1, loop = 1) - animate(user, pixel_y = pixel_y, time = 10, loop = 1, easing = SINE_EASING) - animate(user) - if(user.lying)//aka. if they have just been stunned - user.pixel_y -= 6 - else - if(wielded) - to_chat(user, "You hold \the [src] between your legs.") + force = 5 + attack_verb = list("rammed into", "charged at") + if(!user) + return + + update_icon(UPDATE_ICON_STATE) + if(user.mind && (user.mind in SSticker.mode.wizards)) + user.flying = TRUE + user.float(TRUE) + user.say("QUID 'ITCH") + animate(user, pixel_y = pixel_y + 10 , time = 10, loop = 1, easing = SINE_EASING) + + to_chat(user, "You hold \the [src] between your legs.") /obj/item/twohanded/staff/broom/unwield(obj/item/source, mob/living/carbon/user) + update_icon(UPDATE_ICON_STATE) + force = 3 + attack_verb = list("bludgeoned", "whacked", "cleaned") user.flying = FALSE user.update_gravity(user.mob_has_gravity()) animate(user) -/obj/item/twohanded/staff/broom/attackby(var/obj/O, mob/user) +/obj/item/twohanded/staff/broom/attackby(obj/O, mob/user) if(istype(O, /obj/item/clothing/mask/horsehead)) new/obj/item/twohanded/staff/broom/horsebroom(get_turf(src)) user.temporarily_remove_item_from_inventory(O) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 9d6fcad5899..1da6a104916 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -110,7 +110,8 @@ max_w_class = WEIGHT_CLASS_NORMAL max_combined_w_class = 400 // can store a ton of shit! -/obj/item/storage/backpack/santabag/update_icon() + +/obj/item/storage/backpack/santabag/update_icon_state() var/items_count = length(contents) switch(items_count) if(1 to 10) @@ -120,10 +121,8 @@ if(21 to INFINITY) icon_state = "giftbag2" - if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - H.update_inv_l_hand() - H.update_inv_r_hand() + update_equipped_item() + /obj/item/storage/backpack/cultpack name = "trophy rack" @@ -413,14 +412,14 @@ level = 1 cant_hold = list(/obj/item/storage/backpack/satchel_flat) //muh recursive backpacks -/obj/item/storage/backpack/satchel_flat/hide(var/intact) +/obj/item/storage/backpack/satchel_flat/hide(intact) if(intact) - invisibility = INVISIBILITY_ABSTRACT - anchored = 1 //otherwise you can start pulling, cover it, and drag around an invisible backpack. + invisibility = INVISIBILITY_MAXIMUM + anchored = TRUE //otherwise you can start pulling, cover it, and drag around an invisible backpack. icon_state = "[initial(icon_state)]2" else invisibility = initial(invisibility) - anchored = 0 + anchored = FALSE icon_state = initial(icon_state) /obj/item/storage/backpack/satchel_flat/populate_contents() diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index df8f52adbeb..8344ed4bd03 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -49,8 +49,9 @@ playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1) return TOXLOSS -/obj/item/storage/bag/trash/update_icon() - switch(contents.len) + +/obj/item/storage/bag/trash/update_icon_state() + switch(length(contents)) if(21 to INFINITY) icon_state = "[initial(icon_state)]3" if(11 to 20) @@ -59,11 +60,8 @@ icon_state = "[initial(icon_state)]1" else icon_state = "[initial(icon_state)]" - if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - H.update_inv_l_hand() - H.update_inv_r_hand() - ..() + update_equipped_item() + /obj/item/storage/bag/trash/cyborg @@ -451,18 +449,12 @@ if(prob(10)) M.Weaken(4 SECONDS) -/obj/item/storage/bag/tray/proc/rebuild_overlays() - overlays.Cut() - for(var/obj/item/I in contents) - overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1) -/obj/item/storage/bag/tray/remove_from_storage(obj/item/W, atom/new_location) - ..() - rebuild_overlays() +/obj/item/storage/bag/tray/update_overlays() + . = ..() + for(var/obj/item/item in contents) + . += image(icon = item.icon, icon_state = item.icon_state, layer = -1, pixel_x = rand(-4,4), pixel_y = rand(-4,4)) -/obj/item/storage/bag/tray/handle_item_insertion(obj/item/I, prevent_warning = 0) - overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1) - ..() /obj/item/storage/bag/tray/cyborg @@ -482,8 +474,6 @@ else // they clicked on a table dropspot = target.loc - overlays = null - var/droppedSomething = 0 for(var/obj/item/I in contents) @@ -502,18 +492,19 @@ user.visible_message("[user] unloads [user.p_their()] service tray.") else user.visible_message("[user] drops all the items on [user.p_their()] tray.") - + update_icon(UPDATE_OVERLAYS) return ..() /obj/item/storage/bag/tray/cookies_tray var/cookie = /obj/item/reagent_containers/food/snacks/cookie + /obj/item/storage/bag/tray/cookies_tray/populate_contents() /// By Azule Utama, thank you a lot! for(var/i in 1 to 6) var/obj/item/C = new cookie(src) handle_item_insertion(C) // Done this way so the tray actually has the cookies visible when spawned - rebuild_overlays() + /obj/item/storage/bag/tray/cookies_tray/sugarcookie cookie = /obj/item/reagent_containers/food/snacks/sugarcookie @@ -560,18 +551,11 @@ M.Weaken(4 SECONDS) -/obj/item/storage/bag/dangertray/proc/rebuild_overlays() - overlays.Cut() - for(var/obj/item/I in contents) - overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1) - -/obj/item/storage/bag/dangertray/remove_from_storage(obj/item/W, atom/new_location) - ..() - rebuild_overlays() +/obj/item/storage/bag/dangertray/update_overlays() + . = ..() + for(var/obj/item/item in contents) + . += image(icon = item.icon, icon_state = item.icon_state, layer = -1, pixel_x = rand(-4,4), pixel_y = rand(-4,4)) -/obj/item/storage/bag/dangertray/handle_item_insertion(obj/item/I, prevent_warning = 0) - overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1) - ..() /* * Chemistry bag diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index bb506aef1e3..95396f4a984 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -7,6 +7,7 @@ lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi' slot_flags = SLOT_BELT + flags_2 = BLOCKS_LIGHT_2 attack_verb = list("whipped", "lashed", "disciplined") max_integrity = 300 pickup_sound = 'sound/items/handling/backpack_pickup.ogg' @@ -14,13 +15,16 @@ drop_sound = 'sound/items/handling/backpack_drop.ogg' var/use_item_overlays = FALSE // Do we have overlays for items held inside the belt? -/obj/item/storage/belt/update_icon() - if(use_item_overlays) - overlays.Cut() - for(var/obj/item/I in contents) - if(I.belt_icon) - overlays += "[I.belt_icon]" - ..() + +/obj/item/storage/belt/update_overlays() + . = ..() + if(!use_item_overlays) + return + for(var/obj/item/item in contents) + if(!item.belt_icon) + continue + . += mutable_appearance(icon, item.belt_icon, color = item.color) + /obj/item/storage/belt/proc/can_use() return is_equipped() @@ -450,6 +454,12 @@ new /obj/item/grenade/plastic/x4/thermite(src) new /obj/item/storage/pill_bottle/sovietstimulants(src) +/obj/item/storage/belt/military/assault/gammaert/full/populate_contents() + new /obj/item/storage/pouch/fast(src) + new /obj/item/storage/pouch/fast(src) + new /obj/item/storage/pouch/fast(src) + new /obj/item/melee/classic_baton/telescopic(src) + /obj/item/storage/belt/janitor name = "janibelt" desc = "A belt used to hold most janitorial supplies." @@ -501,21 +511,16 @@ /obj/item/storage/belt/lazarus/Initialize(mapload) . = ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/item/storage/belt/lazarus/update_icon() - ..() +/obj/item/storage/belt/lazarus/update_icon_state() icon_state = "[initial(icon_state)]_[length(contents)]" /obj/item/storage/belt/lazarus/attackby(obj/item/W, mob/user) var/amount = length(contents) . = ..() if(amount != length(contents)) - update_icon() - -/obj/item/storage/belt/lazarus/remove_from_storage(obj/item/W, atom/new_location) - ..() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/storage/belt/bandolier name = "bandolier" @@ -544,19 +549,14 @@ new /obj/item/ammo_casing/shotgun/beanbag/fake(src) update_icon() -/obj/item/storage/belt/bandolier/update_icon() - ..() +/obj/item/storage/belt/bandolier/update_icon_state() icon_state = "[initial(icon_state)]_[length(contents)]" /obj/item/storage/belt/bandolier/attackby(obj/item/W, mob/user) var/amount = length(contents) . = ..() if(amount != length(contents)) - update_icon() - -/obj/item/storage/belt/bandolier/remove_from_storage(obj/item/W, atom/new_location) - ..() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/storage/belt/holster name = "shoulder holster" @@ -695,16 +695,14 @@ return playsound(src, 'sound/weapons/blade_unsheath.ogg', 20) -/obj/item/storage/belt/rapier/update_icon() - . = ..() +/obj/item/storage/belt/rapier/update_icon_state() icon_state = initial(icon_state) item_state = initial(item_state) if(length(contents)) icon_state = "[icon_state]-rapier" item_state = "[item_state]-rapier" - if(isliving(loc)) - var/mob/living/L = loc - L.update_inv_belt() + update_equipped_item() + // ------------------------------------- // Bluespace Belt @@ -977,22 +975,19 @@ sheath_sound = 'sound/weapons/blade_dark_sheath.ogg' unsheath_sound = 'sound/weapons/blade_dark_unsheath.ogg' -/obj/item/storage/belt/claymore/update_icon() - . = ..() +/obj/item/storage/belt/claymore/update_icon_state() if(length(contents)) icon_state = "[initial(icon_state)]_blade" item_state = "[initial(icon_state)]_blade" else icon_state = initial(icon_state) item_state = initial(item_state) - if(isliving(loc)) - var/mob/living/L = loc - L.update_inv_belt() - L.update_inv_s_store() + update_equipped_item() + /obj/item/storage/belt/claymore/populate_contents() new claymore_path(src) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/storage/belt/claymore/attack_hand(mob/user) if(loc != user) @@ -1008,7 +1003,7 @@ var/obj/item/I = contents[1] H.visible_message(span_notice("[H] takes [I] out of [src]."), span_notice("You take [I] out of [src].")) H.put_in_hands(I, ignore_anim = FALSE) - update_icon() + update_icon(UPDATE_ICON_STATE) else to_chat(user, span_warning("[src] is empty!")) diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index e8bb99075a5..20754ee59d4 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -85,10 +85,10 @@ else M.LAssailant = user - if(!(ishuman(user) || SSticker) && SSticker.mode.name != "monkey") + if(!ishuman(user) || ismonkeybasic(user)) to_chat(user, "You don't have the dexterity to do this!") return - if(!user.mind?.isholy) + if(!user.mind || !user.mind.isholy) to_chat(user, "The book sizzles in your hands.") user.take_organ_damage(0, 10) return @@ -181,21 +181,6 @@ item_state = choice_icons["inhand"] customisable = FALSE - // Carpet symbol icons are currently broken, so commented out until it's fixed - /*var/carpet_dir - switch(choice) - if("Bible") - carpet_dir = 2 - if("Koran") - carpet_dir = 4 - if("Scientology") - carpet_dir = 8 - if(carpet_dir) - for(var/area/chapel/main/A in world) - for(var/turf/T in A.contents) - if(T.icon_state == "carpetsymbol") - T.dir = carpet_dir*/ - SSblackbox.record_feedback("text", "religion_book", 1, "[choice]", 1) if(SSticker) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index f07c412fd44..35518f02d05 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -269,7 +269,7 @@ new /obj/item/implantcase/tracking(src) new /obj/item/implanter(src) new /obj/item/implantpad(src) - new /obj/item/locator(src) + new /obj/item/gps/security(src) /obj/item/storage/box/minertracker name = "boxed tracking implant kit" @@ -281,7 +281,7 @@ new /obj/item/implantcase/tracking(src) new /obj/item/implanter(src) new /obj/item/implantpad(src) - new /obj/item/locator(src) + new /obj/item/gps/security(src) /obj/item/storage/box/chemimp name = "chemical implant kit" @@ -647,6 +647,7 @@ icon = 'icons/obj/cigarettes.dmi' icon_state = "matchbox" item_state = "matchbox" + base_icon_state = "matchbox" storage_slots = 10 w_class = WEIGHT_CLASS_TINY max_w_class = WEIGHT_CLASS_TINY @@ -663,7 +664,19 @@ if(istype(W, /obj/item/match) && !W.lit) W.matchignite() playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, 1) - return + + +/obj/item/storage/box/matches/update_icon_state() + switch(length(contents)) + if(10 to INFINITY) + icon_state = base_icon_state + if(5 to 9) + icon_state = "[base_icon_state]_almostfull" + if(1 to 4) + icon_state = "[base_icon_state]_almostempty" + else + icon_state = "[base_icon_state]_e" + /obj/item/storage/box/autoinjectors name = "box of injectors" @@ -762,13 +775,29 @@ foldable = null var/design = NODESIGN -/obj/item/storage/box/papersack/update_icon() - if(!contents.len) - icon_state = "[item_state]" - else icon_state = "[item_state]_closed" + +/obj/item/storage/box/papersack/update_desc(updates = ALL) + . = ..() + switch(design) + if(NODESIGN) + desc = "A sack neatly crafted out of paper." + if(NANOTRASEN) + desc = "A standard Nanotrasen paper lunch sack for loyal employees on the go." + if(SYNDI) + desc = "The design on this paper sack is a remnant of the notorious 'SyndieSnacks' program." + if(HEART) + desc = "A paper sack with a heart etched onto the side." + if(SMILE) + desc = "A paper sack with a crude smile etched onto the side." + + +/obj/item/storage/box/papersack/update_icon_state() + item_state = "paperbag_[design]" + icon_state = length(contents) ? "[item_state]_closed" : "[item_state]" + /obj/item/storage/box/papersack/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/pen)) + if(is_pen(W)) //if a pen is used on the sack, dialogue to change its design appears if(contents.len) to_chat(user, "You can't modify [src] with items still inside!") @@ -784,19 +813,7 @@ return to_chat(usr, "You make some modifications to [src] using your pen.") design = switchDesign - icon_state = "paperbag_[design]" - item_state = "paperbag_[design]" - switch(design) - if(NODESIGN) - desc = "A sack neatly crafted out of paper." - if(NANOTRASEN) - desc = "A standard Nanotrasen paper lunch sack for loyal employees on the go." - if(SYNDI) - desc = "The design on this paper sack is a remnant of the notorious 'SyndieSnacks' program." - if(HEART) - desc = "A paper sack with a heart etched onto the side." - if(SMILE) - desc = "A paper sack with a crude smile etched onto the side." + update_appearance(UPDATE_DESC|UPDATE_ICON_STATE) return else if(is_sharp(W)) if(!contents.len) @@ -844,8 +861,7 @@ new /obj/item/crowbar/red(src) new /obj/item/kitchen/knife/combat(src) new /obj/item/radio/centcom(src) - new /obj/item/reagent_containers/food/pill/patch/synthflesh(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/storage/firstaid/crew(src) /obj/item/storage/box/soviet name = "boxed survival kit" @@ -1018,6 +1034,24 @@ new /obj/item/clothing/gloves/combat(src) new /obj/item/storage/backpack/security(src) +/obj/item/storage/box/dominator_kit + name = "Dominator kit" + icon_state = "box_dominator" + +/obj/item/storage/box/dominator_kit/populate_contents() + new /obj/item/gun/energy/dominator/sibyl(src) + new /obj/item/clothing/accessory/holster(src) + +/obj/item/storage/box/enforcer_kit + name = "Enforcer kit" + icon_state = "box_enforcer" + +/obj/item/storage/box/enforcer_kit/populate_contents() + new /obj/item/gun/projectile/automatic/pistol/enforcer/security(src) + new /obj/item/ammo_box/magazine/enforcer(src) + new /obj/item/ammo_box/magazine/enforcer(src) + new /obj/item/clothing/accessory/holster(src) + /obj/item/storage/box/hardmode_box name = "box of HRD-MDE project box" desc = "Contains everything needed to get yourself killed for a medal." diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index acf687cfa60..2c9df74c88e 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -18,10 +18,10 @@ resistance_flags = FLAMMABLE var/icon_type -/obj/item/storage/fancy/update_icon(var/itemremoved = 0) - var/total_contents = src.contents.len - itemremoved - src.icon_state = "[src.icon_type]box[total_contents]" - return + +/obj/item/storage/fancy/update_icon_state() + icon_state = "[icon_type]box[length(contents)]" + /obj/item/storage/fancy/examine(mob/user) . = ..() @@ -47,23 +47,29 @@ foldable = /obj/item/stack/sheet/cardboard foldable_amt = 1 -/obj/item/storage/fancy/donut_box/update_icon() - overlays.Cut() - for(var/i = 1 to length(contents)) - var/obj/item/reagent_containers/food/snacks/donut/donut = contents[i] - var/icon/new_donut_icon = icon('icons/obj/food/containers.dmi', "donut_[donut.donut_sprite_type]") - new_donut_icon.Shift(EAST, 3 * (i-1)) - overlays += new_donut_icon +/obj/item/storage/fancy/donut_box/update_icon_state() + return + + +/obj/item/storage/fancy/donut_box/update_overlays() + . = ..() + for(var/I = 1 to length(contents)) + var/obj/item/reagent_containers/food/snacks/donut/donut = contents[I] + var/icon/new_donut_icon = icon(icon, "donut_[donut.donut_sprite_type]") + new_donut_icon.Shift(EAST, 3 * (I - 1)) + . += new_donut_icon + . += "donutbox_front" - overlays += icon('icons/obj/food/containers.dmi', "donutbox_front") /obj/item/storage/fancy/donut_box/populate_contents() for(var/i = 1 to storage_slots) new /obj/item/reagent_containers/food/snacks/donut(src) - update_icon() + update_icon(UPDATE_OVERLAYS) + /obj/item/storage/fancy/donut_box/empty/populate_contents() + update_icon(UPDATE_OVERLAYS) return /* @@ -135,17 +141,23 @@ new /obj/item/toy/crayon/blue(src) new /obj/item/toy/crayon/purple(src) new /obj/item/toy/crayon/black(src) - update_icon() + update_icon(UPDATE_OVERLAYS) + -/obj/item/storage/fancy/crayons/update_icon() - overlays = list() //resets list - overlays += image('icons/obj/crayons.dmi',"crayonbox") +/obj/item/storage/fancy/crayons/update_icon_state() + return + + +/obj/item/storage/fancy/crayons/update_overlays() + . = ..() for(var/obj/item/toy/crayon/crayon in contents) - overlays += image('icons/obj/crayons.dmi',crayon.colourName) + . += crayon.colourName + -/obj/item/storage/fancy/crayons/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W,/obj/item/toy/crayon)) - switch(W:colourName) +/obj/item/storage/fancy/crayons/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/toy/crayon)) + var/obj/item/toy/crayon/crayon = I + switch(crayon.colourName) if("mime") to_chat(usr, "This crayon is too sad to be contained in this box.") return @@ -182,58 +194,57 @@ for(var/i = 1 to storage_slots) new cigarette_type(src) -/obj/item/storage/fancy/cigarettes/update_icon() //lazy as hell - switch(contents.len) +/obj/item/storage/fancy/cigarettes/update_icon_state() + var/init_state = initial(icon_state) + switch(length(contents)) if(17 to INFINITY) - icon_state = "[initial(icon_state)]6" + icon_state = "[init_state]6" if(14 to 16) - icon_state = "[initial(icon_state)]5" + icon_state = "[init_state]5" if(11 to 13) - icon_state = "[initial(icon_state)]4" + icon_state = "[init_state]4" if(7 to 10) - icon_state = "[initial(icon_state)]3" + icon_state = "[init_state]3" if(4 to 6) - icon_state = "[initial(icon_state)]2" + icon_state = "[init_state]2" if(1 to 3) - icon_state = "[initial(icon_state)]1" + icon_state = "[init_state]1" else - icon_state = "[initial(icon_state)]0" - -/obj/item/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - if(!istype(M, /mob)) - return - - if(istype(M) && M == user && user.zone_selected == "mouth" && contents.len > 0 && !user.wear_mask) - var/got_cig = 0 - for(var/num=1, num <= contents.len, num++) - var/obj/item/I = contents[num] - if(istype(I, /obj/item/clothing/mask/cigarette)) - var/obj/item/clothing/mask/cigarette/C = I - user.equip_to_slot_if_possible(C, slot_wear_mask) - to_chat(user, "You take \a [C.name] out of the pack.") - update_icon() - got_cig = 1 - break - if(!got_cig) - to_chat(user, "There are no smokables in the pack!") + icon_state = "[init_state]0" + + +/obj/item/storage/fancy/cigarettes/attack(mob/living/carbon/human/target, mob/living/carbon/user) + if(!ishuman(target) || user.zone_selected != BODY_ZONE_PRECISE_MOUTH) + return ..() + + var/obj/item/clothing/mask/cigarette/cigar = locate() in src + if(!cigar) + to_chat(user, span_warning("There are no smokables in the pack!")) + return TRUE + + if(target.equip_to_slot_if_possible(cigar, slot_wear_mask, disable_warning = TRUE)) + to_chat(user, span_notice("You took \a [cigar.name] out of the pack[target != user ? " and deftly place it in [target] mouth" : ""].")) else - ..() + to_chat(user, span_warning("Something is blocking [target] mouth!")) + + return TRUE -/obj/item/storage/fancy/cigarettes/can_be_inserted(obj/item/W as obj, stop_messages = 0) + +/obj/item/storage/fancy/cigarettes/can_be_inserted(obj/item/W , stop_messages = 0) if(istype(W, /obj/item/match)) - var/obj/item/match/M = W - if(M.lit == 1) + var/obj/item/match/match = W + if(match.lit) if(!stop_messages) - to_chat(usr, "Putting a lit [W] in [src] probably isn't a good idea.") - return 0 + to_chat(usr, span_notice("Putting a lit [W] in [src] probably isn't a good idea.")) + return FALSE if(istype(W, /obj/item/lighter)) - var/obj/item/lighter/L = W - if(L.lit == 1) + var/obj/item/lighter/lighter = W + if(lighter.lit) if(!stop_messages) - to_chat(usr, "Putting [W] in [src] while lit probably isn't a good idea.") - return 0 - //if we get this far, handle the insertion checks as normal - .=..() + to_chat(usr, span_notice("Putting [W] in [src] while lit probably isn't a good idea.")) + return FALSE + return ..() + /obj/item/storage/fancy/cigarettes/decompile_act(obj/item/matter_decompiler/C, mob/user) if(!length(contents)) @@ -336,10 +347,15 @@ for(var/i in 1 to storage_slots) new /obj/item/rollingpaper(src) -/obj/item/storage/fancy/rollingpapers/update_icon() - overlays.Cut() - if(!contents.len) - overlays += "[icon_state]_empty" + +/obj/item/storage/fancy/crayons/update_icon_state() + return + + +/obj/item/storage/fancy/rollingpapers/update_icon_state() + . = ..() + if(!length(contents)) + . += "[icon_state]_empty" /* * cigcase @@ -353,10 +369,10 @@ storage_slots = 7 can_hold = list(/obj/item/clothing/mask/cigarette/cigar) -/obj/item/storage/fancy/cigcase/update_icon(var/itemremoved = 0) - var/total_contents = src.contents.len - itemremoved - src.icon_state = "[src.icon_type]case[total_contents]" - return + +/obj/item/storage/fancy/cigcase/update_icon_state() + icon_state = "[icon_type]case[length(contents)]" + /obj/item/storage/fancy/cigcase/populate_contents() for(var/I = 1 to storage_slots) @@ -390,27 +406,25 @@ storage_slots = 6 req_access = list(ACCESS_VIROLOGY) + /obj/item/storage/lockbox/vials/populate_contents() for(var/I = 1 to storage_slots) new /obj/item/reagent_containers/glass/beaker/vial(src) update_icon() -/obj/item/storage/lockbox/vials/update_icon(var/itemremoved = 0) - var/total_contents = src.contents.len - itemremoved - src.icon_state = "vialbox[total_contents]" - src.overlays.Cut() + +/obj/item/storage/lockbox/vials/update_icon_state() + icon_state = "vialbox[length(contents)]" + + +/obj/item/storage/lockbox/vials/update_overlays() + . = ..() if(!broken) - overlays += image(icon, src, "led[locked]") + . += "led[locked]" if(locked) - overlays += image(icon, src, "cover") + . += "cover" else - overlays += image(icon, src, "ledb") - return - -/obj/item/storage/lockbox/vials/attackby(obj/item/W as obj, mob/user as mob, params) - ..() - update_icon() - + . += "ledb" ///Aquatic Starter Kit diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 6bc66cb282c..6b33df174aa 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -353,22 +353,25 @@ new /obj/item/reagent_containers/food/pill/charcoal(src) new /obj/item/reagent_containers/food/pill/charcoal(src) -/obj/item/storage/pill_bottle/MouseDrop(obj/over_object as obj) // Best utilized if you're a cantankerous doctor with a Vicodin habit. - if(iscarbon(over_object)) - var/mob/living/carbon/C = over_object - if(loc == C && src == C.get_active_hand()) - if(!contents.len) - to_chat(C, "There is nothing in [src]!") - return - C.visible_message("[C] [rapid_intake_message]") - if(do_mob(C, C, 100)) // 10 seconds - for(var/obj/item/reagent_containers/food/pill/P in contents) - P.attack(C, C) - C.visible_message("[C] [rapid_post_instake_message]") - return + +/obj/item/storage/pill_bottle/MouseDrop(mob/living/carbon/user, src_location, over_location, src_control, over_control, params) // Best utilized if you're a cantankerous doctor with a Vicodin habit. + if(iscarbon(user) && src == user.get_active_hand()) + if(!length(contents)) + to_chat(user, span_notice("There is nothing in [src]!")) + return FALSE + + user.visible_message(span_danger("[user] [rapid_intake_message]")) + if(!do_mob(user, user, 10 SECONDS) || src != user.get_active_hand()) + return FALSE + + for(var/obj/item/reagent_containers/food/pill/pill in src) + pill.attack(user, user) + user.visible_message(span_danger("[user] [rapid_post_instake_message]")) + return FALSE return ..() + /obj/item/storage/pill_bottle/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen)) rename_interactive(user, I) diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm index e9f3455468a..1c08db71d6e 100644 --- a/code/game/objects/items/weapons/storage/internal.dm +++ b/code/game/objects/items/weapons/storage/internal.dm @@ -34,70 +34,36 @@ * If you are using these you will probably want to override attackby() as well. * See /obj/item/clothing/suit/storage for an example. * Items that use internal storage have the option of calling this to emulate default storage MouseDrop behaviour. - * Returns `TRUE` if the master item's parent's MouseDrop() should be called, `FALSE` otherwise. It's strange, but no other way of + * Returns `FALSE` if the master item's parent's MouseDrop() should be called, `TRUE` otherwise. It's strange, but no other way of * doing it without the ability to call another proc's parent, really. */ -/obj/item/storage/internal/proc/handle_mousedrop(mob/user, obj/over_object) - if(ishuman(user)) //so monkeys can take off their backpacks -- Urist - - if(istype(user.loc,/obj/mecha)) // stops inventory actions in a mech - return FALSE - - if(over_object == user && Adjacent(user)) // this must come before the screen objects only block - src.open(user) - return FALSE - - if(!(istype(over_object, /obj/screen))) - return TRUE - - //makes sure master_item is equipped before putting it in hand, so that we can't drag it into our hand from miles away. - //there's got to be a better way of doing this... - if(!(master_item.loc == user) || (master_item.loc && master_item.loc.loc == user)) - return FALSE - - if(!(user.restrained() ) && !(user.stat)) - switch(over_object.name) - if("r_hand") - if(!master_item.remove_item_from_storage(drop_location())) - user.drop_item_ground(master_item) - user.put_in_r_hand(master_item) - if("l_hand") - if(!master_item.remove_item_from_storage(drop_location())) - user.drop_item_ground(master_item) - user.put_in_l_hand(master_item) - master_item.add_fingerprint(user) - return FALSE - return FALSE +/obj/item/storage/internal/proc/handle_mousedrop(mob/living/carbon/human/user, obj/over_object) + . = FALSE + if(over_object == user && ishuman(user) && !user.incapacitated() && !ismecha(user.loc) && !is_ventcrawling(user) && user.Adjacent(master_item)) + open(user) + master_item.add_fingerprint(user) + return TRUE /** * Items that use internal storage have the option of calling this to emulate default storage attack_hand behaviour. - * Returns `TRUE` if the master item's parent's attack_hand() should be called, 0 otherwise. + * Returns `FALSE` if the master item's parent's attack_hand() should be called, `TRUE` otherwise. * It's strange, but no other way of doing it without the ability to call another proc's parent, really. */ -/obj/item/storage/internal/proc/handle_attack_hand(mob/user) - - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(H.l_store == master_item && !H.get_active_hand()) //Prevents opening if it's in a pocket. - H.put_in_hands(master_item) - H.l_store = null - return FALSE - if(H.r_store == master_item && !H.get_active_hand()) - H.put_in_hands(master_item) - H.r_store = null - return FALSE - - src.add_fingerprint(user) - if(master_item.loc == user) - src.open(user) +/obj/item/storage/internal/proc/handle_attack_hand(mob/living/carbon/human/user) + . = TRUE + if(master_item.loc != user || !ishuman(user) || user.incapacitated() || ismecha(user.loc) || is_ventcrawling(user)) return FALSE - for(var/mob/M in range(1, master_item.loc)) - if(M.s_active == src) - src.close(M) - return TRUE + //Prevents opening if it's in a pocket. + if(!user.get_active_hand() && (master_item == user.l_store || master_item == user.r_store)) + user.temporarily_remove_item_from_inventory(master_item) + user.put_in_hands(master_item) + return . + open(user) + master_item.add_fingerprint(user) -/obj/item/storage/internal/Adjacent(var/atom/neighbor) + +/obj/item/storage/internal/Adjacent(atom/neighbor) return master_item.Adjacent(neighbor) diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index e48f0e8d6cc..c001c82d5ac 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -8,12 +8,20 @@ max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item. storage_slots = 4 req_access = list(ACCESS_ARMORY) - var/locked = 1 - var/broken = 0 + var/locked = TRUE + var/broken = FALSE var/icon_locked = "lockbox+l" var/icon_closed = "lockbox" var/icon_broken = "lockbox+b" + +/obj/item/storage/lockbox/update_icon_state() + if(broken) + icon_state = icon_broken + return + icon_state = locked ? icon_locked : icon_closed + + /obj/item/storage/lockbox/attackby(obj/item/I, mob/user, params) if(I.GetID()) if(broken) @@ -21,14 +29,13 @@ return if(check_access(I)) locked = !locked + update_icon() if(locked) - icon_state = icon_locked to_chat(user, "You lock \the [src]!") if(user.s_active) user.s_active.close(user) return else - icon_state = icon_closed to_chat(user, "You unlock \the [src]!") origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D. return @@ -42,36 +49,39 @@ ..() else to_chat(user, "It's locked!") - return -/obj/item/storage/lockbox/show_to(mob/user as mob) + +/obj/item/storage/lockbox/show_to(mob/user) if(locked) to_chat(user, "It's locked!") else ..() return + /obj/item/storage/lockbox/can_be_inserted(obj/item/W, stop_messages = 0) if(!locked) return ..() if(!stop_messages) to_chat(usr, "[src] is locked!") - return 0 + return FALSE + /obj/item/storage/lockbox/emag_act(mob/user) if(!broken) add_attack_logs(user, src, "emagged") - broken = 1 - locked = 0 + broken = TRUE + locked = FALSE desc = "It appears to be broken." - icon_state = icon_broken + update_icon() if(user) to_chat(user, "You unlock \the [src].") origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D. -/obj/item/storage/lockbox/hear_talk(mob/living/M as mob, list/message_pieces) -/obj/item/storage/lockbox/hear_message(mob/living/M as mob, msg) +/obj/item/storage/lockbox/hear_talk(mob/living/M, list/message_pieces) + +/obj/item/storage/lockbox/hear_message(mob/living/M, msg) /obj/item/storage/lockbox/mindshield name = "Lockbox (Mindshield Implants)" @@ -83,6 +93,9 @@ new /obj/item/implantcase/mindshield(src) new /obj/item/implanter/mindshield(src) +/obj/item/storage/lockbox/mindshield/ert + w_class = WEIGHT_CLASS_NORMAL + /obj/item/storage/lockbox/sibyl_system_mod name = "lockbox (Sibyl System Mods)" desc = "Contains proprietary Sibyl System mods for energy guns." @@ -126,6 +139,7 @@ name = "lockbox (T4)" desc = "Contains three T4 breaching charges." req_access = list(ACCESS_CENT_SPECOPS) + w_class = WEIGHT_CLASS_NORMAL /obj/item/storage/lockbox/t4/populate_contents() for(var/I in 1 to 3) diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 77376ffa221..f0360a18106 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -27,11 +27,21 @@ max_w_class = WEIGHT_CLASS_SMALL max_combined_w_class = 14 + /obj/item/storage/secure/examine(mob/user) . = ..() if(in_range(user, src)) . += "The service panel is [open ? "open" : "closed"]." + +/obj/item/storage/secure/update_overlays() + . = ..() + if(emagged) + . += icon_locking + else if(!locked) + . += icon_opened + + /obj/item/storage/secure/populate_contents() new /obj/item/paper(src) new /obj/item/pen(src) @@ -41,13 +51,13 @@ if((istype(W, /obj/item/melee/energy/blade)) && (!emagged)) emag_act(user, W) - if(istype(W, /obj/item/screwdriver)) + if(W.tool_behaviour == TOOL_SCREWDRIVER) if(do_after(user, 20 * W.toolspeed * gettoolspeedmod(user), target = src)) open = !open user.show_message("You [open ? "open" : "close"] the service panel.", 1) return - if((istype(W, /obj/item/multitool)) && (open) && (!l_hacking)) + if((W.tool_behaviour = TOOL_MULTITOOL) && (open) && (!l_hacking)) user.show_message("Now attempting to reset internal memory, please hold.", 1) l_hacking = TRUE if(do_after(user, 100 * W.toolspeed * gettoolspeedmod(user), target = src)) @@ -70,30 +80,34 @@ return ..() + /obj/item/storage/secure/emag_act(mob/user, obj/weapon) - if(!emagged) - add_attack_logs(user, src, "emagged") - emagged = TRUE - overlays += image('icons/obj/storage.dmi', icon_sparking) - sleep(6) - overlays.Cut() - overlays += image('icons/obj/storage.dmi', icon_locking) - locked = FALSE - if(istype(weapon, /obj/item/melee/energy/blade)) - do_sparks(5, 0, loc) - playsound(loc, 'sound/weapons/blade1.ogg', 50, 1) - playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - if(user) - to_chat(user, "You slice through the lock on [src].") - else if(user) - to_chat(user, "You short out the lock on [src].") + if(emagged) + return + + add_attack_logs(user, src, "emagged") + emagged = TRUE + locked = FALSE + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + flick_overlay_view(image(icon, src, icon_sparking), 1 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS) + + if(istype(weapon, /obj/item/melee/energy/blade)) + do_sparks(5, 0, loc) + playsound(loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + if(user) + to_chat(user, "You slice through the lock on [src].") + else if(user) + to_chat(user, "You short out the lock on [src].") + /obj/item/storage/secure/AltClick(mob/living/user) if(istype(user) && !try_to_open()) return FALSE return ..() -/obj/item/storage/secure/MouseDrop(over_object, src_location, over_location) +/obj/item/storage/secure/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) if(!try_to_open()) return FALSE return ..() @@ -138,8 +152,8 @@ switch(action) if("close") locked = TRUE - overlays.Cut() code = null + update_icon(UPDATE_OVERLAYS) close(usr) if("setnumber") switch(params["buttonValue"]) @@ -150,9 +164,8 @@ to_chat(usr, "The code was set successfully.") else if((code == l_code) && l_set) locked = FALSE - overlays.Cut() - overlays += image('icons/obj/storage.dmi', icon_opened) code = null + update_icon(UPDATE_OVERLAYS) else code = "ERROR" if("R") @@ -232,7 +245,7 @@ force = 8 w_class = WEIGHT_CLASS_HUGE max_w_class = 8 - anchored = 1 + anchored = TRUE density = 0 cant_hold = list(/obj/item/storage/secure/briefcase) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index ce9e95495ac..5f06e4bc428 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -9,6 +9,7 @@ name = "storage" icon = 'icons/obj/storage.dmi' w_class = WEIGHT_CLASS_NORMAL + flags_2 = BLOCKS_LIGHT_2 ///No message on putting items in var/silent = FALSE ///List of objects which this item can store (if set, it can't store anything else) @@ -98,40 +99,44 @@ continue hide_from(player) -/obj/item/storage/MouseDrop(obj/over_object) - if(ishuman(usr)) //so monkeys can take off their backpacks -- Urist - var/mob/M = usr - if(istype(M.loc,/obj/mecha) || M.incapacitated(FALSE, TRUE, TRUE)) // Stops inventory actions in a mech as well as while being incapacitated - return +/obj/item/storage/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) + if(!ishuman(usr)) + return FALSE - if(over_object == M && Adjacent(M)) // this must come before the screen objects only block - if(M.s_active) - M.s_active.close(M) - open(M) - return + var/mob/living/carbon/human/user = usr - if((istype(over_object, /obj/structure/table) || istype(over_object, /turf/simulated/floor)) \ - && contents.len && loc == usr && !usr.stat && !usr.restrained() && usr.canmove && over_object.Adjacent(usr) \ - && !istype(src, /obj/item/storage/lockbox)) - var/turf/T = get_turf(over_object) - if(istype(over_object, /turf/simulated/floor)) - if(get_turf(usr) != T) - return // Can only empty containers onto the floor under you - if("Yes" != alert(usr,"Empty \the [src] onto \the [T]?","Confirm","Yes","No")) - return - if(!(usr && over_object && contents.len && loc == usr && !usr.stat && !usr.restrained() && usr.canmove && get_turf(usr) == T)) - return // Something happened while the player was thinking - hide_from(usr) - usr.face_atom(over_object) - usr.visible_message("[usr] empties \the [src] onto \the [over_object].", - "You empty \the [src] onto \the [over_object].") - for(var/obj/item/I in contents) - remove_from_storage(I, T) - update_icon() // For content-sensitive icons - return + // Stops inventory actions in a mech, while ventcrawling and while being incapacitated + if(ismecha(user.loc) || is_ventcrawling(user) || user.incapacitated(FALSE, TRUE, TRUE)) + return FALSE + + if(over_object == user && user.Adjacent(src)) // this must come before the screen objects only block + open(user) + return FALSE + + if((!istype(src, /obj/item/storage/lockbox) && (istype(over_object, /obj/structure/table) || istype(over_object, /turf/simulated/floor)) \ + && length(contents) && loc == user && !user.incapacitated() && user.Adjacent(over_object))) + + if(alert(user, "Empty [src] onto [over_object]?", "Confirm", "Yes", "No") != "Yes") + return FALSE + + if(!user || !over_object || user.incapacitated() || loc != user || !user.Adjacent(over_object)) + return FALSE + + close(user) + user.face_atom(over_object) + user.visible_message( + span_notice("[user] empties [src] onto [over_object]."), + span_notice("You empty [src] onto [over_object]."), + ) + var/turf/object_turf = get_turf(over_object) + for(var/obj/item/item in src) + remove_from_storage(item, object_turf) + + update_icon() // For content-sensitive icons + return FALSE - return ..() + return ..() /obj/item/storage/AltClick(mob/user) @@ -186,6 +191,14 @@ if(user.s_active == src) user.s_active = null + +/obj/item/storage/proc/hide_from_all_viewers() + if(!LAZYLEN(mobs_viewing)) + return + for(var/mob/viewer as anything in mobs_viewing) + hide_from(viewer) + + /obj/item/storage/proc/update_viewers() for(var/_M in mobs_viewing) var/mob/M = _M @@ -438,7 +451,7 @@ if(istype(src, /obj/item/storage/fancy)) var/obj/item/storage/fancy/F = src - F.update_icon(TRUE) + F.update_icon() for(var/_M in mobs_viewing) var/mob/M = _M diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index b27d66f347e..86dd971d773 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -35,56 +35,70 @@ var/obj/item/card/id/front_id = null var/image/front_id_overlay = null -/obj/item/storage/wallet/proc/id_check() - front_id = (locate(/obj/item/card/id) in contents) - if(!front_id) - name = "[item_color] leather wallet" - return FALSE - name = "[item_color] leather wallet with [front_id] on the front" - return TRUE -/obj/item/storage/wallet/remove_from_storage(obj/item/W, atom/new_location) - . = ..(W, new_location) - if(.) - id_check() - update_icon() +/obj/item/storage/wallet/remove_from_storage(obj/item/I, atom/new_location) + . = ..() + if(. && istype(I, /obj/item/card/id)) + refresh_ID() + + +/obj/item/storage/wallet/handle_item_insertion(obj/item/I, prevent_warning = FALSE) + . = ..() + if(. && istype(I, /obj/item/card/id)) + refresh_ID() -/obj/item/storage/wallet/handle_item_insertion(obj/item/W, prevent_warning = 0) - . = ..(W, prevent_warning) - if(.) - id_check() - update_icon() /obj/item/storage/wallet/swap_items(obj/item/item_1, obj/item/item_2, mob/user) - . = ..(item_1, item_2, user) + . = ..() if(.) - id_check() - update_icon() + refresh_ID() + +/obj/item/storage/wallet/orient2hud(mob/user) + . = ..() + refresh_ID() + + +/obj/item/storage/wallet/proc/refresh_ID() + // Locate the first ID in the wallet + front_id = (locate(/obj/item/card/id) in contents) -/obj/item/storage/wallet/update_icon() if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - if(H.wear_id == src) - H.sec_hud_set_ID() - overlays -= front_id_overlay + var/mob/living/carbon/human/wearing_human = loc + if(wearing_human.wear_id == src) + wearing_human.sec_hud_set_ID() + + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) + + +/obj/item/storage/wallet/update_overlays() + . = ..() if(!front_id) - front_id_overlay = null return var/front_id_icon_state_holder = front_id.icon_state - if (copytext(front_id_icon_state_holder,1,4) == "ERT") + if(copytext(front_id_icon_state_holder,1,4) == "ERT") front_id_icon_state_holder = "ERT" else if(!(front_id_icon_state_holder in icon_states(src.icon))) front_id_icon_state_holder = "id" - front_id_overlay = image('icons/obj/wallets.dmi', front_id_icon_state_holder) - overlays += front_id_overlay + . += mutable_appearance('icons/obj/wallets.dmi', front_id_icon_state_holder) + + +/obj/item/storage/wallet/update_name(updates = ALL) + . = ..() + if(front_id) + name = "[item_color] leather wallet with [front_id] on the front" + else + name = "[item_color] leather wallet" + /obj/item/storage/wallet/GetID() return front_id ? front_id : ..() + /obj/item/storage/wallet/GetAccess() return front_id ? front_id.GetAccess() : ..() + /obj/item/storage/wallet/random/populate_contents() var/cash = pick(/obj/item/stack/spacecash, /obj/item/stack/spacecash/c10, @@ -110,6 +124,7 @@ icon = 'icons/obj/wallets.dmi' item_state = "wallet" + /obj/item/storage/wallet/color/Initialize(mapload) . = ..() if(!item_color) @@ -117,31 +132,17 @@ new color_wallet(src.loc) qdel(src) return - UpdateDesc() + update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON_STATE) -/obj/item/storage/wallet/color/proc/UpdateDesc() - name = "[item_color] wallet" - desc = "[item_color] wallet made from... leather?" - icon_state = "[item_color]_wallet" +/obj/item/storage/wallet/color/update_icon_state() + icon_state = "[item_color]_wallet" -/obj/item/storage/wallet/color/remove_from_storage(obj/item/W, atom/new_location) - . = ..(W, new_location) - if(.) - id_check() - update_icon() -/obj/item/storage/wallet/color/handle_item_insertion(obj/item/W, prevent_warning = 0) - . = ..(W, prevent_warning) - if(.) - id_check() - update_icon() +/obj/item/storage/wallet/color/update_desc(updates = ALL) + . = ..() + desc = "[item_color] wallet made from... leather?" -/obj/item/storage/wallet/color/swap_items(obj/item/item_1, obj/item/item_2, mob/user) - . = ..(item_1, item_2, user) - if(.) - id_check() - update_icon() /obj/item/storage/wallet/color/blue item_color = "blue" diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index cf670bd194f..526780bc215 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -54,14 +54,18 @@ A.UpdateButtonIcon() +/obj/item/tank/jetpack/update_icon_state() + icon_state = "[initial(icon_state)][on ? "-on" : ""]" + + /obj/item/tank/jetpack/proc/turn_on(mob/user) on = TRUE - icon_state = "[initial(icon_state)]-on" + update_icon(UPDATE_ICON_STATE) /obj/item/tank/jetpack/proc/turn_off(mob/user) on = FALSE stabilizers = FALSE - icon_state = initial(icon_state) + update_icon(UPDATE_ICON_STATE) /obj/item/tank/jetpack/proc/allow_thrust(num, mob/living/user, should_leave_trail) if(!on) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index b592c3d220a..e9040c412c3 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -62,7 +62,7 @@ if(!silent) to_chat(C, "You are not wearing a suitable mask or helmet.") return FALSE - if(M.mask_adjusted) // If the mask is equipped but pushed down + if(M.up) // If the mask is equipped but pushed down M.adjustmask(C) // Adjust it back if(!silent) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 357d0ccabef..ea7891ca7b9 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -190,12 +190,28 @@ /obj/item/watertank/atmos/make_noz() return new /obj/item/extinguisher/mini/nozzle(src) + +/obj/item/watertank/atmos/update_icon_state() + var/obj/item/extinguisher/mini/nozzle/our_noz = noz + switch(our_noz.nozzle_mode) + if(EXTINGUISHER) + icon_state = "waterbackpackatmos_0" + if(NANOFROST) + icon_state = "waterbackpackatmos_1" + if(METAL_FOAM) + icon_state = "waterbackpackatmos_2" + else + icon_state = "waterbackpackatmos" + + /obj/item/watertank/atmos/dropped(mob/user, silent = FALSE) - ..() - icon_state = "waterbackpackatmos" - if(istype(noz, /obj/item/extinguisher/mini/nozzle)) - var/obj/item/extinguisher/mini/nozzle/N = noz - N.nozzle_mode = 0 + . = ..() + if(!noz) + return + var/obj/item/extinguisher/mini/nozzle/our_noz = noz + our_noz.nozzle_mode = NONE + update_icon(UPDATE_ICON_STATE) + /obj/item/extinguisher/mini/nozzle name = "extinguisher nozzle" @@ -210,11 +226,12 @@ cooling_power = 5 w_class = WEIGHT_CLASS_HUGE flags = NODROP //Necessary to ensure that the nozzle and tank never seperate - var/obj/item/watertank/tank - var/nozzle_mode = 0 + var/obj/item/watertank/atmos/tank + var/nozzle_mode = NONE var/metal_synthesis_cooldown = 0 var/nanofrost_cooldown = 0 + /obj/item/extinguisher/mini/nozzle/New(parent_tank) . = ..() if(check_tank_exists(parent_tank, src)) @@ -222,32 +239,30 @@ reagents = tank.reagents max_water = tank.volume loc = tank - return + /obj/item/extinguisher/mini/nozzle/Move() . = ..() if(tank && loc != tank.loc) loc = tank - return -/obj/item/extinguisher/mini/nozzle/attack_self(mob/user as mob) + +/obj/item/extinguisher/mini/nozzle/attack_self(mob/user) switch(nozzle_mode) if(EXTINGUISHER) nozzle_mode = NANOFROST - tank.icon_state = "waterbackpackatmos_1" to_chat(user, "Swapped to nanofrost launcher") - return + if(NANOFROST) nozzle_mode = METAL_FOAM - tank.icon_state = "waterbackpackatmos_2" to_chat(user, "Swapped to metal foam synthesizer") - return + if(METAL_FOAM) nozzle_mode = EXTINGUISHER - tank.icon_state = "waterbackpackatmos_0" to_chat(user, "Swapped to water extinguisher") - return - return + + tank.update_icon(UPDATE_ICON_STATE) + /obj/item/extinguisher/mini/nozzle/dropped(mob/user, silent = FALSE) ..() diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index a66470628d4..d4cfa546b95 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -9,10 +9,9 @@ amount = 25 max_amount = 25 -/obj/item/stack/tape_roll/New(var/loc, var/amount=null) +/obj/item/stack/tape_roll/New(loc, amount=null) ..() - - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/stack/tape_roll/attack(mob/living/carbon/human/M, mob/living/user) if(!istype(M)) //What good is a duct tape mask if you are unable to speak? @@ -43,7 +42,8 @@ M.equip_to_slot_if_possible(G, slot_wear_mask) G.add_fingerprint(user) -/obj/item/stack/tape_roll/update_icon() + +/obj/item/stack/tape_roll/update_icon_state() var/amount = get_amount() if((amount <= 2) && (amount > 0)) icon_state = "[initial(icon_state)]" @@ -55,7 +55,7 @@ icon_state = "[initial(icon_state)]4" else icon_state = "[initial(icon_state)]4" - ..() + /obj/item/stack/tape_roll/thick name = "incredibly thick tape roll" @@ -90,3 +90,4 @@ var/obj/item/clothing/mask/muzzle/G = new /obj/item/clothing/mask/muzzle/tapegag/thick M.equip_to_slot_if_possible(G, slot_wear_mask) G.add_fingerprint(user) + diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index be1e86f519d..171ab0f1a5e 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -1,103 +1,10 @@ -/* Teleportation devices. - * Contains: - * Locator - * Hand-tele - */ - -/* - * Locator - */ -/obj/item/locator - name = "locator" - desc = "Used to track those with locater implants." - icon = 'icons/obj/device.dmi' - icon_state = "locator" - var/temp = null - var/frequency = 1451 - var/broadcasting = null - var/listening = 1.0 - flags = CONDUCT - w_class = WEIGHT_CLASS_SMALL - item_state = "electronic" - throw_speed = 4 - throw_range = 20 - materials = list(MAT_METAL=400) - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) - origin_tech = "magnets=3;bluespace=2" - -/obj/item/locator/attack_self(mob/user as mob) - add_fingerprint(user) - var/dat = {""} - if(temp) - dat += "[src.temp]
Clear" - else - dat += {" -Persistent Signal Locator
-Frequency: -- -- [format_frequency(src.frequency)] -+ -+
- -Refresh"} - user << browse(dat, "window=radio") - onclose(user, "radio") - return - -/obj/item/locator/Topic(href, href_list) - if(..()) - return 1 - - var/turf/current_location = get_turf(usr)//What turf is the user on? - if(!current_location || is_admin_level(current_location.z))//If turf was not found or they're in the admin zone - to_chat(usr, "\The [src] is malfunctioning.") - return 1 - - if(href_list["refresh"]) - temp = "Persistent Signal Locator
" - var/turf/sr = get_turf(src) - - if(sr) - temp += "Located Beacons:
" - - for(var/obj/item/radio/beacon/W in GLOB.beacons) - if(W.frequency == frequency && !W.syndicate) - if(W && W.z == z) - var/turf/TB = get_turf(W) - temp += "[W.code]: [TB.x], [TB.y], [TB.z]
" - - temp += "Located Implants:
" - for(var/obj/item/implant/tracking/T in GLOB.tracked_implants) - if(!T.implanted || !T.imp_in) - continue - var/turf/Tr = get_turf(T) - - if(Tr && Tr.z == sr.z) - temp += "[T.gps_tag]: [Tr.x], [Tr.y], [Tr.z]
" - - temp += "You are at \[[sr.x],[sr.y],[sr.z]\]." - temp += "
Refresh
" - else - temp += "Processing error: Unable to locate orbital position.
" - else - if(href_list["freq"]) - frequency += text2num(href_list["freq"]) - frequency = sanitize_frequency(frequency) - else - if(href_list["temp"]) - temp = null - - attack_self(usr) - return 1 - -/* - * Hand-tele - */ +/// Hand-tele /obj/item/hand_tele name = "hand tele" desc = "A portable item using blue-space technology." icon = 'icons/obj/device.dmi' icon_state = "hand_tele" + base_icon_state = "hand_tele" item_state = "electronic" throwforce = 0 w_class = WEIGHT_CLASS_SMALL @@ -163,7 +70,7 @@ Frequency: /obj/item/hand_tele/proc/make_inactive(severity) - var/time = rand(20 SECONDS, 30 SECONDS) * severity + var/time = rand(10 SECONDS, 15 SECONDS) * (severity == EMP_HEAVY ? 2 : 1) emp_timer = world.time + time update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, PROC_REF(check_inactive), emp_timer), time) @@ -182,7 +89,7 @@ Frequency: /obj/item/hand_tele/update_icon_state() - icon_state = (emp_timer > world.time) ? icon_state_inactive : initial(icon_state) + icon_state = (emp_timer > world.time) ? icon_state_inactive : base_icon_state /obj/item/hand_tele/portal_destroyed(obj/effect/portal/P) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index df52cc09e1e..515128f65d2 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -115,15 +115,14 @@ resistance_flags = FIRE_PROOF -/obj/item/twohanded/fireaxe/update_icon() //Currently only here to fuck with the on-mob icons. - icon_state = "fireaxe[wielded]" - ..() +/obj/item/twohanded/fireaxe/update_icon_state() //Currently only here to fuck with the on-mob icons. + icon_state = "fireaxe[HAS_TRAIT(src, TRAIT_WIELDED)]" /obj/item/twohanded/fireaxe/afterattack(atom/A, mob/user, proximity) if(!proximity) return - if(wielded) //destroys windows and grilles in one hit + if(HAS_TRAIT(src, TRAIT_WIELDED)) //destroys windows and grilles in one hit if(istype(A, /obj/structure/window) || istype(A, /obj/structure/grille)) var/obj/structure/W = A W.obj_destruction("fireaxe") @@ -136,8 +135,8 @@ needs_permit = TRUE -/obj/item/twohanded/fireaxe/boneaxe/update_icon() - icon_state = "bone_axe[wielded]" +/obj/item/twohanded/fireaxe/boneaxe/update_icon_state() + icon_state = "bone_axe[HAS_TRAIT(src, TRAIT_WIELDED)]" /obj/item/twohanded/fireaxe/energized @@ -148,8 +147,8 @@ var/max_charge = 30 -/obj/item/twohanded/fireaxe/energized/update_icon() - if(wielded) +/obj/item/twohanded/fireaxe/energized/update_icon_state() + if(HAS_TRAIT(src, TRAIT_WIELDED)) icon_state = "fireaxe2" else icon_state = "fireaxe0" @@ -171,7 +170,7 @@ /obj/item/twohanded/fireaxe/energized/attack(mob/M, mob/user) . = ..() - if(wielded && charge == max_charge) + if(HAS_TRAIT(src, TRAIT_WIELDED) && charge == max_charge) if(isliving(M)) var/mob/living/target = M charge = 0 @@ -241,27 +240,26 @@ /obj/item/twohanded/dualsaber/IsReflect() - if(wielded) + if(HAS_TRAIT(src, TRAIT_WIELDED)) return TRUE -/obj/item/twohanded/dualsaber/update_icon() - if(wielded) - icon_state = "dualsaber[blade_color][wielded]" - set_light(brightness_on, l_color=colormap[blade_color]) +/obj/item/twohanded/dualsaber/update_icon_state() + if(HAS_TRAIT(src, TRAIT_WIELDED)) + icon_state = "dualsaber[blade_color]1" + set_light(brightness_on, l_color = colormap[blade_color]) else icon_state = "dualsaber0" set_light(0) - ..() /obj/item/twohanded/dualsaber/attack(mob/target, mob/living/user) ..() - if((CLUMSY in user.mutations) && (wielded) && prob(40)) + if((CLUMSY in user.mutations) && HAS_TRAIT(src, TRAIT_WIELDED) && prob(40)) to_chat(user, "You twirl around a bit before losing your balance and impaling yourself on the [src].") user.take_organ_damage(20, 25) return - if((wielded) && prob(50)) + if(HAS_TRAIT(src, TRAIT_WIELDED) && prob(50)) INVOKE_ASYNC(src, PROC_REF(jedi_spin), user) @@ -274,7 +272,7 @@ /obj/item/twohanded/dualsaber/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) - if(wielded) + if(HAS_TRAIT(src, TRAIT_WIELDED)) return ..() return FALSE @@ -344,8 +342,8 @@ var/icon_prefix = "spearglass" -/obj/item/twohanded/spear/update_icon() - icon_state = "[icon_prefix][wielded]" +/obj/item/twohanded/spear/update_icon_state() + icon_state = "[icon_prefix][HAS_TRAIT(src, TRAIT_WIELDED)]" /obj/item/twohanded/spear/CheckParts(list/parts_list) @@ -365,7 +363,7 @@ return if(isturf(AM)) //So you can actually melee with it return - if(explosive && wielded) + if(explosive && HAS_TRAIT(src, TRAIT_WIELDED)) explosive.forceMove(AM) explosive.prime() qdel(src) @@ -580,15 +578,12 @@ flags &= ~NODROP -/obj/item/twohanded/chainsaw/update_icon() - if(wielded) - icon_state = "chainsaw[wielded]" - else - icon_state = "chainsaw0" - ..() +/obj/item/twohanded/chainsaw/update_icon_state() + icon_state = "chainsaw[HAS_TRAIT(src, TRAIT_WIELDED)]" + /obj/item/twohanded/chainsaw/attack(mob/living/target, mob/living/user) - if(wielded) + if(HAS_TRAIT(src, TRAIT_WIELDED)) playsound(loc, 'sound/weapons/chainsaw.ogg', 100, 1, -1) //incredibly loud; you ain't goin' for stealth with this thing. Credit to Lonemonk of Freesound for this sound. if(isrobot(target)) ..() @@ -638,9 +633,9 @@ if(charged < 5) charged++ -/obj/item/twohanded/singularityhammer/update_icon() //Currently only here to fuck with the on-mob icons. - icon_state = "mjollnir[wielded]" - ..() +/obj/item/twohanded/singularityhammer/update_icon_state() //Currently only here to fuck with the on-mob icons. + icon_state = "mjollnir[HAS_TRAIT(src, TRAIT_WIELDED)]" + /obj/item/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder) for(var/atom/movable/X in orange(5, pull)) @@ -664,7 +659,7 @@ /obj/item/twohanded/singularityhammer/afterattack(atom/A, mob/user, proximity) if(!proximity) return - if(wielded) + if(HAS_TRAIT(src, TRAIT_WIELDED)) if(charged == 5) charged = 0 if(isliving(A)) @@ -699,9 +694,7 @@ /obj/item/twohanded/mjollnir/attack(mob/living/M, mob/user) ..() - if(wielded) - //if(charged == 5) - //charged = 0 + if(HAS_TRAIT(src, TRAIT_WIELDED)) playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) if(isliving(M)) M.Stun(4 SECONDS) @@ -714,9 +707,9 @@ L.Stun(4 SECONDS) shock(L) -/obj/item/twohanded/mjollnir/update_icon() //Currently only here to fuck with the on-mob icons. - icon_state = "mjollnir[wielded]" - ..() +/obj/item/twohanded/mjollnir/update_icon_state() //Currently only here to fuck with the on-mob icons. + icon_state = "mjollnir[HAS_TRAIT(src, TRAIT_WIELDED)]" + /obj/item/twohanded/knighthammer name = "singuloth knight's hammer" @@ -745,9 +738,9 @@ if(charged < 5) charged++ -/obj/item/twohanded/knighthammer/update_icon() //Currently only here to fuck with the on-mob icons. - icon_state = "knighthammer[wielded]" - ..() +/obj/item/twohanded/knighthammer/update_icon_state() //Currently only here to fuck with the on-mob icons. + icon_state = "knighthammer[HAS_TRAIT(src, TRAIT_WIELDED)]" + /obj/item/twohanded/knighthammer/afterattack(atom/A, mob/user, proximity) if(!proximity) @@ -763,13 +756,13 @@ var/atom/throw_target = get_edge_target_turf(Z, get_dir(src, get_step_away(Z, src))) Z.throw_at(throw_target, 200, 4) playsound(user, 'sound/weapons/marauder.ogg', 50, 1) - else if(wielded && Z.health < 1) + else if(HAS_TRAIT(src, TRAIT_WIELDED) && Z.health < 1) Z.visible_message("[Z.name] was blown to pieces by the power of [name]!", \ "You feel a powerful blow rip you apart!", \ "You hear a heavy impact and the sound of ripping flesh!.") Z.gib() playsound(user, 'sound/weapons/marauder.ogg', 50, 1) - if(wielded) + if(HAS_TRAIT(src, TRAIT_WIELDED)) if(istype(A, /turf/simulated/wall)) var/turf/simulated/wall/Z = A Z.ex_act(2) @@ -816,8 +809,8 @@ force_unwielded = 100 force_wielded = 500000 // Kills you DEAD. -/obj/item/twohanded/pitchfork/update_icon() - icon_state = "pitchfork[wielded]" +/obj/item/twohanded/pitchfork/update_icon_state() + icon_state = "pitchfork[HAS_TRAIT(src, TRAIT_WIELDED)]" /obj/item/twohanded/pitchfork/suicide_act(mob/user) user.visible_message("[user] impales \himself in \his abdomen with [src]! It looks like \he's trying to commit suicide...") @@ -844,7 +837,7 @@ // It's no fun being the lord of all hell if you can't get out of a simple room /obj/item/twohanded/pitchfork/demonic/ascended/afterattack(atom/target, mob/user, proximity) - if(!proximity || !wielded) + if(!proximity || !HAS_TRAIT(src, TRAIT_WIELDED)) return if(istype(target, /turf/simulated/wall)) var/turf/simulated/wall/W = target @@ -872,8 +865,8 @@ embed_chance = 50 embedded_ignore_throwspeed_threshold = TRUE -/obj/item/twohanded/bamboospear/update_icon() - icon_state = "bamboo_spear[wielded]" +/obj/item/twohanded/bamboospear/update_icon_state() + icon_state = "bamboo_spear[HAS_TRAIT(src, TRAIT_WIELDED)]" //pyro claws /obj/item/twohanded/required/pyro_claws @@ -1013,9 +1006,6 @@ w_class = initial(w_class) item_state = "" -/obj/item/twohanded/fishingrod/update_icon() - if(wielded) - icon_state = "fishing_rod[wielded]" - else - icon_state = "fishing_rod0" - ..() +/obj/item/twohanded/fishingrod/update_icon_state() + icon_state = "fishing_rod[HAS_TRAIT(src, TRAIT_WIELDED)]" + diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 6cc621bd3ce..736cca7b9f3 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -349,7 +349,6 @@ В официальных документах эта бита проходит под элегантным названием \"Высокоскоростная система доставки СРП\". \ Выдаваясь только самым верным и эффективным офицерам NanoTrasen, это оружие является одновременно символом статуса \ и инструментом высшего правосудия." - slot_flags = SLOT_BELT w_class = WEIGHT_CLASS_SMALL can_deflect = FALSE @@ -374,22 +373,39 @@ /// Attack verbs when extended (created on Initialize) var/list/attack_verb_on = list("smacked", "struck", "cracked", "beaten") + /obj/item/melee/baseball_bat/homerun/central_command/srt name = "тактическая бита ГСН" desc = "Выдвижная тактическая бита Центрального Командования Nanotrasen. Скорее всего, к этому моменту командование станции уже осознало, что их коленные чашечки не переживут эту встречу." - item_state = "srt_bat_0" item_state_on = "srt_bat_1" icon_state = "srt_bat_0" icon_state_on = "srt_bat_1" -/obj/item/melee/baseball_bat/homerun/central_command/Initialize(mapload) - . = ..() + +/obj/item/melee/baseball_bat/homerun/central_command/update_icon_state() icon_state = on ? icon_state_on : initial(icon_state) + item_state = on ? item_state_on : initial(item_state) + + +/obj/item/melee/baseball_bat/homerun/central_command/proc/toggle(mob/living/user) + on = !on + slot_flags = on ? NONE : SLOT_BELT force = on ? force_on : initial(force) attack_verb = on ? attack_verb_on : initial(attack_verb) w_class = on ? WEIGHT_CLASS_HUGE : WEIGHT_CLASS_SMALL homerun_able = on + homerun_ready = on + update_icon(UPDATE_ICON_STATE) + update_equipped_item() + playsound(loc, extend_sound, 50, TRUE) + add_fingerprint(user) + if(on) + to_chat(user, span_userdanger("Вы активировали [name] - время для правосудия!")) + else + to_chat(user, span_notice("Вы деактивировали [name].")) + + /obj/item/melee/baseball_bat/homerun/central_command/pickup(mob/living/user) if(!(isertmindshielded(user))) @@ -404,31 +420,10 @@ return FALSE return ..() + /obj/item/melee/baseball_bat/homerun/central_command/attack_self(mob/user) - on = !on - icon_state = on ? icon_state_on : initial(icon_state) - if(on) - to_chat(user, "Вы активировали [src.name] - время для правосудия!") - item_state = item_state_on - w_class = WEIGHT_CLASS_HUGE //doesnt fit in backpack when its on for balance - force = force_on - attack_verb = attack_verb_on - homerun_ready = TRUE - else - to_chat(user, "Вы деактивировали [src.name].") - item_state = initial(item_state) - slot_flags = SLOT_BELT - w_class = WEIGHT_CLASS_SMALL - force = initial(force) - attack_verb = initial(attack_verb) - homerun_ready = FALSE - // Update mob hand visuals - if(ishuman(user)) - var/mob/living/carbon/human/H = user - H.update_inv_l_hand() - H.update_inv_r_hand() - playsound(loc, extend_sound, 50, TRUE) - add_fingerprint(user) + toggle(user) + /obj/item/claymore/bone name = "bone sword" @@ -441,3 +436,4 @@ armour_penetration = 15 w_class = WEIGHT_CLASS_BULKY block_chance = 30 + diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index ef71c1cc4bf..31751386403 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -193,8 +193,8 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e if(!(resistance_flags & ON_FIRE) && (resistance_flags & FLAMMABLE) && !(resistance_flags & FIRE_PROOF)) resistance_flags |= ON_FIRE SSfires.processing[src] = src - add_overlay(GLOB.fire_overlay, TRUE) - return 1 + add_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay) + return TRUE ///called when the obj is destroyed by fire /obj/proc/burn() @@ -206,7 +206,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e /obj/proc/extinguish() if(resistance_flags & ON_FIRE) resistance_flags &= ~ON_FIRE - cut_overlay(GLOB.fire_overlay, TRUE) + cut_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay, TRUE) SSfires.processing -= src ///Called when the obj is hit by a tesla bolt. diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 138cd396ed8..47ba86c7220 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -79,11 +79,11 @@ do_climb(usr) -/obj/structure/MouseDrop_T(var/atom/movable/C, mob/user as mob) - if(..()) - return - if(C == user) +/obj/structure/MouseDrop_T(atom/movable/dropping, mob/user, params) + . = ..() + if(!. && dropping == user) do_climb(user) + return TRUE /obj/structure/proc/density_check() for(var/obj/O in orange(0, src)) @@ -212,18 +212,18 @@ /obj/structure/proc/can_touch(mob/living/user) if(!istype(user)) - return 0 + return FALSE if(!Adjacent(user)) - return 0 + return FALSE if(user.restrained() || user.buckled) - to_chat(user, "You need your hands and legs free for this.") - return 0 - if(user.stat || user.IsParalyzed() || user.IsSleeping() || user.lying || user.IsWeakened()) - return 0 + to_chat(user, span_notice("You need your hands and legs free for this.")) + return FALSE + if(user.incapacitated()) + return FALSE if(issilicon(user)) - to_chat(user, "You need hands for this.") - return 0 - return 1 + to_chat(user, span_notice("You need hands for this.")) + return FALSE + return TRUE /obj/structure/examine(mob/user) . = ..() @@ -235,17 +235,19 @@ var/examine_status = examine_status(user) if(examine_status) . += examine_status + if(climbable) + . += "You can Click-Drag someone to [src] to put them on the table after a short delay." /obj/structure/proc/examine_status(mob/user) //An overridable proc, mostly for falsewalls. var/healthpercent = (obj_integrity/max_integrity) * 100 switch(healthpercent) if(50 to 99) - return "It looks slightly damaged." + . += "It looks slightly damaged." if(25 to 50) - return "It appears heavily damaged." + . += "It appears heavily damaged." if(0 to 25) if(!broken) - return "It's falling apart!" + . += "It's falling apart!" /obj/structure/proc/prevents_buckled_mobs_attacking() return FALSE diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index f7060c17f70..607555ec888 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -150,7 +150,7 @@ return ..() -/obj/structure/alien/resin/door/update_icon() +/obj/structure/alien/resin/door/update_icon_state() switch(state) if(RESIN_DOOR_CLOSED) icon_state = "resin_door_closed" @@ -460,18 +460,35 @@ status = BURST icon_state = "egg_hatched" -/obj/structure/alien/egg/New() - new /obj/item/clothing/mask/facehugger(src) - ..() - if(status == BURST) - obj_integrity = integrity_failure - else if(status != GROWN) - spawn(rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME)) - Grow() + +/obj/structure/alien/egg/Initialize(mapload) + . = ..() + update_icon(UPDATE_ICON_STATE) + switch(status) + if(GROWING) + new /obj/item/clothing/mask/facehugger(src) + addtimer(CALLBACK(src, PROC_REF(Grow)), rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME)) + if(GROWN) + new /obj/item/clothing/mask/facehugger(src) + AddComponent(/datum/component/proximity_monitor) + if(BURST) + obj_integrity = integrity_failure + + +/obj/structure/alien/egg/update_icon_state() + switch(status) + if(GROWING) + icon_state = "egg_growing" + if(GROWN) + icon_state = "egg" + if(BURST) + icon_state = "egg_hatched" + /obj/structure/alien/egg/attack_alien(mob/living/carbon/alien/user) return attack_hand(user) + /obj/structure/alien/egg/attack_hand(mob/living/user) if(user.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel)) switch(status) @@ -485,7 +502,7 @@ return if(GROWN) to_chat(user, "You retrieve the child.") - Burst(0) + Burst(kill = FALSE) return else to_chat(user, "It feels slimy.") @@ -495,51 +512,62 @@ /obj/structure/alien/egg/proc/GetFacehugger() return locate(/obj/item/clothing/mask/facehugger) in contents + /obj/structure/alien/egg/proc/Grow() - icon_state = "egg" status = GROWN + update_icon(UPDATE_ICON_STATE) AddComponent(/datum/component/proximity_monitor) + +///Need to carry the kill from Burst() to Hatch(), this section handles the alien opening the egg /obj/structure/alien/egg/proc/Burst(kill = TRUE) //drops and kills the hugger if any is remaining if(status == GROWN || status == GROWING) playsound(get_turf(src), 'sound/creatures/alien/xeno_egg_crack.ogg', 50) - icon_state = "egg_hatched" flick("egg_opening", src) status = BURSTING qdel(GetComponent(/datum/component/proximity_monitor)) - spawn(15) - status = BURST - var/obj/item/clothing/mask/facehugger/child = GetFacehugger() - if(child) - child.loc = get_turf(src) - if(kill && istype(child)) - child.Die() - else - for(var/mob/M in range(1,src)) - if(CanHug(M)) - child.Attach(M) - break + addtimer(CALLBACK(src, PROC_REF(Hatch), kill), 1.5 SECONDS) + + +///We now check HOW the hugger is hatching, kill carried from Burst() and obj_break() +/obj/structure/alien/egg/proc/Hatch(kill) + status = BURST + update_icon(UPDATE_ICON_STATE) + var/obj/item/clothing/mask/facehugger/child = GetFacehugger() + if(!child) + return + child.forceMove(get_turf(src)) + if(kill) + child.Die() + return + for(var/mob/living/victim in range(1, src)) + if(CanHug(victim)) + child.Attach(victim) + break + /obj/structure/alien/egg/obj_break(damage_flag) - if(!(flags & NODECONSTRUCT)) - if(status != BURST) - Burst(kill = TRUE) + if(!(flags & NODECONSTRUCT) && status != BURST) + Burst(kill = TRUE) + /obj/structure/alien/egg/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() if(exposed_temperature > 500) take_damage(5, BURN, 0, 0) + /obj/structure/alien/egg/HasProximity(atom/movable/AM) if(status == GROWN) if(!CanHug(AM)) return - var/mob/living/carbon/C = AM - if(C.stat == CONSCIOUS && C.get_int_organ(/obj/item/organ/internal/body_egg/alien_embryo)) + var/mob/living/carbon/target = AM + if(iscarbon(target) && target.stat == CONSCIOUS && target.get_int_organ(/obj/item/organ/internal/body_egg/alien_embryo)) return - Burst(0) + Burst(kill = FALSE) + #undef BURST #undef BURSTING diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index c71ec0075d7..38f3a956792 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -6,6 +6,7 @@ req_access = list(ACCESS_BAR) max_integrity = 500 integrity_failure = 250 + blocks_emissive = FALSE armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) var/list/barsigns=list() var/list/hiddensigns diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index f6398b2f16e..d3e03623d6a 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -246,7 +246,7 @@ LINEN BINS desc = "A linen bin. It looks rather cosy." icon = 'icons/obj/structures.dmi' icon_state = "linenbin-full" - anchored = 1 + anchored = TRUE resistance_flags = FLAMMABLE max_integrity = 70 var/amount = 20 @@ -263,7 +263,7 @@ LINEN BINS else . += "There are [amount] bed sheets in the bin." -/obj/structure/bedsheetbin/update_icon() +/obj/structure/bedsheetbin/update_icon_state() switch(amount) if(0) icon_state = "linenbin-empty" @@ -276,13 +276,13 @@ LINEN BINS /obj/structure/bedsheetbin/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) if(amount) amount = 0 - update_icon() + update_icon(UPDATE_ICON_STATE) ..() /obj/structure/bedsheetbin/burn() amount = 0 extinguish() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/bedsheet)) @@ -338,7 +338,7 @@ LINEN BINS B.loc = loc to_chat(user, "You telekinetically remove [B] from [src].") - update_icon() + update_icon(UPDATE_ICON_STATE) if(hidden) hidden.loc = loc diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 1d2d70ebdf1..2f0f691800e 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -3,104 +3,103 @@ desc = "Rack that holds coats." icon = 'icons/obj/coatrack.dmi' icon_state = "coatrack0" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/obj/item/clothing/suit/coat - var/list/allowed = list( + var/static/list/allowed = list( /obj/item/clothing/suit/storage/labcoat, /obj/item/clothing/suit/storage/det_suit, /obj/item/clothing/suit/storage/blueshield, /obj/item/clothing/suit/leathercoat, - /obj/item/clothing/suit/browntrenchcoat + /obj/item/clothing/suit/browntrenchcoat, ) + /obj/structure/coatrack/Initialize(mapload) . = ..() icon_state = "coatrack[rand(0, 1)]" + /obj/structure/coatrack/attack_hand(mob/living/user) if(coat) add_fingerprint(user) - user.visible_message("[user] takes [coat] off \the [src].", "You take [coat] off the \the [src].") + user.visible_message("[user] takes [coat] off [src].", "You take [coat] off [src].") coat.forceMove_turf() user.put_in_active_hand(coat, ignore_anim = FALSE) coat = null - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/structure/coatrack/attackby(obj/item/W, mob/living/user, params) - var/can_hang = FALSE - for(var/T in allowed) - if(istype(W,T)) - can_hang = TRUE - break - if(can_hang && !coat) - add_fingerprint(user) - user.visible_message("[user] hangs [W] on \the [src].", "You hang [W] on the \the [src].") - coat = W - user.drop_transfer_item_to_loc(W, src) - update_icon() - else +/obj/structure/coatrack/attackby(obj/item/W, mob/living/user, params) + if(!move_on_rack(W, user)) return ..() -/obj/structure/coatrack/MouseDrop_T(obj/item/W, mob/user) + +/obj/structure/coatrack/MouseDrop_T(obj/item/I, mob/user, params) + . = TRUE + move_on_rack(I, user) + + +/obj/structure/coatrack/Bumped(atom/movable/moving_atom) + . = ..() + move_on_rack(moving_atom) + + +/obj/structure/coatrack/proc/move_on_rack(atom/movable/moving_atom, mob/living/user) + . = FALSE + if(coat) + return . + var/can_hang = FALSE - for(var/T in allowed) - if(istype(W,T)) + for(var/check_type in allowed) + if(istype(moving_atom, check_type)) can_hang = TRUE break - if(can_hang && !coat) - add_fingerprint(user) - user.visible_message("[user] hangs [W] on \the [src].", "You hang [W] on the \the [src].") - coat = W - user.drop_transfer_item_to_loc(W, src) - update_icon() - else - return ..() + if(can_hang) + if(user && !user.drop_transfer_item_to_loc(moving_atom, src)) + return . + . = TRUE + coat = moving_atom + if(user) + add_fingerprint(user) + user.visible_message("[user] hangs [coat] on [src].", "You hang [coat] on [src].") + else + visible_message("[coat] lands on [src].") + coat.forceMove(src) + update_icon(UPDATE_OVERLAYS) -// Hanging a coat on the hanger only after a bump. Force stoping throwing -/obj/structure/coatrack/Bumped(atom/movable/moving_atom) - ..() - if (coat) - return +/obj/structure/coatrack/update_overlays() + . = ..() - for (var/T in allowed) - if (!istype(moving_atom, T)) - continue - visible_message("[moving_atom] lands on \the [src].") - moving_atom.forceMove(src) - coat = moving_atom - update_icon() + if(!coat) return -/obj/structure/coatrack/update_icon() - overlays.Cut() - if(istype(coat, /obj/item/clothing/suit/storage/labcoat)) - overlays += image(icon, icon_state = "coat_lab") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/cmo)) - overlays += image(icon, icon_state = "coat_cmo") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/mad)) - overlays += image(icon, icon_state = "coat_mad") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/genetics)) - overlays += image(icon, icon_state = "coat_gen") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/chemist)) - overlays += image(icon, icon_state = "coat_chem") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/virologist)) - overlays += image(icon, icon_state = "coat_vir") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/science)) - overlays += image(icon, icon_state = "coat_sci") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/mortician)) - overlays += image(icon, icon_state = "coat_mor") - if(istype(coat, /obj/item/clothing/suit/storage/blueshield)) - overlays += image(icon, icon_state = "coat_blue") - if(istype(coat, /obj/item/clothing/suit/storage/det_suit)) - overlays += image(icon, icon_state = "coat_det") - if(istype(coat, /obj/item/clothing/suit/browntrenchcoat)) - overlays += image(icon, icon_state = "coat_brtrench") - if(istype(coat, /obj/item/clothing/suit/leathercoat)) - overlays += image(icon, icon_state = "coat_leather") + var/static/list/type2overlay = list( + /obj/item/clothing/suit/storage/labcoat/cmo = "coat_cmo", + /obj/item/clothing/suit/storage/labcoat/mad = "coat_mad", + /obj/item/clothing/suit/storage/labcoat/genetics = "coat_gen", + /obj/item/clothing/suit/storage/labcoat/chemist = "coat_chem", + /obj/item/clothing/suit/storage/labcoat/virologist = "coat_vir", + /obj/item/clothing/suit/storage/labcoat/science = "coat_sci", + /obj/item/clothing/suit/storage/labcoat/mortician = "coat_mor", + /obj/item/clothing/suit/storage/labcoat = "coat_lab", + /obj/item/clothing/suit/storage/blueshield = "coat_det", + /obj/item/clothing/suit/browntrenchcoat = "coat_brtrench", + /obj/item/clothing/suit/leathercoat = "coat_leather", + ) + + var/coat_found = FALSE + for(var/path in type2overlay) + if(coat.type == path) // we need to check type explicitly + . += type2overlay[path] + coat_found = TRUE + break + + if(!coat_found) + . += "coat_lab" + /obj/structure/coatrack/crowbar_act(mob/user, obj/item/I) . = TRUE @@ -109,16 +108,19 @@ TOOL_DISMANTLE_SUCCESS_MESSAGE deconstruct(disassembled = TRUE) + /obj/structure/coatrack/wrench_act(mob/user, obj/item/I) . = TRUE default_unfasten_wrench(user, I, time = 10) + /obj/structure/coatrack/deconstruct(disassembled = FALSE) var/mat_drop = 2 if(disassembled) mat_drop = 10 new /obj/item/stack/sheet/wood(drop_location(), mat_drop) if(coat) - coat.loc = get_turf(src) + coat.forceMove_turf() coat = null ..() + diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 91af470b716..1ac4691d5b6 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -1,13 +1,18 @@ +GLOBAL_LIST_EMPTY(closets) + /obj/structure/closet name = "closet" desc = "It's a basic storage unit." icon = 'icons/obj/closet.dmi' icon_state = "closed" - density = 1 + density = TRUE layer = LOW_ITEM_LAYER //Prevents items from dropping on turf visually max_integrity = 200 integrity_failure = 50 armor = list("melee" = 20, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 60) + + /// Special marker for the closet to use default icon_closed/icon_opened states, skipping everything else. + var/no_overlays = FALSE var/icon_closed = "closed" //stays here for compatibility issues var/icon_opened = "open" @@ -19,12 +24,13 @@ var/custom_door_overlay = null //handles overlay of door looking into screen var/custom_open_overlay = null //handles overlay of opened door (its inner side) + var/ignore_density_closed = FALSE var/opened = FALSE var/welded = FALSE var/locked = FALSE var/large = TRUE var/can_be_emaged = FALSE - var/wall_mounted = 0 //never solid (You can always pass over it) + var/wall_mounted = FALSE //never solid (You can always pass over it) var/lastbang var/open_sound = 'sound/machines/closet_open.ogg' var/close_sound = 'sound/machines/closet_close.ogg' @@ -42,6 +48,7 @@ // Please dont override this unless you absolutely have to /obj/structure/closet/Initialize(mapload) . = ..() + GLOB.closets += src if(mapload && !opened) // Youre probably asking, why is this a 0 seconds timer AA? // Well, I will tell you. One day, all /obj/effect/spawner will use Initialize @@ -60,7 +67,8 @@ /obj/structure/closet/proc/take_contents() var/itemcount = 0 for(var/obj/item/I in loc) - if(I.density || I.anchored || I == src) continue + if(I.density || I.anchored || I == src) + continue I.forceMove(src) // Ensure the storage cap is respected if(++itemcount >= storage_capacity) @@ -68,6 +76,7 @@ // Fix for #383 - C4 deleting fridges with corpses /obj/structure/closet/Destroy() + GLOB.closets -= src dump_contents() return ..() @@ -162,12 +171,14 @@ playsound(loc, close_sound, close_sound_volume, TRUE, -3) else playsound(loc, 'sound/machines/click.ogg', close_sound_volume, TRUE, -3) - density = TRUE + density = ignore_density_closed ? FALSE : TRUE return TRUE /obj/structure/closet/proc/toggle(mob/user) + . = TRUE if(!(opened ? close() : open())) - to_chat(user, "It won't budge!") + . = FALSE + to_chat(user, span_notice("It won't budge!")) /obj/structure/closet/proc/bust_open() welded = FALSE //applies to all lockers @@ -247,10 +258,10 @@ user.visible_message("[user] welds [src] [adjective]!", "You weld [src] [adjective]!") welded = !welded update_icon() - return -/obj/structure/closet/MouseDrop_T(atom/movable/O, mob/living/user) - ..() + +/obj/structure/closet/MouseDrop_T(atom/movable/O, mob/living/user, params) + . = ..() if(istype(O, /obj/screen)) //fix for HUD elements making their way into the world -Pete return if(O.loc == user) @@ -271,6 +282,7 @@ if(user != O) user.visible_message("[user] stuffs [O] into [src]!", "You stuff [O] into [src]!") add_fingerprint(user) + return TRUE /obj/structure/closet/attack_ai(mob/user) if(isrobot(user) && Adjacent(user)) //Robots can open/close it, but not the AI @@ -300,8 +312,7 @@ // tk grab then use on self /obj/structure/closet/attack_self_tk(mob/user) add_fingerprint(user) - if(!toggle()) - to_chat(usr, "It won't budge!") + toggle() /obj/structure/closet/verb/verb_toggleopen() set src in oview(1) @@ -317,20 +328,43 @@ else to_chat(usr, "This mob type can't use this verb.") -/obj/structure/closet/update_icon() //Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) - overlays.Cut() - if(!opened) - if(custom_door_overlay) - overlays += "[custom_door_overlay]_door" + +/obj/structure/closet/update_icon(updates = ALL) + if(no_overlays) + return ..(UPDATE_ICON_STATE) + return ..() + + +/obj/structure/closet/update_icon_state() + if(no_overlays) + icon_state = opened ? icon_opened : icon_closed + + +/obj/structure/closet/update_overlays() + . = ..() + if(opened) + if(custom_open_overlay) + . += "[custom_open_overlay]_open" else - overlays += "[icon_state]_door" //No initials because of custom map-made closets. - if(welded) - overlays += "welded" + . += "[icon_state]_open" else - if(custom_open_overlay) - overlays += "[custom_open_overlay]_open" + for(var/olay in apply_contents_overlays()) + . += olay + if(custom_door_overlay) + . += "[custom_door_overlay]_door" else - overlays += "[icon_state]_open" + . += "[icon_state]_door" //No initials because of custom map-made closets. + if(welded) + . += "welded" + + +/** + * Additional overlays for contents inside the closet. Usefull when the door is transparent. + */ +/obj/structure/closet/proc/apply_contents_overlays() + RETURN_TYPE(/list) + . = list() + // Objects that try to exit a locker by stepping were doing so successfully, // and due to an oversight in turf/Enter() were going through walls. That @@ -434,23 +468,26 @@ transparent = transparency update_icon() -/obj/structure/closet/bluespace/update_icon() - overlays.Cut() - icon_state = initial(icon_state) + +/obj/structure/closet/bluespace/update_icon_state() + icon_state = "[initial(icon_state)][transparent ? "_trans" : ""]" + + +/obj/structure/closet/bluespace/update_overlays() + . = list() if(!opened) - if(welded) - overlays += "welded" if(transparent) - icon_state += "_trans" - overlays += "[initial(icon_state)]_door_trans" + . += "[initial(icon_state)]_door_trans" else - overlays += "[initial(icon_state)]_door" + . += "[initial(icon_state)]_door" + if(welded) + . += "welded" else if(transparent) - icon_state += "_trans" - overlays += "[initial(icon_state)]_open_trans" + . += "[initial(icon_state)]_open_trans" else - overlays += "[initial(icon_state)]_open" + . += "[initial(icon_state)]_open" + /obj/structure/closet/bluespace/Crossed(atom/movable/AM, oldloc) if(AM.density) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 448e51d9949..5b71d629ad4 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -3,8 +3,6 @@ desc = "Just a box..." icon = 'icons/obj/cardboard_boxes.dmi' icon_state = "cardboard" - icon_opened = "cardboard_open" - icon_closed = "cardboard" resistance_flags = FLAMMABLE max_integrity = 70 integrity_failure = 0 @@ -13,6 +11,7 @@ open_sound_volume = 35 close_sound_volume = 35 material_drop = /obj/item/stack/sheet/cardboard + no_overlays = TRUE var/decal = "" var/amt = 4 var/move_delay = FALSE @@ -71,7 +70,7 @@ /obj/structure/closet/cardboard/attackby(obj/item/W as obj, mob/user as mob, params) if(src.opened) - if(istype(W, /obj/item/wirecutters)) + if(W.tool_behaviour == TOOL_WIRECUTTER) var/obj/item/wirecutters/WC = W new /obj/item/stack/sheet/cardboard(src.loc, amt) for(var/mob/M in viewers(src)) @@ -105,7 +104,7 @@ update_icon() -/obj/structure/closet/cardboard/update_icon() //Not deriving, because of different logic. +/obj/structure/closet/cardboard/update_icon_state() //Not deriving, because of different logic. if(!opened) if(decal) icon_state = "cardboard_" + decal @@ -116,3 +115,8 @@ icon_state = "cardboard_open_" + decal else icon_state = "cardboard_open" + + +/obj/structure/closet/cardboard/update_overlays() + . = list() + diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm index edb3d1e50d1..eb8d7490fbd 100644 --- a/code/game/objects/structures/crates_lockers/closets/coffin.dm +++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm @@ -11,12 +11,8 @@ close_sound = 'sound/machines/wooden_closet_close.ogg' open_sound_volume = 25 close_sound_volume = 50 + no_overlays = TRUE -/obj/structure/closet/coffin/update_icon() - if(!opened) - icon_state = icon_closed - else - icon_state = icon_opened /obj/structure/closet/coffin/sarcophagus name = "sarcophagus" diff --git a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm index 8370048ecd0..83f34b4eb07 100644 --- a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm @@ -2,6 +2,4 @@ name = "critter crate" desc = "A crate which can sustain life for a while." icon_state = "critter" - icon_opened = "critteropen" - icon_closed = "critter" material_drop = /obj/item/stack/sheet/wood diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 1b9f3d38738..3c6f12d69c7 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -2,234 +2,204 @@ /obj/structure/closet/fireaxecabinet name = "fire axe cabinet" desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if." - icon_state = "fireaxe1000" - icon_closed = "fireaxe1000" - icon_opened = "fireaxe1100" + icon_state = "fireaxe_full_0hits" + icon_closed = "fireaxe_full_0hits" + icon_opened = "fireaxe_full_open" anchored = TRUE density = FALSE - armor = list("melee" = 50, "bullet" = 20, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50) - opened = TRUE - locked = TRUE + no_overlays = TRUE + armor = list(MELEE = 50, BULLET = 20, LASER = 0, ENERGY = 100, BOMB = 10, RAD = 100, FIRE = 90, ACID = 50) var/obj/item/twohanded/fireaxe/fireaxe var/localopened = FALSE //Setting this to keep it from behaviouring like a normal closet and obstructing movement in the map. -Agouri + opened = TRUE var/hitstaken = FALSE + locked = TRUE var/smashed = FALSE + var/operating = FALSE + var/has_axe = null // Use a string over a boolean value to make the sprite names more readable -/obj/structure/closet/fireaxecabinet/Initialize(mapload) - . = ..() - if(!fireaxe) - fireaxe = new(src) - update_icon() +/obj/structure/closet/fireaxecabinet/Destroy() + if(!obj_integrity) + if(fireaxe) + fireaxe.forceMove(loc) + fireaxe = null + else + QDEL_NULL(fireaxe) + return ..() + + +/obj/structure/closet/fireaxecabinet/populate_contents() + fireaxe = new(src) + has_axe = "full" + update_icon(UPDATE_ICON_STATE) // So its initial icon doesn't show it without the fireaxe /obj/structure/closet/fireaxecabinet/examine(mob/user) . = ..() - . += "Use a multitool to lock/unlock it." + if(!smashed) + . += span_notice("Use a multitool to lock/unlock it.") + else + . += span_notice("It is damaged beyond repair.") -/obj/structure/closet/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/living/user as mob) //Marker -Agouri + +/obj/structure/closet/fireaxecabinet/attackby(obj/item/I, mob/living/user) + add_fingerprint(user) if(isrobot(user) || locked) - if(istype(O, /obj/item/multitool)) - to_chat(user, "Resetting circuitry...") - playsound(user, 'sound/machines/lockreset.ogg', 50, 1) - if(do_after(user, 20 * O.toolspeed * gettoolspeedmod(user), target = src)) - add_fingerprint(user) - locked = FALSE - to_chat(user, " You disable the locking modules.") - update_icon() - return - else if(istype(O, /obj/item)) - user.changeNext_move(CLICK_CD_MELEE) - var/obj/item/W = O - if(smashed || localopened) - if(localopened) - add_fingerprint(user) - localopened = FALSE - update_icon_closing() + if(ismultitool(I)) + to_chat(user, span_warning("Resetting circuitry...")) + playsound(user, 'sound/machines/lockreset.ogg', 50, TRUE) + if(!do_after_once(user, 2 SECONDS * I.toolspeed, target = src)) return - else - user.do_attack_animation(src) - playsound(user, 'sound/effects/glasshit.ogg', 100, 1) //We don't want this playing every time - if(W.force < 15) - to_chat(user, "The cabinet's protective glass glances off the hit.") - else - hitstaken++ - if(hitstaken == 4) - playsound(user, 'sound/effects/glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that. - smashed = TRUE - locked = FALSE - localopened = TRUE - add_fingerprint(user) - update_icon() + + locked = FALSE + to_chat(user, span_caution("You disable the locking modules.")) + update_icon(UPDATE_ICON_STATE) + return + + user.changeNext_move(CLICK_CD_MELEE) + if(smashed || localopened) + if(localopened) + operate_panel() + return + + user.do_attack_animation(src) + playsound(user, 'sound/effects/glasshit.ogg', 100, TRUE) //We don't want this playing every time + if(I.force < 15) + to_chat(user, span_notice("The cabinet's protective glass glances off the hit.")) + else + hitstaken++ + if(hitstaken == 4) + playsound(user, 'sound/effects/glassbr3.ogg', 100, TRUE) //Break cabinet, receive goodies. Cabinet's fucked for life after that. + smashed = TRUE + locked = FALSE + localopened = TRUE + update_icon(UPDATE_ICON_STATE) return - if(istype(O, /obj/item/twohanded/fireaxe) && localopened) + + if(istype(I, /obj/item/twohanded/fireaxe) && localopened) if(!fireaxe) - var/obj/item/twohanded/fireaxe/F = O - if(F.wielded) - to_chat(user, "Unwield \the [F] first.") - return - if(!user.drop_item_ground(F)) - to_chat(user, "\The [F] stays stuck to your hands!") + var/obj/item/twohanded/fireaxe/placed_axe = I + if(HAS_TRAIT(placed_axe, TRAIT_WIELDED)) + to_chat(user, span_warning("Unwield [placed_axe] first.")) return - add_fingerprint(user) - fireaxe = F - contents += F - to_chat(user, "You place \the [F] back in the [name].") - update_icon() - else - if(smashed) + if(!user.drop_transfer_item_to_loc(placed_axe, src)) + to_chat(user, span_warning("[placed_axe] stays stuck to your hands!")) return - else - add_fingerprint(user) - localopened = !localopened - if(localopened) - update_icon_opening() - else - update_icon_closing() - else + fireaxe = placed_axe + has_axe = "full" + to_chat(user, span_notice("You place [placed_axe] back in the [name].")) + update_icon(UPDATE_ICON_STATE) + return + if(smashed) return - if(istype(O, /obj/item/multitool)) - if(localopened) - add_fingerprint(user) - localopened = FALSE - update_icon_closing() - return - else - to_chat(user, "Resetting circuitry...") - playsound(user, 'sound/machines/lockenable.ogg', 50, 1) - if(do_after(user, 20 * O.toolspeed * gettoolspeedmod(user), target = src)) - add_fingerprint(user) - locked = TRUE - to_chat(user, " You re-enable the locking modules.") - return - else - add_fingerprint(user) - localopened = !localopened - if(localopened) - update_icon_opening() - else - update_icon_closing() -/obj/structure/closet/fireaxecabinet/attack_hand(mob/user as mob) + operate_panel() + return + + if(smashed) + return + + if(ismultitool(I)) + if(localopened) + operate_panel() + return + + to_chat(user, span_warning("Resetting circuitry...")) + playsound(user, 'sound/machines/lockenable.ogg', 50, TRUE) + if(!do_after_once(user, 2 SECONDS * I.toolspeed, target = src)) + return + + locked = TRUE + to_chat(user, span_caution("You re-enable the locking modules.")) + return + + operate_panel() + + +/obj/structure/closet/fireaxecabinet/attack_hand(mob/user) if(locked) - to_chat(user, "The cabinet won't budge!") + to_chat(user, span_warning("The cabinet won't budge!")) return - if(localopened) - if(fireaxe) - add_fingerprint(user) - fireaxe.forceMove_turf() - user.put_in_hands(fireaxe, ignore_anim = FALSE) - to_chat(user, "You take \the [fireaxe] from the [src].") - fireaxe = null - add_fingerprint(user) - update_icon() - else - if(smashed) - return - else - add_fingerprint(user) - localopened = !localopened - if(localopened) - update_icon_opening() - else - update_icon_closing() + if(localopened && fireaxe) + fireaxe.forceMove_turf() + user.put_in_hands(fireaxe, ignore_anim = FALSE) + to_chat(user, span_notice("You take [fireaxe] from [src].")) + has_axe = "empty" + fireaxe = null - else add_fingerprint(user) - localopened = !localopened //I'm pretty sure we don't need an if(smashed) in here. In case I'm wrong and it fucks up teh cabinet, **MARKER**. -Agouri - if(localopened) - update_icon_opening() - else - update_icon_closing() + update_icon(UPDATE_ICON_STATE) + return + + if(smashed) + return -/obj/structure/closet/fireaxecabinet/attack_tk(mob/user as mob) + operate_panel() + + +/obj/structure/closet/fireaxecabinet/attack_tk(mob/user) if(localopened && fireaxe) fireaxe.forceMove(loc) - to_chat(user, "You telekinetically remove \the [fireaxe].") + to_chat(user, span_notice("You telekinetically remove \the [fireaxe].")) + has_axe = "empty" fireaxe = null - update_icon() + update_icon(UPDATE_ICON_STATE) return attack_hand(user) -/obj/structure/closet/fireaxecabinet/verb/toggle_openness() //nice name, huh? HUH?! -Erro //YEAH -Agouri - set name = "Open/Close" - set category = "Object" - if(isrobot(usr) || locked || smashed) - if(locked) - to_chat(usr, "The cabinet won't budge!") - else if(smashed) - to_chat(usr, "The protective glass is broken!") +/obj/structure/closet/fireaxecabinet/attack_ai(mob/user) + if(smashed) + to_chat(user, span_warning("The security of the cabinet is compromised.")) return - localopened = !localopened - update_icon() + locked = !locked + if(locked) + to_chat(user, span_warning("Cabinet locked.")) + else + to_chat(user, span_notice("Cabinet unlocked.")) -/obj/structure/closet/fireaxecabinet/verb/remove_fire_axe() - set name = "Remove Fire Axe" - set category = "Object" - if(isrobot(usr)) +/obj/structure/closet/fireaxecabinet/proc/operate_panel() + if(operating) return + operating = TRUE + localopened = !localopened + do_animate() + operating = FALSE - if(localopened) - if(fireaxe) - fireaxe.forceMove_turf() - usr.put_in_hands(fireaxe, ignore_anim = FALSE) - to_chat(usr, "You take \the [fireaxe] from the [src].") - fireaxe = null - else - to_chat(usr, "The [src] is empty.") - else - to_chat(usr, "The [src] is closed.") - update_icon() -/obj/structure/closet/fireaxecabinet/attack_ai(mob/user as mob) - if(smashed) - to_chat(user, "The security of the cabinet is compromised.") - return +/obj/structure/closet/fireaxecabinet/proc/do_animate() + if(!localopened) + flick("fireaxe_[has_axe]_closing", src) else - locked = !locked - if(locked) - to_chat(user, "Cabinet locked.") - else - to_chat(user, "Cabinet unlocked.") + flick("fireaxe_[has_axe]_opening", src) + sleep(1 SECONDS) + update_icon(UPDATE_ICON_STATE) -/obj/structure/closet/fireaxecabinet/proc/update_icon_opening() - var/hasaxe = fireaxe != null - icon_state = "fireaxe[hasaxe][localopened][hitstaken][smashed]opening" - spawn(10) - update_icon() -/obj/structure/closet/fireaxecabinet/proc/update_icon_closing() - var/hasaxe = fireaxe != null - icon_state = "fireaxe[hasaxe][localopened][hitstaken][smashed]closing" - spawn(10) - update_icon() +/obj/structure/closet/fireaxecabinet/update_icon_state() + if(localopened && !smashed) + icon_state = "fireaxe_[has_axe]_open" + else + icon_state = "fireaxe_[has_axe]_[hitstaken]hits" -/obj/structure/closet/fireaxecabinet/update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers - var/hasaxe = fireaxe != null - icon_state = "fireaxe[hasaxe][localopened][hitstaken][smashed]" /obj/structure/closet/fireaxecabinet/open() return + /obj/structure/closet/fireaxecabinet/close() return + /obj/structure/closet/fireaxecabinet/welder_act(mob/user, obj/item/I) //A bastion of sanity in a sea of madness return -/obj/structure/closet/fireaxecabinet/Destroy() - if(!obj_integrity) - if(fireaxe) - fireaxe.forceMove(loc) - fireaxe = null - else - QDEL_NULL(fireaxe) - return ..() + //mining "fireaxe" /obj/structure/fishingrodcabinet @@ -240,42 +210,45 @@ anchored = TRUE var/obj/item/twohanded/fishingrod/olreliable //what the fuck? -/obj/structure/fishingrodcabinet/Initialize() + +/obj/structure/fishingrodcabinet/Initialize(mapload) . = ..() - if(!olreliable) - olreliable = new(src) - update_icon() + olreliable = new(src) + update_icon(UPDATE_OVERLAYS) + -/obj/structure/fishingrodcabinet/update_icon() +/obj/structure/fishingrodcabinet/update_overlays() . = ..() - cut_overlays() if(olreliable) - add_overlay("rod") + . += "rod" -/obj/structure/fishingrodcabinet/attackby(var/obj/item/O as obj, var/mob/living/user as mob) - if(istype(O, /obj/item/twohanded/fishingrod)) - var/obj/item/twohanded/fishingrod/R = O - if(R.wielded) - to_chat(user, "Unwield \the [R] first.") - return - if(!user.drop_item_ground(R)) - to_chat(user, "\The [R] stays stuck to your hands!") - return - add_fingerprint(user) - olreliable = R - contents += R - to_chat(user, "You place \the [R] back in the [name].") - update_icon() +/obj/structure/fishingrodcabinet/attackby(obj/item/I, mob/living/user) + if(!istype(I, /obj/item/twohanded/fishingrod)) + return ..() + var/obj/item/twohanded/fishingrod/rod = I + if(HAS_TRAIT(rod, TRAIT_WIELDED)) + to_chat(user, span_warning("Unwield [rod] first.")) + return + if(!user.drop_transfer_item_to_loc(rod, src)) + to_chat(user, span_warning("[rod] stays stuck to your hands!")) + return -/obj/structure/fishingrodcabinet/attack_hand(mob/user as mob) - if(olreliable) - add_fingerprint(user) - olreliable.forceMove_turf() - user.put_in_hands(olreliable, ignore_anim = FALSE) - to_chat(user, "You take \the [olreliable] from the [src].") - olreliable = null + olreliable = rod + to_chat(user, span_notice("You place [rod] back in [src].")) + update_icon(UPDATE_OVERLAYS) + + + +/obj/structure/fishingrodcabinet/attack_hand(mob/user) + if(!olreliable) + return ..() + + add_fingerprint(user) + olreliable.forceMove_turf() + user.put_in_hands(olreliable, ignore_anim = FALSE) + to_chat(user, span_notice("You take [olreliable] from [src].")) + olreliable = null + update_icon(UPDATE_OVERLAYS) - add_fingerprint(user) - update_icon() diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 426764dc1b4..c0fc2f9d336 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -13,23 +13,17 @@ name = "strange closet" desc = "It looks alien!" icon_state = "acloset" - icon_closed = "acloset" - icon_opened = "aclosetopen" /obj/structure/closet/gimmick name = "administrative supply closet" desc = "It's a storage unit for things that have no right being here." icon_state = "syndicate1" - icon_closed = "syndicate1" - icon_opened = "syndicate1open" - anchored = 0 + anchored = FALSE /obj/structure/closet/gimmick/russian name = "russian surplus closet" desc = "It's a storage unit for Russian standard-issue surplus." icon_state = "syndicate1" - icon_closed = "syndicate1" - icon_opened = "syndicate1open" /obj/structure/closet/gimmick/russian/populate_contents() new /obj/item/clothing/head/ushanka(src) @@ -48,8 +42,6 @@ name = "tacticool gear closet" desc = "It's a storage unit for Tacticool gear." icon_state = "syndicate1" - icon_closed = "syndicate1" - icon_opened = "syndicate1open" /obj/structure/closet/gimmick/tacticool/populate_contents() new /obj/item/clothing/glasses/eyepatch(src) @@ -72,9 +64,7 @@ name = "\improper Thunderdome closet" desc = "Everything you need!" icon_state = "syndicate" - icon_closed = "syndicate" - icon_opened = "syndicateopen" - anchored = 1 + anchored = TRUE /obj/structure/closet/thunderdome/tdred name = "red-team Thunderdome closet" @@ -102,8 +92,6 @@ /obj/structure/closet/thunderdome/tdgreen name = "green-team Thunderdome closet" icon_state = "syndicate1" - icon_closed = "syndicate1" - icon_opened = "syndicate1open" /obj/structure/closet/thunderdome/tdgreen/populate_contents() new /obj/item/clothing/suit/armor/tdome/green(src) diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm index fcd763292e6..5665c22e234 100644 --- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm +++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm @@ -2,8 +2,6 @@ /obj/structure/closet/malf/suits desc = "It's a storage unit for operational gear." icon_state = "syndicate" - icon_closed = "syndicate" - icon_opened = "syndicateopen" /obj/structure/closet/malf/suits/populate_contents() new /obj/item/tank/jetpack/void(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm index e1b48bf48c7..cf71573a99b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm @@ -3,7 +3,7 @@ name = "depot supply closet" desc = "" locked = 0 - anchored = 1 + anchored = TRUE req_access = list() max_integrity = 250 icon_state = "secure" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index ab676f2564b..834f1565aa7 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -43,7 +43,7 @@ /obj/structure/closet/secure_closet/freezer/meat/populate_contents() for(var/i in 1 to 4) - new /obj/item/reagent_containers/food/snacks/meat/monkey(src) + new /obj/item/reagent_containers/food/snacks/meat/humanoid/monkey(src) /obj/structure/closet/secure_closet/freezer/meat/open req_access = null diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index 4f662b78086..bed6882aab6 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -2,43 +2,35 @@ name = "gun cabinet" req_access = list(ACCESS_ARMORY) icon = 'icons/obj/guncabinet.dmi' - icon_state = "base" + icon_state = "guncabinet" -/obj/structure/closet/secure_closet/guncabinet/toggle() - ..() - update_icon() -/obj/structure/closet/secure_closet/guncabinet/update_icon() - overlays.Cut() - if(opened) - overlays += icon(icon,"door_open") - else - var/lazors = 0 - var/shottas = 0 - for(var/obj/item/gun/G in contents) - if(istype(G, /obj/item/gun/energy)) - lazors++ - if(istype(G, /obj/item/gun/projectile/)) - shottas++ - if(lazors || shottas) - for(var/i = 0 to 2) - var/image/gun = image(icon(src.icon)) +/obj/structure/closet/secure_closet/guncabinet/Initialize(mapload) + . = ..() + // we need to update our guns inside, after closet is filled + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), UPDATE_OVERLAYS), 1 SECONDS) - if(lazors > 0 && (shottas <= 0 || prob(50))) - lazors-- - gun.icon_state = "laser" - else if(shottas > 0) - shottas-- - gun.icon_state = "projectile" - gun.pixel_x = i*4 - overlays += gun +/obj/structure/closet/secure_closet/guncabinet/apply_contents_overlays() + . = ..() - overlays += icon(src.icon,"door") + var/lazors = 0 + var/shottas = 0 + for(var/thing in contents) + if(istype(thing, /obj/item/gun/energy)) + lazors++ + if(istype(thing, /obj/item/gun/projectile)) + shottas++ + + if(lazors || shottas) + for(var/i = 1 to 2) + var/choise = "" + if(lazors > 0 && (shottas <= 0 || prob(50))) + lazors-- + choise = "laser" + else if(shottas > 0) + shottas-- + choise = "projectile" + if(choise) + . += image(icon, icon_state = choise, pixel_x = i * 4) - if(broken) - overlays += icon(src.icon,"door_broken") - else if(locked) - overlays += icon(src.icon,"door_locked") - else - overlays += icon(src.icon,"door") diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 93fc4230675..782447a1683 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -185,7 +185,7 @@ overlay_locked = "m_locked" overlay_locker = "m_locker" overlay_unlocked = "m_unlocked" - anchored = 1 + anchored = TRUE density = 0 wall_mounted = 1 req_access = list(ACCESS_MEDICAL) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 9822f33c632..491ad76e1e9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -1,47 +1,63 @@ +#define CLOSET_BREAKOUT_TIME (2 MINUTES) + /obj/structure/closet/secure_closet name = "secure locker" desc = "It's an immobile card-locked storage unit." icon = 'icons/obj/closet.dmi' icon_state = "secure" - density = 1 - opened = 0 - locked = 1 - broken = 0 + density = TRUE + opened = FALSE + locked = TRUE + broken = FALSE can_be_emaged = TRUE max_integrity = 250 armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80) damage_deflection = 20 - wall_mounted = 0 //never solid (You can always pass over it) + wall_mounted = FALSE //never solid (You can always pass over it) /obj/structure/closet/secure_closet/can_open() - if(!..()) - return 0 if(locked) - return 0 + return FALSE return ..() /obj/structure/closet/secure_closet/close() - if(..()) - if(broken) - update_icon() - return 1 - else - return 0 + . = ..() + if(. && broken) + update_icon() + /obj/structure/closet/secure_closet/emp_act(severity) - for(var/obj/O in src) - O.emp_act(severity) + for(var/obj/object in src) + object.emp_act(severity) + + if(broken || opened) + return + + if(prob(50 / severity)) + locked = !locked + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS) + + if(prob(20 / severity)) + if(locked) + req_access = list() + req_access += pick(get_all_accesses()) + return + open() + + +/obj/structure/closet/secure_closet/emag_act(mob/user) if(!broken) - if(prob(50/severity)) - locked = !locked - update_icon() - if(prob(20/severity) && !opened) - if(!locked) - open() - else - req_access = list() - req_access += pick(get_all_accesses()) - ..() + add_attack_logs(user, src, "emagged") + broken = TRUE + locked = FALSE + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance), UPDATE_ICON|UPDATE_DESC), 1 SECONDS) + if(user) + to_chat(user, "You break the lock on [src].") + /obj/structure/closet/secure_closet/proc/togglelock(mob/living/user) if(!istype(user) || user.incapacitated()) @@ -71,15 +87,6 @@ if(Adjacent(user)) togglelock(user) -/obj/structure/closet/secure_closet/emag_act(mob/user) - if(!broken) - add_attack_logs(user, src, "emagged") - broken = TRUE - locked = FALSE - overlays += overlay_sparking - addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS) - if(user) - to_chat(user, "You break the lock on \the [src].") /obj/structure/closet/secure_closet/attack_hand(mob/user) add_fingerprint(user) @@ -102,60 +109,75 @@ else to_chat(usr, "This mob type can't use this verb.") -/obj/structure/closet/secure_closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) - ..() - if(!opened) - //overlays += overlay_locker //uncomment if you want to add locker overlay to all secure closets - if(!broken) - if(locked) - overlays += overlay_locked - else - overlays += overlay_unlocked - -/obj/structure/closet/secure_closet/container_resist(var/mob/living/L) - var/breakout_time = 2 //2 minutes by default + +/obj/structure/closet/secure_closet/update_overlays() + . = ..() + if(!opened && !broken) + if(locked) + . += overlay_locked + else + . += overlay_unlocked + + +/obj/structure/closet/secure_closet/update_desc(updates = ALL) + . = ..() + if(broken) + desc = "It appears to be broken." + else + desc = initial(desc) + + +/obj/structure/closet/secure_closet/container_resist(mob/living/user) if(opened) - if(L.loc == src) - L.forceMove(get_turf(src)) // Let's just be safe here + if(user.loc == src) + user.forceMove(get_turf(src)) // Let's just be safe here return //Door's open... wait, why are you in it's contents then? + if(!locked && !welded) return //It's a secure closet, but isn't locked. Easily escapable from, no need to 'resist' //okay, so the closet is either welded or locked... resist!!! - to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") - for(var/mob/O in viewers(src)) - O.show_message("The [src] begins to shake violently!", 1) - - - spawn(0) - if(do_after(usr,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds - if(!src || !L || L.stat != CONSCIOUS || L.loc != src || opened) //closet/user destroyed OR user dead/unconcious OR user no longer in closet OR closet opened - return - - //Perform the same set of checks as above for weld and lock status to determine if there is even still a point in 'resisting'... - if(!locked && !welded) - return - - //Well then break it! - desc = "It appears to be broken." - flick_overlay_view(image(icon=icon, icon_state=overlay_sparking), 1 SECONDS) - sleep(10) - flick_overlay_view(image(icon=icon, icon_state=overlay_sparking), 1 SECONDS) - sleep(10) - broken = 1 - locked = 0 - welded = 0 - update_icon() - to_chat(usr, "You successfully break out!") - for(var/mob/O in viewers(L.loc)) - O.show_message("\the [usr] successfully broke out of \the [src]!", 1) - if(istype(loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace) - var/obj/structure/bigDelivery/BD = loc - BD.attack_hand(usr) - if(isobj(loc)) - var/obj/loc_as_obj = loc - loc_as_obj.container_resist(L) - open() + visible_message( + span_danger("[src] begins to shake violently!"), + span_warning("You lean on the back of [src] and start pushing the door open. (this will take about [CLOSET_BREAKOUT_TIME / 10] minutes.)") + ) + INVOKE_ASYNC(src, PROC_REF(resist_async), user) + + +/obj/structure/closet/secure_closet/proc/resist_async(mob/living/user) + if(!do_after(user, CLOSET_BREAKOUT_TIME, target = src)) + return + + //closet/user destroyed OR user dead/unconcious OR user no longer in closet OR closet opened + if(!src || !user || user.incapacitated() || user.loc != src || opened) + return + + //Perform the same set of checks as above for weld and lock status to determine if there is even still a point in 'resisting'... + if(!locked && !welded) + return + + //Well then break it! + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS) + broken = TRUE + locked = FALSE + welded = FALSE + update_appearance(UPDATE_ICON|UPDATE_DESC) + visible_message( + span_danger("[user] successfully broke out of [src]!"), + span_warning("You successfully break out!"), + ) + + if(istype(loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace) + var/obj/structure/bigDelivery/BD = loc + BD.attack_hand(user) + + if(isobj(loc)) + var/obj/loc_as_obj = loc + loc_as_obj.container_resist(user) + + open() + /obj/structure/closet/secure_closet/screwdriver_act(mob/living/user, obj/item/I) . = ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 5ce2ef9270e..c2f23dad71b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -38,35 +38,6 @@ new /obj/item/clothing/accessory/medal/service(src) new /obj/item/storage/garmentbag/hop(src) -/*/obj/structure/closet/secure_closet/hop2 //dont realy need this because of garment bag - name = "head of personnel's attire" - req_access = list(ACCESS_HOP) - icon_state = "hopsecure1" - icon_closed = "hopsecure" - icon_locked = "hopsecure1" - icon_opened = "hopsecureopen" - icon_broken = "hopsecurebroken" - icon_off = "hopsecureoff" - -/obj/structure/closet/secure_closet/hop2/populate_contents() - new /obj/item/clothing/neck/mantle/head_of_personnel(src) - new /obj/item/clothing/neck/cloak/head_of_personnel(src) - new /obj/item/clothing/under/dress/dress_hr(src) - new /obj/item/clothing/under/lawyer/female(src) - new /obj/item/clothing/under/lawyer/black(src) - new /obj/item/clothing/under/lawyer/red(src) - new /obj/item/clothing/under/lawyer/oldman(src) - new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/shoes/black(src) - new /obj/item/clothing/shoes/leather(src) - new /obj/item/clothing/shoes/white(src) - new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src) - new /obj/item/clothing/under/rank/head_of_personnel_alt(src) - new /obj/item/clothing/under/rank/head_of_personnel_f(src) - new /obj/item/clothing/suit/hop_jacket(src) - new /obj/item/clothing/suit/hop_jacket/female(src) -*/ - /obj/structure/closet/secure_closet/hos name = "head of security's locker" req_access = list(ACCESS_HOS) diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index bb2509c6423..434ee88e4c8 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -4,8 +4,9 @@ icon = 'icons/obj/statue.dmi' icon_state = "human_male" density = 1 - anchored = 1 + anchored = TRUE max_integrity = 0 //destroying the statue kills the mob within + no_overlays = TRUE var/intialTox = 0 //these are here to keep the mob from taking damage from things that logically wouldn't affect a rock var/intialFire = 0 //it's a little sloppy I know but it was this or the GODMODE flag. Lesser of two evils. var/intialBrute = 0 @@ -17,7 +18,7 @@ if(ishuman(L) || iscorgi(L)) if(L.buckled) L.buckled = 0 - L.anchored = 0 + L.anchored = FALSE L.forceMove(src) ADD_TRAIT(L, TRAIT_MUTE, "statue") max_integrity = L.health + 100 //stoning damaged mobs will result in easier to shatter statues @@ -94,7 +95,7 @@ /obj/structure/closet/statue/welder_act() return -/obj/structure/closet/statue/MouseDrop_T() +/obj/structure/closet/statue/MouseDrop_T(atom/dropping, mob/user, params) return /obj/structure/closet/statue/relaymove() @@ -106,7 +107,7 @@ /obj/structure/closet/statue/verb_toggleopen() return -/obj/structure/closet/statue/update_icon() +/obj/structure/closet/statue/update_icon_state() return /obj/structure/closet/statue/proc/shatter(mob/user) diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index ab5070d0871..90d830553c4 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -2,8 +2,6 @@ name = "armoury closet" desc = "Why is this here?" icon_state = "syndicate" - icon_closed = "syndicate" - icon_opened = "syndicateopen" /obj/structure/closet/syndicate/personal diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index dc3a1aacb38..a557800d9b0 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -16,8 +16,6 @@ name = "emergency closet" desc = "It's a storage unit for emergency breathmasks and o2 tanks." icon_state = "emergency" - icon_closed = "emergency" - icon_opened = "emergencyopen" /obj/structure/closet/emcloset/anchored anchored = TRUE @@ -67,8 +65,6 @@ name = "fire-safety closet" desc = "It's a storage unit for fire-fighting supplies." icon_state = "firecloset" - icon_closed = "firecloset" - icon_opened = "fireclosetopen" /obj/structure/closet/firecloset/populate_contents() new /obj/item/extinguisher(src) @@ -93,8 +89,6 @@ name = "tool closet" desc = "It's a storage unit for tools." icon_state = "toolcloset" - icon_closed = "toolcloset" - icon_opened = "toolclosetopen" /obj/structure/closet/toolcloset/populate_contents() if(prob(40)) @@ -149,8 +143,6 @@ name = "\improper EOD closet" desc = "It's a storage unit for explosion-protective suits." icon_state = "bombsuit" - icon_closed = "bombsuit" - icon_opened = "bombsuitopen" /obj/structure/closet/bombcloset/populate_contents() new /obj/item/clothing/suit/bomb_suit( src ) @@ -163,8 +155,6 @@ name = "\improper EOD closet" desc = "It's a storage unit for explosion-protective suits." icon_state = "bombsuitsec" - icon_closed = "bombsuitsec" - icon_opened = "bombsuitsecopen" /obj/structure/closet/bombclosetsecurity/populate_contents() new /obj/item/clothing/suit/bomb_suit/security( src ) @@ -179,9 +169,7 @@ name = "fire-safety closet" desc = "It's a storage unit for fire-fighting supplies." icon_state = "hydrant" - icon_closed = "hydrant" - icon_opened = "hydrant_open" - anchored = 1 + anchored = TRUE density = 0 wall_mounted = 1 @@ -200,7 +188,7 @@ name = "first-aid closet" desc = "It's wall-mounted storage unit for first aid supplies." icon_state = "medical_wall" - anchored = 1 + anchored = TRUE density = 0 wall_mounted = 1 diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 4eb7efc4da1..06c801cad14 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -3,8 +3,6 @@ desc = "A rectangular steel crate." icon = 'icons/obj/crates.dmi' icon_state = "crate" - icon_opened = "crateopen" - icon_closed = "crate" climbable = TRUE open_sound = 'sound/machines/crate_open.ogg' close_sound = 'sound/machines/crate_close.ogg' @@ -15,11 +13,17 @@ // A list of beacon names that the crate will announce the arrival of, when delivered. var/list/announce_beacons = list() -/obj/structure/closet/crate/update_icon() - //..() is not needed here because of different overlay handling logic for crates - overlays.Cut() + +/obj/structure/closet/crate/update_icon_state() + icon_state = "[initial(icon_state)][opened ? "open" : ""]" + + +/obj/structure/closet/crate/update_overlays() + // . = ..() is not needed here because of different overlay handling logic for crates + . = list() if(manifest) - overlays += "manifest" + . += "manifest" + /obj/structure/closet/crate/can_open() return TRUE @@ -53,8 +57,9 @@ O.forceMove(loc) for(var/mob/M in src) //Mobs M.forceMove(loc) - icon_state = icon_opened + opened = TRUE + update_icon() if(climbable) structure_shaken() @@ -80,8 +85,8 @@ O.forceMove(src) itemcount++ - icon_state = icon_closed opened = FALSE + update_icon() return TRUE @@ -162,12 +167,11 @@ desc = "A secure crate." name = "Secure crate" icon_state = "securecrate" - icon_opened = "securecrateopen" - icon_closed = "securecrate" - var/redlight = "securecrater" - var/greenlight = "securecrateg" - var/sparks = "securecratesparks" - var/emag = "securecrateemag" + overlay_locked = "securecrater" + overlay_unlocked = "securecrateg" + overlay_sparking = "securecratesparks" + /// Overlay for crate with broken lock + var/overlay_broken = "securecrateemag" max_integrity = 500 armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80) damage_deflection = 25 @@ -176,17 +180,16 @@ locked = TRUE can_be_emaged = TRUE -/obj/structure/closet/crate/secure/update_icon() - ..() - overlays.Cut() - if(manifest) - overlays += "manifest" + +/obj/structure/closet/crate/secure/update_overlays() + . = ..() if(locked) - overlays += redlight - else if(broken) - overlays += emag + . += overlay_locked + else if(broken && overlay_broken) + . += overlay_broken else - overlays += greenlight + . += overlay_unlocked + /obj/structure/closet/crate/secure/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1) if(prob(tamperproof) && damage_amount >= DAMAGE_PRECISION) @@ -204,9 +207,16 @@ explosion(get_turf(src), 0, 1, 5, 5, cause = src) qdel(src) + /obj/structure/closet/crate/secure/can_open() return !locked + +/obj/structure/closet/crate/secure/AltClick(mob/living/user) + if(iscarbon(user) && !user.incapacitated() && Adjacent(user)) + togglelock(user) + + /obj/structure/closet/crate/secure/proc/togglelock(mob/user) if(opened) to_chat(user, "Close the crate first.") @@ -222,6 +232,7 @@ else to_chat(user, "Access Denied") + /obj/structure/closet/crate/secure/verb/verb_togglelock() set src in oview(1) // One square distance set category = null @@ -236,6 +247,7 @@ else to_chat(usr, "This mob type can't use this verb.") + /obj/structure/closet/crate/secure/attack_hand(mob/user) if(manifest) add_fingerprint(user) @@ -253,99 +265,74 @@ else toggle(user, by_hand = TRUE) + /obj/structure/closet/crate/secure/closed_item_click(mob/user) togglelock(user) + /obj/structure/closet/crate/secure/emag_act(mob/user) if(locked) add_attack_logs(user, src, "emagged") - overlays += sparks - spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface* - playsound(src.loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - src.locked = 0 - src.broken = 1 - update_icon() + locked = FALSE + broken = TRUE + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS) if(user) - to_chat(user, "You unlock \the [src].") + to_chat(user, span_notice("You unlock [src].")) + /obj/structure/closet/crate/secure/emp_act(severity) - for(var/obj/O in src) - O.emp_act(severity) - if(!broken && !opened && prob(50/severity)) - if(!locked) - src.locked = 1 + for(var/obj/object in src) + object.emp_act(severity) + + if(broken || opened) + return + + if(prob(50 / severity)) + locked = !locked + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS) + + if(prob(20 / severity)) + if(locked) + req_access = list() + req_access += pick(get_all_accesses()) else - overlays += sparks - spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface* - playsound(src.loc, 'sound/effects/sparks4.ogg', 75, TRUE) - src.locked = 0 - update_icon() - if(!opened && prob(20/severity)) - if(!locked) open() - else - src.req_access = list() - src.req_access += pick(get_all_accesses()) - ..() + /obj/structure/closet/crate/plastic name = "plastic crate" desc = "A rectangular plastic crate." icon_state = "plasticcrate" - icon_opened = "plasticcrateopen" - icon_closed = "plasticcrate" /obj/structure/closet/crate/internals desc = "A internals crate." name = "internals crate" icon_state = "o2crate" - icon_opened = "o2crateopen" - icon_closed = "o2crate" /obj/structure/closet/crate/trashcart desc = "A heavy, metal trashcart with wheels." name = "trash Cart" icon_state = "trashcart" - icon_opened = "trashcartopen" - icon_closed = "trashcart" pull_push_speed_modifier = 1 /obj/structure/closet/crate/trashcart/gibs desc = "A heavy, metal trashcart with wheels. You better don't ask." name = "trash cart with gibs" icon_state = "trashcartgib" - icon_opened = "trashcartgibopen" - icon_closed = "trashcartgib" - -/*these aren't needed anymore -/obj/structure/closet/crate/hat - desc = "A crate filled with Valuable Collector's Hats!." - name = "Hat Crate" - icon_state = "crate" - icon_opened = "crateopen" - icon_closed = "crate" - -/obj/structure/closet/crate/contraband - name = "Poster crate" - desc = "A random assortment of posters manufactured by providers NOT listed under Nanotrasen's whitelist." - icon_state = "crate" - icon_opened = "crateopen" - icon_closed = "crate" -*/ /obj/structure/closet/crate/medical desc = "A medical crate." name = "medical crate" icon_state = "medicalcrate" - icon_opened = "medicalcrateopen" - icon_closed = "medicalcrate" /obj/structure/closet/crate/rcd desc = "A crate for the storage of the RCD." name = "\improper RCD crate" icon_state = "crate" - icon_opened = "crateopen" - icon_closed = "crate" /obj/structure/closet/crate/rcd/populate_contents() new /obj/item/rcd_ammo(src) @@ -357,8 +344,6 @@ desc = "A freezer." name = "Freezer" icon_state = "freezer" - icon_opened = "freezeropen" - icon_closed = "freezer" var/target_temp = T0C - 40 var/cooling_power = 40 @@ -384,8 +369,6 @@ desc = "A large can, looks like a bin to me." name = "garbage can" icon_state = "largebin" - icon_opened = "largebinopen" - icon_closed = "largebin" anchored = TRUE /obj/structure/closet/crate/can/wrench_act(mob/user, obj/item/I) @@ -398,8 +381,6 @@ desc = "A crate with a radiation sign on it." name = "radioactive gear crate" icon_state = "radiation" - icon_opened = "radiationopen" - icon_closed = "radiation" /obj/structure/closet/crate/radiation/populate_contents() new /obj/item/clothing/suit/radiation(src) @@ -415,58 +396,46 @@ desc = "A secure weapons crate." name = "weapons crate" icon_state = "weaponcrate" - icon_opened = "weaponcrateopen" - icon_closed = "weaponcrate" /obj/structure/closet/crate/secure/plasma desc = "A secure plasma crate." name = "plasma crate" icon_state = "plasmacrate" - icon_opened = "plasmacrateopen" - icon_closed = "plasmacrate" /obj/structure/closet/crate/secure/gear desc = "A secure gear crate." name = "gear crate" icon_state = "secgearcrate" - icon_opened = "secgearcrateopen" - icon_closed = "secgearcrate" /obj/structure/closet/crate/secure/hydrosec desc = "A crate with a lock on it, painted in the scheme of the station's botanists." name = "secure hydroponics crate" icon_state = "hydrosecurecrate" - icon_opened = "hydrosecurecrateopen" - icon_closed = "hydrosecurecrate" /obj/structure/closet/crate/secure/bin desc = "A secure bin." name = "secure bin" icon_state = "largebins" - icon_opened = "largebinsopen" - icon_closed = "largebins" - redlight = "largebinr" - greenlight = "largebing" - sparks = "largebinsparks" - emag = "largebinemag" + overlay_locked = "largebinr" + overlay_unlocked = "largebing" + overlay_sparking = "largebinsparks" + overlay_broken = "largebinemag" /obj/structure/closet/crate/large name = "large crate" desc = "A hefty metal crate." icon_state = "largemetal" - icon_opened = "largemetalopen" - icon_closed = "largemetal" integrity_failure = 0 //Makes the crate break when integrity reaches 0, instead of opening and becoming an invisible sprite. /obj/structure/closet/crate/large/close() . = ..() if(.)//we can hold up to one large item - var/found = 0 + var/found = FALSE for(var/obj/structure/S in src.loc) if(S == src) continue if(!S.anchored) - found = 1 + found = TRUE S.forceMove(src) break if(!found) @@ -479,10 +448,9 @@ name = "large crate" desc = "A hefty metal crate with an electronic locking system." icon_state = "largemetal" - icon_opened = "largemetalopen" - icon_closed = "largemetal" - redlight = "largemetalr" - greenlight = "largemetalg" + overlay_locked = "largemetalr" + overlay_unlocked = "largemetalg" + overlay_broken = "" /obj/structure/closet/crate/secure/large/close() . = ..() @@ -505,15 +473,11 @@ /obj/structure/closet/crate/secure/large/reinforced desc = "A hefty, reinforced metal crate with an electronic locking system." icon_state = "largermetal" - icon_opened = "largermetalopen" - icon_closed = "largermetal" /obj/structure/closet/crate/hydroponics name = "hydroponics crate" desc = "All you need to destroy those pesky weeds and pests." icon_state = "hydrocrate" - icon_opened = "hydrocrateopen" - icon_closed = "hydrocrate" /obj/structure/closet/crate/hydroponics/prespawned //This exists so the prespawned hydro crates spawn with their contents. @@ -539,36 +503,26 @@ name = "science crate" desc = "A science crate." icon_state = "scicrate" - icon_opened = "scicrateopen" - icon_closed = "scicrate" /obj/structure/closet/crate/secure/scisec name = "secure science crate" desc = "A crate with a lock on it, painted in the scheme of the station's scientists." icon_state = "scisecurecrate" - icon_opened = "scisecurecrateopen" - icon_closed = "scisecurecrate" /obj/structure/closet/crate/engineering name = "engineering crate" desc = "An engineering crate." icon_state = "engicrate" - icon_opened = "engicrateopen" - icon_closed = "engicrate" /obj/structure/closet/crate/secure/engineering name = "secure engineering crate" desc = "A crate with a lock on it, painted in the scheme of the station's engineers." icon_state = "engisecurecrate" - icon_opened = "engisecurecrateopen" - icon_closed = "engisecurecrate" /obj/structure/closet/crate/engineering/electrical name = "electrical engineering crate" desc = "An electrical engineering crate." icon_state = "electricalcrate" - icon_opened = "electricalcrateopen" - icon_closed = "electricalcrate" /obj/structure/closet/crate/tape/populate_contents() if(prob(10)) @@ -578,8 +532,6 @@ name = "secure biohazard crate" desc = "An protected biohazard crate." icon_state = "biohazard" - icon_opened = "biohazardopen" - icon_closed = "biohazard" //crates of gear in the free golem ship /obj/structure/closet/crate/golemgear/populate_contents() @@ -594,19 +546,14 @@ //syndie crates by Furukai /obj/structure/closet/crate/syndicate - desc = "Definitely a property of an evil corporation!" icon_state = "syndiecrate" - icon_opened = "syndiecrateopen" - icon_closed = "syndiecrate" material_drop = /obj/item/stack/sheet/mineral/plastitanium /obj/structure/closet/crate/secure/syndicate name = "Secure suspicious crate" desc = "Definitely a property of an evil corporation! And it has a hardened lock! And a microphone?" icon_state = "syndiesecurecrate" - icon_opened = "syndiesecurecrateopen" - icon_closed = "syndiesecurecrate" material_drop = /obj/item/stack/sheet/mineral/plastitanium can_be_emaged = FALSE diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index 6c4bf01ee6a..cf15893c72c 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -2,8 +2,6 @@ name = "critter crate" desc = "A crate designed for safe transport of animals. Only openable from the outside." icon_state = "critter" - icon_opened = "critteropen" - icon_closed = "critter" open_sound = 'sound/machines/wooden_closet_open.ogg' close_sound = 'sound/machines/wooden_closet_close.ogg' var/already_opened = 0 diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 9d670424371..bc7103b462a 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -6,17 +6,14 @@ density = 1 var/obj/item/paper/manifest/manifest -/obj/structure/largecrate/Initialize(mapload) - . = ..() - update_icon() -/obj/structure/largecrate/update_icon() - ..() - overlays.Cut() +/obj/structure/largecrate/update_overlays() + . = ..() if(manifest) - overlays += "manifest" + . += "manifest" -/obj/structure/largecrate/attack_hand(mob/user as mob) + +/obj/structure/largecrate/attack_hand(mob/user) if(manifest) add_fingerprint(user) to_chat(user, "You tear the manifest off of the crate.") @@ -25,18 +22,18 @@ if(ishuman(user)) user.put_in_hands(manifest, ignore_anim = FALSE) manifest = null - update_icon() - return - else - to_chat(user, "You need a crowbar to pry this open!") + update_icon(UPDATE_OVERLAYS) return -/obj/structure/largecrate/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) + to_chat(user, "You need a crowbar to pry this open!") + + +/obj/structure/largecrate/attackby(obj/item/W, mob/user, params) + if(W.tool_behaviour == TOOL_CROWBAR) if(manifest) manifest.forceMove(loc) manifest = null - update_icon() + update_icon(UPDATE_OVERLAYS) new /obj/item/stack/sheet/wood(src) var/turf/T = get_turf(src) for(var/O in contents) @@ -56,8 +53,8 @@ /obj/structure/largecrate/lisa icon_state = "lisacrate" -/obj/structure/largecrate/lisa/attackby(obj/item/W as obj, mob/user as mob) //ugly but oh well - if(istype(W, /obj/item/crowbar)) +/obj/structure/largecrate/lisa/attackby(obj/item/W, mob/user) //ugly but oh well + if(W.tool_behaviour == TOOL_CROWBAR) new /mob/living/simple_animal/pet/dog/corgi/Lisa(loc) return ..() @@ -65,8 +62,8 @@ name = "cow crate" icon_state = "lisacrate" -/obj/structure/largecrate/cow/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) +/obj/structure/largecrate/cow/attackby(obj/item/W, mob/user, params) + if(W.tool_behaviour == TOOL_CROWBAR) new /mob/living/simple_animal/cow(loc) return ..() @@ -74,8 +71,8 @@ name = "goat crate" icon_state = "lisacrate" -/obj/structure/largecrate/goat/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) +/obj/structure/largecrate/goat/attackby(obj/item/W, mob/user, params) + if(W.tool_behaviour == TOOL_CROWBAR) new /mob/living/simple_animal/hostile/retaliate/goat(loc) return ..() @@ -83,8 +80,8 @@ name = "chicken crate" icon_state = "lisacrate" -/obj/structure/largecrate/chick/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) +/obj/structure/largecrate/chick/attackby(obj/item/W, mob/user, params) + if(W.tool_behaviour == TOOL_CROWBAR) var/num = rand(4, 6) for(var/i = 0, i < num, i++) new /mob/living/simple_animal/chick(loc) @@ -94,7 +91,7 @@ name = "cat crate" icon_state = "lisacrate" -/obj/structure/largecrate/cat/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) +/obj/structure/largecrate/cat/attackby(obj/item/W, mob/user, params) + if(W.tool_behaviour == TOOL_CROWBAR) new /mob/living/simple_animal/pet/cat(loc) return ..() diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm index 4a2f9a7ed88..c127b629719 100644 --- a/code/game/objects/structures/crates_lockers/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/walllocker.dm @@ -6,15 +6,13 @@ name = "wall locker" icon = 'icons/obj/walllocker.dmi' icon_state = "wall-locker" - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE + ignore_density_closed = TRUE + no_overlays = TRUE icon_closed = "wall-locker" icon_opened = "wall-lockeropen" -/obj/structure/closet/walllocker/close() - ..() - density = 0 //It's a locker in a wall, you aren't going to be walking into it. - /obj/structure/closet/walllocker/emerglocker name = "emergency locker" desc = "A wall mounted locker with emergency supplies" @@ -22,6 +20,7 @@ icon_closed = "emerg" icon_opened = "emergopen" + /obj/structure/closet/walllocker/emerglocker/populate_contents() new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/tank/internals/emergency_oxygen(src) diff --git a/code/game/objects/structures/delta_statue.dm b/code/game/objects/structures/delta_statue.dm index 6c329b44a3b..c02c97501a3 100644 --- a/code/game/objects/structures/delta_statue.dm +++ b/code/game/objects/structures/delta_statue.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/delta_statue.dmi' icon_state = "" density = 1 - anchored = 1 + anchored = TRUE max_integrity = 500 /obj/structure/delta_statue/nw diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm index 9f0e20f4d52..dd65b68fde1 100644 --- a/code/game/objects/structures/depot.dm +++ b/code/game/objects/structures/depot.dm @@ -4,7 +4,7 @@ desc = "" icon = 'icons/obj/device.dmi' icon_state = "powersink1" - anchored = 1 + anchored = TRUE max_integrity = 50 var/area/syndicate_depot/core/depotarea var/has_overloaded = FALSE @@ -74,7 +74,7 @@ icon_state = "energy_ball" pixel_x = -32 pixel_y = -32 - anchored = 1 + anchored = TRUE var/cycles = 0 var/beepsound = 'sound/items/timer.ogg' var/deliberate = FALSE @@ -88,7 +88,7 @@ if(istype(depotarea)) if(!depotarea.used_self_destruct) depotarea.used_self_destruct = TRUE // Silences all further alerts from this point onwards. - depotarea.updateicon() + depotarea.update_state() depotarea.shields_down() else log_debug("[src] at [x],[y],[z] failed depotarea istype check during Initialize()! Either it was spawned outside the depot area (bad idea), or a bug is happening.") @@ -105,7 +105,7 @@ depotarea = get_area(src) if(istype(depotarea)) depotarea.destroyed = TRUE - depotarea.updateicon() + depotarea.update_state() for(var/obj/structure/closet/L in range(30, T)) for(var/obj/O in L) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 198344cf275..4813c2a3e13 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -22,8 +22,7 @@ /obj/structure/door_assembly/Initialize(mapload) . = ..() - update_icon() - update_name() + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) /obj/structure/door_assembly/Destroy() QDEL_NULL(electronics) @@ -142,8 +141,7 @@ to_chat(user, "You cannot add [S] to [src]!") else return ..() - update_name() - update_icon() + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) /obj/structure/door_assembly/crowbar_act(mob/user, obj/item/I) if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) @@ -164,8 +162,7 @@ ae = electronics electronics = null ae.forceMove(loc) - update_icon() - update_name() + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) /obj/structure/door_assembly/screwdriver_act(mob/user, obj/item/I) if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) @@ -199,7 +196,7 @@ electronics.forceMove(door) electronics = null qdel(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/door_assembly/wirecutter_act(mob/user, obj/item/I) if(state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) @@ -213,7 +210,7 @@ to_chat(user, "You cut the wires from the airlock assembly.") new/obj/item/stack/cable_coil(get_turf(user), 1) state = AIRLOCK_ASSEMBLY_NEEDS_WIRES - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/door_assembly/wrench_act(mob/user, obj/item/I) if(state != AIRLOCK_ASSEMBLY_NEEDS_WIRES) @@ -266,17 +263,19 @@ return to_chat(user, "You disassemble the airlock assembly.") deconstruct(TRUE) - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/structure/door_assembly/update_icon() - overlays.Cut() + +/obj/structure/door_assembly/update_overlays() + . = ..() if(!glass) - overlays += get_airlock_overlay("fill_construction", icon) + . += get_airlock_overlay("fill_construction", icon) else if(glass) - overlays += get_airlock_overlay("glass_construction", overlays_file) - overlays += get_airlock_overlay("panel_c[state+1]", overlays_file) + . += get_airlock_overlay("glass_construction", overlays_file) + . += get_airlock_overlay("panel_c[state+1]", overlays_file) -/obj/structure/door_assembly/update_name() + +/obj/structure/door_assembly/update_name(updates = ALL) . = ..() name = "" switch(state) @@ -289,6 +288,7 @@ name = "near finished " name += "[heat_proof_finished ? "heat-proofed " : ""][glass ? "window " : ""][base_name] assembly" + /obj/structure/door_assembly/proc/transfer_assembly_vars(obj/structure/door_assembly/source, obj/structure/door_assembly/target, previous = FALSE) target.glass = source.glass target.heat_proof_finished = source.heat_proof_finished @@ -300,8 +300,7 @@ if(electronics) target.electronics = source.electronics source.electronics.forceMove(target) - target.update_icon() - target.update_name() + target.update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) qdel(source) /obj/structure/door_assembly/deconstruct(disassembled = TRUE) diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index 04899537e55..b8f20a99dc9 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -173,7 +173,7 @@ . = ..() icon = SSticker.cultdat?.airlock_runed_icon_file overlays_file = SSticker.cultdat?.airlock_runed_overlays_file - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/door_assembly/door_assembly_cult_fake name = "cult airlock assembly" @@ -187,7 +187,7 @@ . = ..() icon = SSticker.cultdat?.airlock_runed_icon_file overlays_file = SSticker.cultdat?.airlock_runed_overlays_file - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/door_assembly/door_assembly_cult/unruned icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi' @@ -199,7 +199,7 @@ . = ..() icon = SSticker.cultdat?.airlock_unruned_icon_file overlays_file = SSticker.cultdat?.airlock_unruned_overlays_file - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/door_assembly/door_assembly_clock name = "clock airlock assembly" diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index 5fcd58bb734..8f0b992ad4d 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "dresser" density = 1 - anchored = 1 + anchored = TRUE /obj/structure/dresser/attack_hand(mob/user as mob) if(!Adjacent(user))//no tele-grooming diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 491ce2f5523..cd532bf025c 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -4,13 +4,15 @@ icon_state = "echair0" item_chair = null anchored = TRUE - var/obj/item/assembly/shock_kit/part = null - var/last_time = 1.0 - var/delay_time = 50 + var/obj/item/assembly/shock_kit/part + var/last_time = 0 + var/delay_time = 5 SECONDS + var/shocking = FALSE + /obj/structure/chair/e_chair/Initialize(mapload, obj/item/assembly/shock_kit/sk) . = ..() - overlays += image('icons/obj/chairs.dmi', src, "echair_over", MOB_LAYER + 1, dir) + update_icon(UPDATE_OVERLAYS) if(sk) part = sk @@ -25,64 +27,96 @@ part.part1 = part1 part.part2 = part2 -/obj/structure/chair/e_chair/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/wrench)) - var/obj/structure/chair/C = new /obj/structure/chair(loc) - transfer_fingerprints_to(C) - playsound(loc, W.usesound, 50, 1) - C.dir = dir - part.loc = loc + +/obj/structure/chair/e_chair/Destroy() + if(part) + QDEL_NULL(part) + return ..() + + +/obj/structure/chair/e_chair/rotate() + if(..()) + update_icon(UPDATE_OVERLAYS) + + +/obj/structure/chair/e_chair/update_icon_state() + icon_state = "echair[shocking]" + + +/obj/structure/chair/e_chair/update_overlays() + . = ..() + . += image(icon, icon_state = "echair_over", layer = ABOVE_MOB_LAYER, dir = src.dir) + if(shocking) + . += image(icon, icon_state = "echair_shock", layer = ABOVE_MOB_LAYER) + + +/obj/structure/chair/e_chair/attackby(obj/item/W, mob/user, params) + if(W.tool_behaviour == TOOL_WRENCH) + var/obj/structure/chair/chair = new (loc) + transfer_fingerprints_to(chair) + playsound(loc, W.usesound, 50, TRUE) + chair.dir = dir + part.forceMove(loc) part.master = null part = null qdel(src) return return ..() + +/obj/structure/chair/e_chair/examine(mob/user) + . = ..() + . += span_warning("You can Alt-Shift-Click [src] to activate it.") + + +/obj/structure/chair/e_chair/AltShiftClick(mob/living/user) + if(!Adjacent(user)) + return ..() + shock(user) + + /obj/structure/chair/e_chair/verb/activate_e_chair() set name = "Activate Electric Chair" set category = "Object" set src in oview(1) - if(usr.stat || !usr.canmove || usr.restrained()) - return - if(last_time + delay_time > world.time) - to_chat(usr, "\The [src] is not ready yet!") - return - to_chat(usr, "You activate \the [src].") - shock() -/obj/structure/chair/e_chair/rotate() - ..() - overlays.Cut() - overlays += image('icons/obj/chairs.dmi', src, "echair_over", MOB_LAYER + 1, dir) //there's probably a better way of handling this, but eh. -Pete + shock(usr) -/obj/structure/chair/e_chair/proc/shock() - if(last_time + delay_time > world.time) - return - last_time = world.time - icon_state = "echair1" - spawn(delay_time) - icon_state = "echair0" +/obj/structure/chair/e_chair/proc/shock(mob/living/user) + if(isliving(user) && (user.incapacitated() || user.restrained())) + return // special power handling - var/area/A = get_area(src) - if(!isarea(A)) + var/area/our_area = get_area(src) + if(!our_area || !our_area.powered(EQUIP)) return - if(!A.powered(EQUIP)) + + if(last_time + delay_time > world.time) + if(user) + to_chat(user, span_warning("[src] is not ready yet!")) return - A.use_power(5000, EQUIP) - var/light = A.power_light - A.updateicon() + last_time = world.time + our_area.use_power(5000, EQUIP) + our_area.update_icon(UPDATE_ICON_STATE) + + if(user) + to_chat(user, span_notice("You activate [src].")) - flick("echair_shock", src) + shocking = TRUE + update_icon() do_sparks(12, 1, src) - visible_message("The electric chair went off!", "You hear a deep sharp shock!") + visible_message(span_danger("The electric chair went off!")) + addtimer(CALLBACK(src, PROC_REF(reset_echair)), delay_time, TIMER_DELETE_ME) + if(has_buckled_mobs()) - for(var/m in buckled_mobs) - var/mob/living/buckled_mob = m + for(var/mob/living/buckled_mob as anything in buckled_mobs) buckled_mob.electrocute_act(110, src, 1) - to_chat(buckled_mob, "You feel a deep shock course through your body!") - spawn(1) - buckled_mob.electrocute_act(110, src, 1) - A.power_light = light - A.updateicon() + to_chat(buckled_mob, span_userdanger("You feel a deep shock course through your body!")) + addtimer(CALLBACK(buckled_mob, TYPE_PROC_REF(/mob/living, electrocute_act), 110, src, 1), 0.1 SECONDS, TIMER_DELETE_ME) + + +/obj/structure/chair/e_chair/proc/reset_echair() + shocking = FALSE + update_icon() + diff --git a/code/game/objects/structures/engicart.dm b/code/game/objects/structures/engicart.dm index 9de1ce1c470..fba6f2a5f5b 100644 --- a/code/game/objects/structures/engicart.dm +++ b/code/game/objects/structures/engicart.dm @@ -3,7 +3,7 @@ desc = "A cart for storing engineering items." icon = 'icons/obj/engicart.dmi' icon_state = "cart" - anchored = 0 + anchored = FALSE density = 1 pull_push_speed_modifier = 1 var/obj/item/stack/sheet/glass/myglass = null @@ -38,7 +38,7 @@ add_fingerprint(user) put_in_cart(I, user) myglass=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/stack/sheet/metal)) @@ -46,7 +46,7 @@ add_fingerprint(user) put_in_cart(I, user) mymetal=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/stack/sheet/plasteel)) @@ -54,7 +54,7 @@ add_fingerprint(user) put_in_cart(I, user) myplasteel=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/flashlight)) @@ -62,7 +62,7 @@ add_fingerprint(user) put_in_cart(I, user) myflashlight=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/storage/toolbox/mechanical)) @@ -70,7 +70,7 @@ add_fingerprint(user) put_in_cart(I, user) mybluetoolbox=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/storage/toolbox/electrical)) @@ -78,7 +78,7 @@ add_fingerprint(user) put_in_cart(I, user) myyellowtoolbox=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/storage/toolbox)) @@ -86,10 +86,10 @@ add_fingerprint(user) put_in_cart(I, user) myredtoolbox=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) - else if(istype(I, /obj/item/wrench)) + else if(I.tool_behaviour == TOOL_WRENCH) add_fingerprint(user) if(!anchored && !isinspace()) playsound(src.loc, I.usesound, 50, 1) @@ -97,14 +97,14 @@ "[user] tightens \the [src]'s casters.", \ " You have tightened \the [src]'s casters.", \ "You hear ratchet.") - anchored = 1 + anchored = TRUE else if(anchored) playsound(src.loc, I.usesound, 50, 1) user.visible_message( \ "[user] loosens \the [src]'s casters.", \ " You have loosened \the [src]'s casters.", \ "You hear ratchet.") - anchored = 0 + anchored = FALSE else to_chat(usr, "You cannot interface your modules [src]!") @@ -178,22 +178,24 @@ to_chat(user, "You take [myyellowtoolbox] from [src].") myyellowtoolbox = null - update_icon() + update_icon(UPDATE_OVERLAYS) updateUsrDialog() -/obj/structure/engineeringcart/update_icon() - overlays.Cut() + +/obj/structure/engineeringcart/update_overlays() + . = ..() if(myglass) - overlays += "cart_glass" + . += "cart_glass" if(mymetal) - overlays += "cart_metal" + . += "cart_metal" if(myplasteel) - overlays += "cart_plasteel" + . += "cart_plasteel" if(myflashlight) - overlays += "cart_flashlight" + . += "cart_flashlight" if(mybluetoolbox) - overlays += "cart_bluetoolbox" + . += "cart_bluetoolbox" if(myredtoolbox) - overlays += "cart_redtoolbox" + . += "cart_redtoolbox" if(myyellowtoolbox) - overlays += "cart_yellowtoolbox" + . += "cart_yellowtoolbox" + diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 20c58523d17..550aea991cd 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -8,7 +8,7 @@ desc = "A small wall mounted cabinet designed to hold a fire extinguisher." icon = 'icons/obj/closet.dmi' icon_state = "extinguisher_closed" - anchored = 1 + anchored = TRUE density = 0 max_integrity = 200 integrity_failure = 50 @@ -29,6 +29,7 @@ has_extinguisher = new/obj/item/extinguisher/mini(src) else has_extinguisher = new/obj/item/extinguisher(src) + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/examine(mob/user) . = ..() @@ -44,7 +45,7 @@ return playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/Destroy() QDEL_NULL(has_extinguisher) @@ -58,7 +59,7 @@ /obj/structure/extinguisher_cabinet/handle_atom_del(atom/A) if(A == has_extinguisher) has_extinguisher = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user, params) if(isrobot(user) || isalien(user)) @@ -69,18 +70,18 @@ return add_fingerprint(user) has_extinguisher = O - update_icon() + update_icon(UPDATE_ICON_STATE) to_chat(user, "You place [O] in [src].") return TRUE else playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) else if(user.a_intent != INTENT_HARM) add_fingerprint(user) playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) else return ..() @@ -123,7 +124,7 @@ else playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/attack_tk(mob/user) if(has_extinguisher) @@ -136,7 +137,7 @@ else playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/obj_break(damage_flag) if(!broken && !(flags & NODECONSTRUCT)) @@ -145,7 +146,7 @@ if(has_extinguisher) has_extinguisher.forceMove(loc) has_extinguisher = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT)) @@ -155,7 +156,7 @@ has_extinguisher = null qdel(src) -/obj/structure/extinguisher_cabinet/update_icon() +/obj/structure/extinguisher_cabinet/update_icon_state() if(!opened) icon_state = "extinguisher_closed" return diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 2847d2f54af..4eb87c6d37b 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -45,13 +45,14 @@ var/healthpercent = (obj_integrity/max_integrity) * 100 switch(healthpercent) if(100) - return "It looks fully intact." + . = "It looks fully intact." if(70 to 99) - return "It looks slightly damaged." + . = "It looks slightly damaged." if(40 to 70) - return "It looks moderately damaged." + . = "It looks moderately damaged." if(0 to 40) - return "It looks heavily damaged." + . = "It looks heavily damaged." + . += "
Using a lit welding tool on this item will allow you to slice through it, eventually removing the outer layer." /obj/structure/falsewall/ratvar_act() new /obj/structure/falsewall/brass(loc) @@ -73,31 +74,31 @@ . = ..() toggle(user) + /obj/structure/falsewall/proc/toggle(mob/user) if(opening) return - - opening = 1 + opening = TRUE if(density) add_fingerprint(user) do_the_flick() - sleep(4) - density = 0 - set_opacity(0) - update_icon(0) + sleep(0.4 SECONDS) + density = FALSE + set_opacity(FALSE) else var/srcturf = get_turf(src) for(var/mob/living/obstacle in srcturf) //Stop people from using this as a shield - opening = 0 + opening = FALSE return add_fingerprint(user) do_the_flick() - density = 1 - sleep(4) - set_opacity(1) - update_icon() - air_update_turf(1) - opening = 0 + density = TRUE + sleep(0.4 SECONDS) + set_opacity(TRUE) + air_update_turf(TRUE) + opening = FALSE + update_icon(UPDATE_ICON_STATE) + /obj/structure/falsewall/proc/do_the_flick() if(density) @@ -107,7 +108,8 @@ else flick("fwall_closing", src) -/obj/structure/falsewall/update_icon() + +/obj/structure/falsewall/update_icon_state() if(density) icon_state = initial(icon_state) smooth = SMOOTH_TRUE @@ -115,6 +117,7 @@ else icon_state = "fwall_open" + /obj/structure/falsewall/proc/ChangeToWall(delete = TRUE) var/turf/T = get_turf(src) T.ChangeTurf(walltype) @@ -132,7 +135,7 @@ if(T.density) to_chat(user, "[src] is blocked!") return - if(istype(W, /obj/item/screwdriver)) + if(W.tool_behaviour == TOOL_SCREWDRIVER) if(!istype(T, /turf/simulated/floor)) to_chat(user, "[src] bolts must be tightened on the floor!") return diff --git a/code/game/objects/structures/firepit.dm b/code/game/objects/structures/firepit.dm index 075c83e7033..f3f48243f0a 100644 --- a/code/game/objects/structures/firepit.dm +++ b/code/game/objects/structures/firepit.dm @@ -2,7 +2,7 @@ name = "firepit" desc = "Warm and toasty." icon = 'icons/obj/fireplace.dmi' - icon_state = "firepit-active" + icon_state = "firepit" density = FALSE anchored = TRUE max_integrity = 50 @@ -10,9 +10,6 @@ var/lighter // Who lit the thing var/fire_stack_strength = 5 -/obj/structure/firepit/Initialize(mapload) - . = ..() - update_icon() /obj/structure/firepit/attack_hand(mob/living/user) if(active) @@ -31,18 +28,26 @@ else W.fire_act() -/obj/structure/firepit/update_icon() - . = ..() + +/obj/structure/firepit/proc/adjust_light() if(active) set_light(4, ,"#ffb366") - icon_state = "firepit-active" else set_light(0) + + +/obj/structure/firepit/update_icon_state() + if(active) + icon_state = "firepit-active" + else icon_state = "firepit" + /obj/structure/firepit/proc/toggleFirepit() active = !active - update_icon() + update_icon(UPDATE_ICON_STATE) + adjust_light() + /obj/structure/firepit/extinguish() . = ..() diff --git a/code/game/objects/structures/fireplace.dm b/code/game/objects/structures/fireplace.dm index 10a5bf70a74..948020d288b 100644 --- a/code/game/objects/structures/fireplace.dm +++ b/code/game/objects/structures/fireplace.dm @@ -69,10 +69,15 @@ else . = ..() -/obj/structure/fireplace/update_icon() + +/obj/structure/fireplace/update_desc(updates = ALL) + . = ..() + desc = lit ? "A large stone brick fireplace, warm and cozy." : initial(desc) + + +/obj/structure/fireplace/update_overlays() . = ..() - overlays.Cut() if(!lit) return @@ -81,17 +86,18 @@ switch(burn_time_remaining()) if(0 to 500) firepower = "fireplace_fire0" - if(500 to 1000) + if(501 to 1000) firepower = "fireplace_fire1" - if(1000 to 1500) + if(1001 to 1500) firepower = "fireplace_fire2" - if(1500 to 2000) + if(1501 to 2000) firepower = "fireplace_fire3" - if(2000 to MAXIMUM_BURN_TIMER) + if(2001 to MAXIMUM_BURN_TIMER) firepower = "fireplace_fire4" - overlays += icon('icons/obj/fireplace.dmi', "[firepower]") - overlays += icon('icons/obj/fireplace.dmi', "fireplace_glow") + . += "[firepower]" + . += "fireplace_glow" + /obj/structure/fireplace/proc/adjust_light() if(!lit) @@ -101,15 +107,16 @@ switch(burn_time_remaining()) if(0 to 500) set_light(1, ,"#ffb366") - if(500 to 1000) + if(501 to 1000) set_light(2, ,"#ffb366") - if(1000 to 1500) + if(1001 to 1500) set_light(3, ,"#ffb366") - if(1500 to 2000) + if(1501 to 2000) set_light(4, ,"#ffb366") - if(2000 to MAXIMUM_BURN_TIMER) + if(2001 to MAXIMUM_BURN_TIMER) set_light(6, ,"#ffb366") + /obj/structure/fireplace/process(seconds_per_tick) if(!lit) return @@ -120,9 +127,10 @@ playsound(src, 'sound/effects/comfyfire.ogg',40,FALSE, FALSE, TRUE) var/turf/T = get_turf(src) T.hotspot_expose(700, 2.5 * seconds_per_tick) - update_icon() + update_icon(UPDATE_OVERLAYS) adjust_light() + /obj/structure/fireplace/extinguish() . = ..() if(lit) @@ -131,6 +139,7 @@ put_out() adjust_fuel_timer(fuel) + /obj/structure/fireplace/proc/adjust_fuel_timer(amount) if(lit) flame_expiry_timer += amount @@ -139,25 +148,27 @@ else fuel_added = clamp(fuel_added + amount, 0, MAXIMUM_BURN_TIMER) + /obj/structure/fireplace/proc/burn_time_remaining() if(lit) return max(0, flame_expiry_timer - world.time) else return max(0, fuel_added) + /obj/structure/fireplace/proc/ignite() lit = TRUE - desc = "A large stone brick fireplace, warm and cozy." flame_expiry_timer = world.time + fuel_added fuel_added = 0 - update_icon() + update_appearance(UPDATE_OVERLAYS|UPDATE_DESC) adjust_light() + /obj/structure/fireplace/proc/put_out() lit = FALSE - update_icon() + update_appearance(UPDATE_OVERLAYS|UPDATE_DESC) adjust_light() - desc = initial(desc) + #undef LOG_BURN_TIMER #undef PAPER_BURN_TIMER diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index e259b83049f..44f3844f07c 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -5,7 +5,7 @@ //trees /obj/structure/flora/tree name = "tree" - anchored = 1 + anchored = TRUE density = 1 pixel_x = -16 layer = 9 @@ -65,7 +65,7 @@ /obj/structure/flora/grass name = "grass" icon = 'icons/obj/flora/snowflora.dmi' - anchored = 1 + anchored = TRUE max_integrity = 15 /obj/structure/flora/grass/brown @@ -96,7 +96,7 @@ name = "bush" icon = 'icons/obj/flora/snowflora.dmi' icon_state = "snowbush1" - anchored = 1 + anchored = TRUE max_integrity = 15 /obj/structure/flora/bush/Initialize(mapload) @@ -109,7 +109,7 @@ name = "bush" icon = 'icons/obj/flora/ausflora.dmi' icon_state = "firstbush_1" - anchored = 1 + anchored = TRUE max_integrity = 15 /obj/structure/flora/ausbushes/Initialize(mapload) @@ -227,7 +227,7 @@ icon = 'icons/obj/flora/plants.dmi' icon_state = "plant-1" flags = NO_PIXEL_RANDOM_DROP - anchored = 0 + anchored = FALSE layer = ABOVE_MOB_LAYER w_class = WEIGHT_CLASS_HUGE force = 10 @@ -321,7 +321,7 @@ icon_state = "rock1" icon = 'icons/obj/flora/rocks.dmi' resistance_flags = FIRE_PROOF - anchored = 1 + anchored = TRUE /obj/structure/flora/rock/Initialize(mapload) . = ..() @@ -370,7 +370,7 @@ name = "corn stalk" icon = 'icons/obj/flora/plants.dmi' icon_state = "cornstalk1" - anchored = 0 + anchored = FALSE layer = 5 /obj/structure/flora/corn_stalk/alt_1 @@ -398,7 +398,7 @@ icon = 'icons/obj/flora/plants.dmi' icon_state = "bush1" density = 1 - anchored = 1 + anchored = TRUE layer = 3.2 var/indestructable = 0 var/stump = 0 diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index 4fbe7ef4542..66f7b6e1792 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -11,7 +11,7 @@ var/deconstructible = TRUE /obj/structure/fluff/attackby(obj/item/I, mob/living/user, params) - if(istype(I, /obj/item/wrench) && deconstructible) + if(I.tool_behaviour == TOOL_WRENCH && deconstructible) user.visible_message("[user] starts disassembling [src]...", "You start disassembling [src]...") playsound(loc, I.usesound, 50, 1) if(do_after(src, 50 * I.toolspeed * gettoolspeedmod(user), target = src)) diff --git a/code/game/objects/structures/foodcart.dm b/code/game/objects/structures/foodcart.dm index 24d051e6b89..0abbccffb8d 100644 --- a/code/game/objects/structures/foodcart.dm +++ b/code/game/objects/structures/foodcart.dm @@ -3,7 +3,7 @@ desc = "A cart for transporting food and drinks." icon = 'icons/obj/foodcart.dmi' icon_state = "cart" - anchored = 0 + anchored = FALSE density = 1 pull_push_speed_modifier = 1 //Food slots @@ -39,7 +39,6 @@ add_fingerprint(user) put_in_cart(I, user) food_slots[s]=I - update_icon() success = 1 break if(!success) @@ -51,12 +50,11 @@ add_fingerprint(user) put_in_cart(I, user) drink_slots[s]=I - update_icon() success = 1 break if(!success) to_chat(user, fail_msg) - else if(istype(I, /obj/item/wrench)) + else if(I.tool_behaviour == TOOL_WRENCH) add_fingerprint(user) if(!anchored && !isinspace()) playsound(src.loc, I.usesound, 50, 1) @@ -64,14 +62,14 @@ "[user] tightens \the [src]'s casters.", \ " You have tightened \the [src]'s casters.", \ "You hear ratchet.") - anchored = 1 + anchored = TRUE else if(anchored) playsound(src.loc, I.usesound, 50, 1) user.visible_message( \ "[user] loosens \the [src]'s casters.", \ " You have loosened \the [src]'s casters.", \ "You hear ratchet.") - anchored = 0 + anchored = FALSE else to_chat(usr, "You cannot interface your modules [src]!") @@ -198,7 +196,6 @@ to_chat(user, "You take [drink] from [src].") drink_slots[6] = null - update_icon() //Not really needed without overlays, but keeping just in case updateUsrDialog() /obj/structure/foodcart/deconstruct(disassembled = TRUE) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index b4505000959..157d28d38cd 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -1,7 +1,7 @@ /obj/structure/girder name = "girder" icon_state = "girder" - anchored = 1 + anchored = TRUE density = 1 layer = BELOW_OBJ_LAYER var/state = GIRDER_NORMAL @@ -439,7 +439,7 @@ /obj/structure/girder/displaced name = "displaced girder" icon_state = "displaced" - anchored = 0 + anchored = FALSE state = GIRDER_DISPLACED girderpasschance = 25 max_integrity = 120 diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 2a7cbe1ffc7..a8c693301b8 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -43,9 +43,6 @@ //height=42 icon='icons/obj/fence-ns.dmi' -/obj/structure/grille/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration) - . = ..() - update_icon() /obj/structure/grille/examine(mob/user) . = ..() diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index c1fbb87d958..9106bf66cb6 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -2,15 +2,18 @@ #define GUILLOTINE_DECAP_MIN_SHARP 7 // Minimum amount of sharpness for decapitation. Any less and it will just deal brute damage #define GUILLOTINE_ANIMATION_LENGTH 9 // How many deciseconds the animation is #define GUILLOTINE_BLADE_RAISED 1 -#define GUILLOTINE_BLADE_MOVING 2 -#define GUILLOTINE_BLADE_DROPPED 3 -#define GUILLOTINE_BLADE_SHARPENING 4 +#define GUILLOTINE_BLADE_RAISING 2 +#define GUILLOTINE_BLADE_DROPPING 3 +#define GUILLOTINE_BLADE_DROPPED 4 +#define GUILLOTINE_BLADE_SHARPENING 5 + #define GUILLOTINE_HEAD_OFFSET 16 // How much we need to move the player to center their head #define GUILLOTINE_LAYER_DIFF 1.2 // How much to increase/decrease a head when it's buckled/unbuckled #define GUILLOTINE_ACTIVATE_DELAY 30 // Delay for executing someone #define GUILLOTINE_WRENCH_DELAY 10 -#define GUILLOTINE_ACTION_INUSE 5 -#define GUILLOTINE_ACTION_WRENCH 6 + +#define GUILLOTINE_ACTION_INUSE 1 +#define GUILLOTINE_ACTION_WRENCH 2 /obj/structure/guillotine name = "guillotine" @@ -26,7 +29,7 @@ var/blade_sharpness = GUILLOTINE_BLADE_MAX_SHARP // How sharp the blade is var/kill_count = 0 var/force_clap = FALSE //You WILL clap if I want you to - var/current_action = 0 // What's currently happening to the guillotine + var/current_action = NONE// What's currently happening to the guillotine /obj/structure/guillotine/Initialize(mapload) LAZYINITLIST(buckled_mobs) @@ -51,6 +54,31 @@ msg += "
" msg += "Someone appears to be strapped in. You can help them out, or you can harm them by activating the guillotine." . += "[msg]" + + +/obj/structure/guillotine/update_icon_state() + switch(blade_status) + if(GUILLOTINE_BLADE_DROPPED) + icon_state = "guillotine" + if(GUILLOTINE_BLADE_RAISED) + icon_state = "guillotine_raised" + if(GUILLOTINE_BLADE_RAISING) + icon_state = "guillotine_raise" + if(GUILLOTINE_BLADE_DROPPING) + icon_state = "guillotine_drop" + + +/obj/structure/guillotine/update_overlays() + . = ..() + switch(kill_count) + if(1) + . += mutable_appearance(icon, "guillotine_bloody_overlay") + if(2) + . += mutable_appearance(icon, "guillotine_bloodier_overlay") + if(3 to INFINITY) + . += mutable_appearance(icon, "guillotine_bloodiest_overlay") + + /obj/structure/guillotine/attack_hand(mob/user) // Currently being used by something @@ -58,12 +86,12 @@ return switch(blade_status) - if(GUILLOTINE_BLADE_MOVING) + if(GUILLOTINE_BLADE_RAISING, GUILLOTINE_BLADE_DROPPING) return if(GUILLOTINE_BLADE_DROPPED) add_fingerprint(user) - blade_status = GUILLOTINE_BLADE_MOVING - icon_state = "guillotine_raise" + blade_status = GUILLOTINE_BLADE_RAISING + update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, PROC_REF(raise_blade)), GUILLOTINE_ANIMATION_LENGTH) return if(GUILLOTINE_BLADE_RAISED) @@ -75,26 +103,28 @@ if(do_after(user, GUILLOTINE_ACTIVATE_DELAY, target = src) && blade_status == GUILLOTINE_BLADE_RAISED) add_fingerprint(user) - current_action = 0 - blade_status = GUILLOTINE_BLADE_MOVING - icon_state = "guillotine_drop" + current_action = NONE + blade_status = GUILLOTINE_BLADE_DROPPING + update_icon(UPDATE_ICON_STATE) playsound(src, 'sound/items/unsheath.ogg', 100, 1) addtimer(CALLBACK(src, PROC_REF(drop_blade), user), GUILLOTINE_ANIMATION_LENGTH - 2) // Minus two so we play the sound and decap faster else - current_action = 0 + current_action = NONE else add_fingerprint(user) unbuckle_all_mobs() else add_fingerprint(user) - blade_status = GUILLOTINE_BLADE_MOVING - icon_state = "guillotine_drop" + blade_status = GUILLOTINE_BLADE_DROPPING + update_icon(UPDATE_ICON_STATE) playsound(src, 'sound/items/unsheath.ogg', 100, 1) addtimer(CALLBACK(src, PROC_REF(drop_blade)), GUILLOTINE_ANIMATION_LENGTH) + /obj/structure/guillotine/proc/raise_blade() blade_status = GUILLOTINE_BLADE_RAISED - icon_state = "guillotine_raised" + update_icon(UPDATE_ICON_STATE) + /obj/structure/guillotine/proc/drop_blade(mob/user) if(has_buckled_mobs() && blade_sharpness) @@ -102,14 +132,14 @@ if(!H) blade_status = GUILLOTINE_BLADE_DROPPED - icon_state = "guillotine" + update_icon(UPDATE_ICON_STATE) return var/obj/item/organ/external/head/head = H.get_organ(BODY_ZONE_HEAD) if(QDELETED(head)) blade_status = GUILLOTINE_BLADE_DROPPED - icon_state = "guillotine" + update_icon(UPDATE_ICON_STATE) return playsound(src, 'sound/weapons/bladeslice.ogg', 100, 1) @@ -118,18 +148,8 @@ add_attack_logs(user, H, "beheaded with [src]") H.regenerate_icons() unbuckle_all_mobs() - kill_count += 1 - - var/blood_overlay = "bloody" - - if(kill_count == 2) - blood_overlay = "bloodier" - else if(kill_count > 2) - blood_overlay = "bloodiest" - - blood_overlay = "guillotine_" + blood_overlay + "_overlay" - overlays.Cut() - overlays += mutable_appearance(icon, blood_overlay) + kill_count++ + update_icon(UPDATE_OVERLAYS) if(force_clap) // The crowd is pleased @@ -147,7 +167,7 @@ blade_sharpness -= 1 blade_status = GUILLOTINE_BLADE_DROPPED - icon_state = "guillotine" + update_icon(UPDATE_ICON_STATE) /obj/structure/guillotine/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/whetstone)) @@ -185,13 +205,13 @@ return current_action = GUILLOTINE_ACTION_WRENCH if(!I.use_tool(src, user, GUILLOTINE_WRENCH_DELAY, volume = I.tool_volume)) - current_action = 0 + current_action = NONE return if(has_buckled_mobs()) to_chat(user, "Can't unfasten, someone's strapped in!") return - current_action = 0 + current_action = NONE to_chat(user, "You [anchored ? "un" : ""]secure [src].") anchored = !anchored playsound(src, 'sound/items/deconstruct.ogg', 50, 1) @@ -244,7 +264,8 @@ #undef GUILLOTINE_DECAP_MIN_SHARP #undef GUILLOTINE_ANIMATION_LENGTH #undef GUILLOTINE_BLADE_RAISED -#undef GUILLOTINE_BLADE_MOVING +#undef GUILLOTINE_BLADE_RAISING +#undef GUILLOTINE_BLADE_DROPPING #undef GUILLOTINE_BLADE_DROPPED #undef GUILLOTINE_BLADE_SHARPENING #undef GUILLOTINE_HEAD_OFFSET diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index a13532d1f0f..5dc13e56008 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -15,9 +15,9 @@ /obj/structure/inflatable name = "inflatable wall" desc = "An inflated membrane. Do not puncture." - density = 1 - anchored = 1 - opacity = 0 + density = TRUE + anchored = TRUE + opacity = FALSE max_integrity = 50 icon = 'icons/obj/inflatable.dmi' icon_state = "wall" @@ -39,20 +39,30 @@ else return FALSE + /obj/structure/inflatable/CanAtmosPass(turf/T) return !density -/obj/structure/inflatable/attack_hand(mob/user as mob) + +/obj/structure/inflatable/attackby(obj/item/I, mob/living/user, params) + if(I.sharp || is_type_in_typecache(I, GLOB.pointed_types)) + user.do_attack_animation(src, used_item = I) + deconstruct(FALSE) + return FALSE + return ..() + +/obj/structure/inflatable/attack_hand(mob/user) add_fingerprint(user) /obj/structure/inflatable/AltClick(mob/living/user) - if(!istype(user) || user.incapacitated() || user.restrained()) + if(!istype(user) || user.incapacitated()) to_chat(user, "You can't do that right now!") return if(!Adjacent(user)) return deconstruct(TRUE) + /obj/structure/inflatable/deconstruct(disassembled = TRUE) playsound(loc, 'sound/machines/hiss.ogg', 75, 1) if(!disassembled) @@ -62,17 +72,20 @@ qdel(src) else visible_message("[src] slowly deflates.") - spawn(50) - var/obj/item/inflatable/R = new intact(loc) - transfer_fingerprints_to(R) - qdel(src) + addtimer(CALLBACK(src, PROC_REF(deflate)), 5 SECONDS) + + +/obj/structure/inflatable/proc/deflate() + var/obj/item/inflatable/R = new intact(loc) + transfer_fingerprints_to(R) + qdel(src) /obj/structure/inflatable/verb/hand_deflate() set name = "Deflate" set category = "Object" set src in oview(1) - if(usr.stat || usr.restrained()) + if(usr.incapacitated()) return deconstruct(TRUE) @@ -93,27 +106,24 @@ /obj/structure/inflatable/door //Based on mineral door code name = "inflatable door" - density = 1 - anchored = 1 - opacity = 0 - icon = 'icons/obj/inflatable.dmi' icon_state = "door_closed" + opacity = TRUE torn = /obj/item/inflatable/door/torn intact = /obj/item/inflatable/door - var/state = 0 //closed, 1 == open - var/isSwitchingStates = 0 + var/state_closed = TRUE + var/is_operating = FALSE -/obj/structure/inflatable/door/attack_ai(mob/user as mob) //those aren't machinery, they're just big fucking slabs of a mineral +/obj/structure/inflatable/door/attack_ai(mob/user) //those aren't machinery, they're just big fucking slabs of a mineral if(isAI(user)) //so the AI can't open it return else if(isrobot(user)) //but cyborgs can if(get_dist(user,src) <= 1) //not remotely though - return TryToSwitchState(user) + return try_to_operate(user) -/obj/structure/inflatable/door/attack_hand(mob/user as mob) - return TryToSwitchState(user) +/obj/structure/inflatable/door/attack_hand(mob/user) + return try_to_operate(user) /obj/structure/inflatable/door/CanPass(atom/movable/mover, turf/target, height=0) if(istype(mover) && mover.checkpass(PASS_OTHER_THINGS)) @@ -125,59 +135,45 @@ /obj/structure/inflatable/door/CanAtmosPass(turf/T) return !density -/obj/structure/inflatable/door/proc/TryToSwitchState(atom/user) - if(isSwitchingStates) + +/obj/structure/inflatable/door/proc/try_to_operate(atom/user) + if(is_operating) return if(ismob(user)) var/mob/M = user - if(world.time - user.last_bumped <= 60) - return //NOTE do we really need that? if(M.client) if(iscarbon(M)) var/mob/living/carbon/C = M if(!C.handcuffed) - add_fingerprint(user) - SwitchState() + operate() else - add_fingerprint(user) - SwitchState() - else if(istype(user, /obj/mecha)) - SwitchState() - -/obj/structure/inflatable/door/proc/SwitchState() - if(state) - Close() - else - Open() - air_update_turf(1) - -/obj/structure/inflatable/door/proc/Open() - isSwitchingStates = 1 - //playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 100, 1) - flick("door_opening",src) - sleep(10) - density = 0 - opacity = 0 - state = 1 - update_icon() - isSwitchingStates = 0 - -/obj/structure/inflatable/door/proc/Close() - isSwitchingStates = 1 - //playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 100, 1) - flick("door_closing",src) - sleep(10) - density = 1 - opacity = 0 - state = 0 - update_icon() - isSwitchingStates = 0 - -/obj/structure/inflatable/door/update_icon() - if(state) - icon_state = "door_open" + operate() + else if(ismecha(user)) + operate() + + +/obj/structure/inflatable/door/proc/operate() + is_operating = TRUE + if(state_closed) + flick("door_opening", src) else - icon_state = "door_closed" + flick("door_closing", src) + + sleep(1 SECONDS) + if(QDELETED(src)) + return + + state_closed = !state_closed + density = state_closed + set_opacity(state_closed) + update_icon(UPDATE_ICON_STATE) + air_update_turf(TRUE) + is_operating = FALSE + + +/obj/structure/inflatable/door/update_icon_state() + icon_state = "door_[state_closed ? "closed" : "open"]" + /obj/item/inflatable/torn name = "torn inflatable wall" @@ -206,6 +202,7 @@ item_state = "syringe_kit" max_combined_w_class = 21 w_class = WEIGHT_CLASS_NORMAL + can_hold = list(/obj/item/inflatable) /obj/item/storage/briefcase/inflatable/populate_contents() new /obj/item/inflatable/door(src) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index dc2567bc6a7..ced660b34c8 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -5,8 +5,8 @@ desc = "This is the alpha and omega of sanitation." icon = 'icons/obj/janitor.dmi' icon_state = "cart" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE container_type = OPENCONTAINER pull_push_speed_modifier = 1 //copypaste sorry @@ -32,14 +32,16 @@ QDEL_NULL(myreplacer) return ..() + /obj/structure/janitorialcart/proc/put_in_cart(obj/item/I, mob/user) user.drop_transfer_item_to_loc(I, src) updateUsrDialog() to_chat(user, "You put [I] into [src].") - return + update_icon(UPDATE_OVERLAYS) + /obj/structure/janitorialcart/on_reagent_change() - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/janitorialcart/attackby(obj/item/I, mob/user, params) var/fail_msg = "There is already one of those in [src]." @@ -66,9 +68,8 @@ else if(istype(I, /obj/item/reagent_containers/spray/cleaner)) if(!myspray) add_fingerprint(user) - put_in_cart(I, user) myspray=I - update_icon() + put_in_cart(I, user) else to_chat(user, fail_msg) else if(istype(I, /obj/item/lightreplacer)) @@ -81,19 +82,18 @@ else if(istype(I, /obj/item/caution)) if(signs < max_signs) add_fingerprint(user) - put_in_cart(I, user) signs++ - update_icon() + put_in_cart(I, user) else to_chat(user, "[src] can't hold any more signs.") - else if(istype(I, /obj/item/crowbar)) + else if(I.tool_behaviour == TOOL_CROWBAR) user.visible_message("[user] begins to empty the contents of [src].") if(do_after(user, 30 * I.toolspeed * gettoolspeedmod(user), target = src)) add_fingerprint(user) to_chat(usr, "You empty the contents of [src]'s bucket onto the floor.") reagents.reaction(src.loc) src.reagents.clear_reagents() - else if(istype(I, /obj/item/wrench)) + else if(I.tool_behaviour == TOOL_WRENCH) add_fingerprint(user) if(!anchored && !isinspace()) playsound(src.loc, I.usesound, 50, 1) @@ -101,14 +101,14 @@ "[user] tightens \the [src]'s casters.", \ " You have tightened \the [src]'s casters.", \ "You hear ratchet.") - anchored = 1 + anchored = TRUE else if(anchored) playsound(src.loc, I.usesound, 50, 1) user.visible_message( \ "[user] loosens \the [src]'s casters.", \ " You have loosened \the [src]'s casters.", \ "You hear ratchet.") - anchored = 0 + anchored = FALSE else if(mybag) add_fingerprint(user) mybag.attackby(I, user, params) @@ -176,26 +176,26 @@ WARNING("Signs ([signs]) didn't match contents") signs = 0 - update_icon() + update_icon(UPDATE_OVERLAYS) updateUsrDialog() -/obj/structure/janitorialcart/update_icon() - overlays = null +/obj/structure/janitorialcart/update_overlays() + . = ..() if(mybag) - overlays += "cart_garbage" + . += "cart_garbage" if(mymop) - overlays += "cart_mop" + . += "cart_mop" if(myspray) - overlays += "cart_spray" + . += "cart_spray" if(myreplacer) - overlays += "cart_replacer" + . += "cart_replacer" if(signs) - overlays += "cart_sign[signs]" + . += "cart_sign[signs]" if(reagents.total_volume > 0) var/image/reagentsImage = image(icon,src,"cart_reagents0") reagentsImage.alpha = 150 - switch((reagents.total_volume/reagents.maximum_volume)*100) + switch((reagents.total_volume / reagents.maximum_volume) * 100) if(1 to 25) reagentsImage.icon_state = "cart_reagents1" if(26 to 50) @@ -205,4 +205,5 @@ if(76 to 100) reagentsImage.icon_state = "cart_reagents4" reagentsImage.icon += mix_color_from_reagents(reagents.reagent_list) - add_overlay(reagentsImage) + . += reagentsImage + diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 0245e372f36..58764470efb 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -7,18 +7,18 @@ icon_state = "spikeframe" desc = "The frame of a meat spike." density = 1 - anchored = 0 + anchored = FALSE max_integrity = 200 /obj/structure/kitchenspike_frame/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/wrench)) + if(I.tool_behaviour == TOOL_WRENCH) add_fingerprint(user) if(anchored) to_chat(user, "You unwrench [src] from the floor.") - anchored = 0 + anchored = FALSE else to_chat(user, "You wrench [src] into place.") - anchored = 1 + anchored = TRUE else if(istype(I, /obj/item/stack/rods)) var/obj/item/stack/rods/R = I if(R.get_amount() >= 4) @@ -38,7 +38,7 @@ icon_state = "spike" desc = "A spike for collecting meat from animals." density = 1 - anchored = 1 + anchored = TRUE buckle_lying = FALSE can_buckle = TRUE max_integrity = 250 @@ -53,7 +53,7 @@ ..() /obj/structure/kitchenspike/attackby(obj/item/grab/G, mob/user) - if(istype(G, /obj/item/crowbar)) + if(G.tool_behaviour == TOOL_CROWBAR) if(!has_buckled_mobs()) playsound(loc, G.usesound, 100, 1) if(do_after(user, 20 * G.toolspeed * gettoolspeedmod(user), target = src)) diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index cb093c9521a..de42568a598 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -14,11 +14,11 @@ if (up) src.up = up up.down = src - up.update_icon() + up.update_icon(UPDATE_ICON_STATE) if (down) src.down = down down.up = src - down.update_icon() + down.update_icon(UPDATE_ICON_STATE) return INITIALIZE_HINT_LATELOAD /obj/structure/ladder/Destroy(force) @@ -35,7 +35,7 @@ for(var/obj/structure/ladder/L in locate(T.x, T.y, T.z - 1)) down = L L.up = src // Don't waste effort looping the other way - L.update_icon() + L.update_icon(UPDATE_ICON_STATE) break if(!up) for (var/obj/structure/ladder/L in locate(T.x, T.y, T.z + 1)) @@ -44,7 +44,7 @@ L.update_icon() break - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/ladder/proc/disconnect() if(up && up.down == src) @@ -55,7 +55,7 @@ down.update_icon() up = down = null -/obj/structure/ladder/update_icon() +/obj/structure/ladder/update_icon_state() if(up && down) icon_state = "ladder11" @@ -153,7 +153,7 @@ /obj/structure/ladder/unbreakable/LateInitialize() // Override the parent to find ladders based on being height-linked if(!id || (up && down)) - update_icon() + update_icon(UPDATE_ICON_STATE) return for(var/O in GLOB.ladders) @@ -163,17 +163,17 @@ if(!down && L.height == height - 1) down = L L.up = src - L.update_icon() + L.update_icon(UPDATE_ICON_STATE) if (up) break // break if both our connections are filled else if(!up && L.height == height + 1) up = L L.down = src - L.update_icon() + L.update_icon(UPDATE_ICON_STATE) if (down) break // break if both our connections are filled - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/ladder/unbreakable/dive_point/buoy name = "diving point buoy" @@ -198,5 +198,5 @@ . = ..() set_light(light_range, light_power) //magical glowing anchor -/obj/structure/ladder/unbreakable/dive_point/update_icon() +/obj/structure/ladder/unbreakable/dive_point/update_icon_state() return diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 542a5a367a9..79b596c0c99 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -2,7 +2,7 @@ /obj/structure/mineral_door name = "metal door" density = 1 - anchored = 1 + anchored = TRUE opacity = 1 icon = 'icons/obj/doors/mineral_doors.dmi' @@ -98,7 +98,7 @@ opacity = 0 state = 1 air_update_turf(1) - update_icon() + update_icon(UPDATE_ICON_STATE) isSwitchingStates = 0 if(close_delay != -1) @@ -119,15 +119,17 @@ opacity = 1 state = 0 air_update_turf(1) - update_icon() + update_icon(UPDATE_ICON_STATE) isSwitchingStates = 0 -/obj/structure/mineral_door/update_icon() + +/obj/structure/mineral_door/update_icon_state() if(state) icon_state = "[initial_state]open" else icon_state = initial_state + /obj/structure/mineral_door/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pickaxe)) var/obj/item/pickaxe/digTool = W diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index f69dc79ffae..d60b3ab5c1e 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "mirror" density = 0 - anchored = 1 + anchored = TRUE max_integrity = 200 integrity_failure = 100 flags_2 = CHECK_RICOCHET_2 diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index 290068b0e2e..6e83e2bd56b 100644 --- a/code/game/objects/structures/misc.dm +++ b/code/game/objects/structures/misc.dm @@ -8,7 +8,7 @@ /obj/structure/signpost icon = 'icons/obj/stationobjs.dmi' icon_state = "signpost" - anchored = 1 + anchored = TRUE density = 1 /obj/structure/signpost/attack_hand(mob/user as mob) @@ -20,7 +20,7 @@ desc = "What?" icon = 'icons/obj/stationobjs.dmi' icon_state = "signpost2" - anchored = 1 + anchored = TRUE density = 0 /obj/structure/respawner @@ -45,7 +45,7 @@ desc = "A structure that draws ethereal attention when active. Use an empty hand to activate." icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "anomaly_crystal" - anchored = 1 + anchored = TRUE density = 1 var/active = FALSE var/ghost_alert_delay = 30 SECONDS diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 62a3c559d0b..653e180cc23 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -26,37 +26,40 @@ if(in_range(user, src)) . += "[bicon(src)] [src] contains [reagents.total_volume] units of water left." -/obj/structure/mopbucket/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/mopbucket/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/mop)) - var/obj/item/mop/m = W - if(m.reagents.total_volume < m.reagents.maximum_volume) + var/obj/item/mop/mop = W + if(mop.reagents.total_volume < mop.reagents.maximum_volume) add_fingerprint(user) - m.wet_mop(src, user) + mop.wet_mop(src, user) return if(!mymop) add_fingerprint(user) - m.janicart_insert(user, src) + mop.mopbucket_insert(user, src) return to_chat(user, "Theres already a mop in the mopbucket.") return return ..() + /obj/structure/mopbucket/proc/put_in_cart(obj/item/mop/I, mob/user) user.drop_transfer_item_to_loc(I, src) to_chat(user, "You put [I] into [src].") - return + update_icon(UPDATE_OVERLAYS) + /obj/structure/mopbucket/on_reagent_change() - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/structure/mopbucket/update_icon() - overlays.Cut() + +/obj/structure/mopbucket/update_overlays() + . = ..() if(mymop) - overlays += image(icon,"mopbucket_mop") + . += "mopbucket_mop" if(reagents.total_volume > 0) var/image/reagentsImage = image(icon, src, "mopbucket_reagents0") reagentsImage.alpha = 150 - switch((reagents.total_volume/reagents.maximum_volume)*100) + switch((reagents.total_volume / reagents.maximum_volume) * 100) if(1 to 25) reagentsImage.icon_state = "mopbucket_reagents1" if(26 to 50) @@ -66,7 +69,8 @@ if(76 to 100) reagentsImage.icon_state = "mopbucket_reagents4" reagentsImage.icon += mix_color_from_reagents(reagents.reagent_list) - add_overlay(reagentsImage) + . += reagentsImage + /obj/structure/mopbucket/attack_hand(mob/living/user) . = ..() @@ -75,5 +79,5 @@ user.put_in_hands(mymop, ignore_anim = FALSE) to_chat(user, "You take [mymop] from [src].") mymop = null - update_icon() - return + update_icon(UPDATE_OVERLAYS) + diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 4d05534d468..6e4f862393c 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "nboard" density = 0 - anchored = 1 + anchored = TRUE max_integrity = 150 var/notices = 0 @@ -25,6 +25,7 @@ break . += image(src.icon, icon_state = "[src.icon_state][I]") + //attaching papers!! /obj/structure/noticeboard/attackby(obj/item/item, mob/user, params) if(istype(item, /obj/item/paper)) diff --git a/code/game/objects/structures/pit.dm b/code/game/objects/structures/pit.dm index 99b778479b3..9b6ca752a84 100644 --- a/code/game/objects/structures/pit.dm +++ b/code/game/objects/structures/pit.dm @@ -45,9 +45,11 @@ return ..() -/obj/structure/pit/update_icon() + +/obj/structure/pit/update_icon_state() icon_state = "pit[open][icon_floor_type]" + /obj/structure/pit/Initialize(mapload) . = ..() if(mapload && !open) @@ -64,12 +66,13 @@ icon_floor_type = "sand" if(istype(loc, /turf/simulated/floor/grass)) icon_floor_type = "mud" - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/pit/proc/take_contents() var/itemcount = 0 for(var/atom/movable/A in loc) - if(A.density || A.anchored || A == src || open) continue + if(A.density || A.anchored || A == src || open) + continue A.forceMove(src) itemcount += 1 if(itemcount >= storage_capacity) @@ -87,7 +90,7 @@ if(istype(A, /obj/structure/closet)) for(var/mob/living/carbon/M in A.contents) M.update_tint() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/pit/proc/close(var/user) name = "mound" @@ -108,7 +111,7 @@ if(istype(A, /obj/structure/closet)) for(var/mob/living/carbon/M in A.contents) M.overlay_fullscreen("tint", /obj/screen/fullscreen/blind) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/pit/remove_air(amount) return 0 diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index a5bd33c304f..6b4ad0d2721 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "plasticflaps" density = 0 - anchored = 1 + anchored = TRUE layer = 4 armor = list(melee = 100, bullet = 80, laser = 80, energy = 100, bomb = 50, bio = 100, rad = 100, fire = 50, acid = 50) var/state = PLASTIC_FLAPS_NORMAL diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index a93cb5e7cca..c39bf139cd5 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/stock_parts.dmi' icon_state = "box_0" desc = "A frame to create a reflector.\nUse 5 sheets of glass to create a 1 way reflector.\nUse 10 sheets of reinforced glass to create a 2 way reflector.\nUse 1 diamond to create a reflector cube." - anchored = 0 + anchored = FALSE density = 1 layer = 3 var/finished = 0 diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 06cd6627178..f2f64492a6e 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -112,7 +112,8 @@ GLOBAL_LIST_EMPTY(safes) /obj/structure/safe/examine_status(mob/user) return -/obj/structure/safe/update_icon() + +/obj/structure/safe/update_icon_state() if(open) if(broken) icon_state = "[initial(icon_state)]-open-broken" @@ -124,17 +125,15 @@ GLOBAL_LIST_EMPTY(safes) else icon_state = initial(icon_state) - var/list/overlays_to_cut = list(drill_overlay) - if(!drill_timer) - overlays_to_cut += progress_bar - - cut_overlay(overlays_to_cut) +/obj/structure/safe/update_overlays() + . = ..() if(istype(drill, /obj/item/thermal_drill)) var/drill_icon = istype(drill, /obj/item/thermal_drill/diamond_drill) ? "d" : "h" var/state = "[initial(icon_state)]_[drill_icon]-drill-[drill_timer ? "on" : "off"]" drill_overlay = image(icon = 'icons/effects/drill.dmi', icon_state = state, pixel_x = drill_x_offset, pixel_y = drill_y_offset) - add_overlay(drill_overlay) + . += drill_overlay + /obj/structure/safe/attack_ghost(mob/user) if(..() || drill) @@ -376,7 +375,7 @@ GLOBAL_LIST_EMPTY(safes) hide(T.intact) /obj/structure/safe/floor/hide(intact) - invisibility = intact ? INVISIBILITY_ABSTRACT : 0 + invisibility = intact ? INVISIBILITY_MAXIMUM : 0 /** * # Safe Internals diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index c841de19414..40e72b92172 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -1,12 +1,32 @@ /obj/structure/sign icon = 'icons/obj/decals.dmi' - anchored = 1 + anchored = TRUE opacity = 0 density = 0 layer = 3.5 max_integrity = 100 + blocks_emissive = EMISSIVE_BLOCK_GENERIC + var/does_emissive = FALSE armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + +/obj/structure/sign/Initialize(mapload) + . = ..() + if(does_emissive) + update_icon(UPDATE_OVERLAYS) + set_light(1, LIGHTING_MINIMUM_POWER) + + +/obj/structure/sign/update_overlays() + . = ..() + + underlays.Cut() + if(!does_emissive) + return + + underlays += emissive_appearance(icon,"[icon_state]_lightmask") + + /obj/structure/sign/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) @@ -17,6 +37,7 @@ if(BURN) playsound(loc, 'sound/items/welder.ogg', 80, TRUE) + /obj/structure/sign/screwdriver_act(mob/user, obj/item/I) if(istype(src, /obj/structure/sign/double)) return @@ -42,33 +63,36 @@ resistance_flags = FLAMMABLE var/sign_state = "" -/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob) //construction - if(istype(tool, /obj/item/screwdriver) && isturf(user.loc)) - var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel") - if(direction == "Cancel") - return - if(QDELETED(src)) - return - var/obj/structure/sign/S = new(user.loc) - switch(direction) - if("North") - S.pixel_y = 32 - if("East") - S.pixel_x = 32 - if("South") - S.pixel_y = -32 - if("West") - S.pixel_x = -32 - else - return - S.name = name - S.desc = desc - S.icon_state = sign_state - src.transfer_fingerprints_to(S) - to_chat(user, "You fasten \the [S] with your [tool].") - qdel(src) - else - return ..() + +/obj/item/sign/screwdriver_act(mob/living/user, obj/item/I) + if(!isturf(loc)) + return + + var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel") + if(direction == "Cancel") + return TRUE // These gotta be true or we stab the sign + if(QDELETED(src)) + return TRUE // Unsure about this, but stabbing something that doesnt exist seems like a bad idea + + var/obj/structure/sign/sign = new(loc) + switch(direction) + if("North") + sign.pixel_y = 32 + if("East") + sign.pixel_x = 32 + if("South") + sign.pixel_y = -32 + if("West") + sign.pixel_x = -32 + else + return TRUE // We dont want to stab it or place it, so we return + sign.name = name + sign.desc = desc + sign.icon_state = sign_state + to_chat(user, span_notice("You fasten [sign] with your [I].")) + qdel(src) + return TRUE + /obj/structure/sign/double/map name = "station map" @@ -212,11 +236,15 @@ name = "\improper barber shop sign" desc = "A spinning sign indicating a barbershop is near." icon_state = "barber" + does_emissive = TRUE + blocks_emissive = FALSE /obj/structure/sign/chinese name = "\improper chinese restaurant sign" desc = "A glowing dragon invites you in." icon_state = "chinese" + does_emissive = TRUE + blocks_emissive = FALSE /obj/structure/sign/science name = "\improper SCIENCE!" diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index e72f4760089..cd241fec97b 100644 --- a/code/game/objects/structures/spirit_board.dm +++ b/code/game/objects/structures/spirit_board.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "spirit_board" density = 1 - anchored = 1 + anchored = TRUE var/used = FALSE var/cooldown = 0 var/planchette = "А" diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 8ad8842a508..ca64315fbcb 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/statue.dmi' icon_state = "" density = 1 - anchored = 0 + anchored = FALSE max_integrity = 100 var/oreAmount = 5 var/material_drop_type = /obj/item/stack/sheet/metal @@ -376,7 +376,7 @@ icon = 'icons/obj/statuelarge.dmi' icon_state = "frank" max_integrity = 2000 - anchored = 1 + anchored = TRUE layer = EDGED_TURF_LAYER /obj/structure/statue/dude @@ -385,7 +385,7 @@ icon = 'icons/obj/statuelarge.dmi' icon_state = "dude" max_integrity = 2000 - anchored = 1 + anchored = TRUE layer = EDGED_TURF_LAYER /obj/structure/statue/death @@ -394,7 +394,7 @@ icon = 'icons/obj/statuebig.dmi' icon_state = "death" max_integrity = 2000 - anchored = 1 + anchored = TRUE bound_width = 64 layer = EDGED_TURF_LAYER @@ -404,20 +404,16 @@ icon = 'icons/obj/statuebig.dmi' icon_state = "unknown" max_integrity = 2000 - anchored = 1 + anchored = TRUE bound_width = 64 var/lit = 0 layer = EDGED_TURF_LAYER -/obj/structure/statue/unknown/Destroy() - return ..() -/obj/structure/statue/unknown/update_icon() - if(lit) - lit = 1 - icon_state = "unknown_lit" - else - icon_state = "unknown" +/obj/structure/statue/unknown/update_icon_state() + icon_state = "unknown[lit ? "_lit" : ""]" + + /obj/structure/statue/unknown/attackby(obj/item/W, mob/user, params) if(is_hot(W)) @@ -425,29 +421,33 @@ return return ..() + /obj/structure/statue/unknown/welder_act(mob/user, obj/item/I) . = TRUE if(I.tool_use_check(user, 0)) light(span_notice("[user] casually lights the [name] with [I], what a badass.")) + /obj/structure/statue/unknown/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) if(!lit) light() return ..() + /obj/structure/statue/unknown/proc/light(show_message) if(!lit) - lit = 1 + lit = TRUE if(show_message) usr.visible_message(show_message) set_light(CANDLE_LUM) - update_icon() + update_icon(UPDATE_ICON_STATE) + /obj/structure/statue/unknown/attack_hand(mob/user) if(lit) user.visible_message(span_notice("[user] snuffs out [src].")) - lit = 0 - update_icon() + lit = FALSE + update_icon(UPDATE_ICON_STATE) set_light(0) //////////////////////////////// diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index eaeabd374a5..5f44986b557 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -149,16 +149,18 @@ forceMove(RH) RH.held = src -/obj/structure/bed/roller/MouseDrop(over_object, src_location, over_location) - ..() - if(over_object == usr && Adjacent(usr) && (in_range(src, usr) || usr.contents.Find(src))) - if(!ishuman(usr) || usr.incapacitated()) - return - if(has_buckled_mobs()) - return 0 - usr.visible_message("[usr] collapses \the [name].", "You collapse \the [name].") + +/obj/structure/bed/roller/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) + if(!has_buckled_mobs() && over_object == usr && ishuman(usr) && !usr.incapacitated() && usr.Adjacent(src)) + usr.visible_message( + span_notice("[usr] collapses [src]."), + span_notice("You collapse [src]."), + ) new folded(get_turf(src)) qdel(src) + return FALSE + return ..() + /obj/item/roller/holo name = "holo stretcher" diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index c7895e40f5c..2723eb5c760 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -73,11 +73,9 @@ new buildstacktype(loc, buildstackamount) ..() -/obj/structure/chair/MouseDrop(over_object, src_location, over_location) - . = ..() - if(over_object == usr && Adjacent(usr)) - if(!item_chair || has_buckled_mobs() || anchored) - return + +/obj/structure/chair/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) + if(over_object == usr && ishuman(usr) && item_chair && !anchored && !has_buckled_mobs() && usr.Adjacent(src)) if(usr.incapacitated()) to_chat(usr, span_warning("You can't do that right now!")) return @@ -87,13 +85,18 @@ if(usr.get_active_hand() && usr.get_inactive_hand()) to_chat(usr, span_warning("You try to grab the chair, but your hands are already full!")) return - if(!ishuman(usr)) - return - usr.visible_message(span_notice("[usr] grabs \the [src]."), span_notice("You grab \the [src].")) - var/C = new item_chair(drop_location()) - usr.put_in_hands(C, ignore_anim = FALSE) - transfer_fingerprints_to(C) + usr.visible_message( + span_notice("[usr] grabs [src]."), + span_notice("You grab [src]."), + ) + var/new_chair = new item_chair(drop_location()) + transfer_fingerprints_to(new_chair) + usr.put_in_hands(new_chair, ignore_anim = FALSE) qdel(src) + return FALSE + + return ..() + /obj/structure/chair/attack_tk(mob/user) if(!anchored || has_buckled_mobs() || !isturf(user.loc)) @@ -101,53 +104,65 @@ else rotate() + /obj/structure/chair/proc/handle_rotation(direction) handle_layer() if(has_buckled_mobs()) - for(var/m in buckled_mobs) - var/mob/living/buckled_mob = m + for(var/mob/living/buckled_mob as anything in buckled_mobs) buckled_mob.setDir(direction) + /obj/structure/chair/proc/handle_layer() if(has_buckled_mobs() && dir == NORTH) layer = ABOVE_MOB_LAYER else layer = OBJ_LAYER + /obj/structure/chair/post_buckle_mob(mob/living/M) . = ..() handle_layer() + /obj/structure/chair/post_unbuckle_mob() . = ..() handle_layer() + /obj/structure/chair/setDir(newdir) ..() handle_rotation(newdir) -/obj/structure/chair/verb/rotate() - set name = "Rotate Chair" - set category = "Object" - set src in oview(1) - if(CONFIG_GET(flag/ghost_interaction)) - add_fingerprint(usr) - setDir(turn(dir, 90)) - handle_rotation() - return +/obj/structure/chair/examine(mob/user) + . = ..() + . += span_info("You can Alt-Click [src] to rotate it.") - if(usr.incapacitated()) - return - add_fingerprint(usr) +/obj/structure/chair/proc/rotate(mob/living/user) + if(user) + if(isobserver(user)) + if(!CONFIG_GET(flag/ghost_interaction)) + return FALSE + else if(!isliving(user) || user.incapacitated() || !Adjacent(user)) + return FALSE + setDir(turn(dir, 90)) handle_rotation() + return TRUE + + +/obj/structure/chair/AltClick(mob/living/user) + rotate(user) + + +/obj/structure/chair/verb/rotate_chair() + set name = "Rotate Chair" + set category = "Object" + set src in oview(1) + + rotate(usr) -/obj/structure/chair/AltClick(mob/user) - if(!Adjacent(user)) - return - rotate() // CHAIR TYPES @@ -288,7 +303,7 @@ anchored = TRUE item_chair = null comfort = 0.6 - var/image/armrest = null + var/mutable_appearance/armrest /obj/structure/chair/sofa/Initialize(mapload) armrest = GetArmrest() diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 186ec4ea419..9364329513e 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -34,52 +34,72 @@ var/buildstackamount = 1 var/framestackamount = 2 var/deconstruction_ready = TRUE - var/flipped = 0 + var/flip_sound = 'sound/machines/wooden_closet_close.ogg' + var/flipped = FALSE + /// Can this table be flipped? + var/can_be_flipped = TRUE + /obj/structure/table/Initialize(mapload) . = ..() if(flipped) - update_icon() + update_icon(UPDATE_ICON_STATE) + /obj/structure/table/examine(mob/user) . = ..() . += deconstruction_hints(user) + if(can_be_flipped) + if(flipped) + . += span_info("Alt-Shift-Click to right the table again.") + else + . += span_info("Alt-Shift-Click to flip over the table.") + /obj/structure/table/proc/deconstruction_hints(mob/user) return "The top is screwed on, but the main bolts are also visible." -/obj/structure/table/update_icon() + +/obj/structure/table/update_icon(updates = ALL) + . = ..() + update_smoothing() + + +/obj/structure/table/update_icon_state() if(smooth && !flipped) icon_state = "" - queue_smooth(src) - queue_smooth_neighbors(src) if(flipped) - clear_smooth_overlays() - var/type = 0 var/subtype = null for(var/direction in list(turn(dir,90), turn(dir,-90)) ) - var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,direction)) - if(T && T.flipped) + var/obj/structure/table/other_table = locate(/obj/structure/table,get_step(src,direction)) + if(other_table?.flipped) type++ if(type == 1) subtype = direction == turn(dir,90) ? "-" : "+" var/base = "table" if(istype(src, /obj/structure/table/wood)) base = "wood" - if(istype(src, /obj/structure/table/reinforced)) + else if(istype(src, /obj/structure/table/reinforced)) base = "rtable" - if(istype(src, /obj/structure/table/wood/poker)) + else if(istype(src, /obj/structure/table/wood/poker)) base = "poker" - if(istype(src, /obj/structure/table/wood/fancy)) + else if(istype(src, /obj/structure/table/wood/fancy)) base = "fancy" - if(istype(src, /obj/structure/table/wood/fancy/black)) + else if(istype(src, /obj/structure/table/wood/fancy/black)) base = "fancyblack" - icon_state = "[base]flip[type][type == 1 ? subtype : ""]" - return 1 + +/obj/structure/table/proc/update_smoothing() + if(smooth) + queue_smooth(src) + queue_smooth_neighbors(src) + + if(flipped) + clear_smooth_overlays() + /obj/structure/table/narsie_act() new /obj/structure/table/wood(loc) @@ -117,28 +137,29 @@ var/mob/living/user = AM clumse_stuff(user) + /obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0) if(height == 0) - return 1 + return TRUE if(istype(mover,/obj/item/projectile)) - return (check_cover(mover,target)) + return check_cover(mover,target) if(ismob(mover)) - var/mob/M = mover + var/mob/living/M = mover if(M.flying) - return 1 + return TRUE if(istype(mover) && mover.checkpass(PASSTABLE)) - return 1 + return TRUE if(mover.throwing) - return 1 + return TRUE + if(length(get_atoms_of_type(get_turf(mover), /obj/structure/table) - mover)) + var/obj/structure/table/other_table = locate(/obj/structure/table) in get_turf(mover) + if(!other_table.flipped) + return TRUE if(flipped) if(get_dir(loc, target) == dir) return !density - else - return 1 - var/obj/structure/table/S = locate(/obj/structure/table) in get_turf(mover) - if(S?.flipped == 0) - return 1 - return 0 + return TRUE + return FALSE /obj/structure/table/CanPathfindPass(obj/item/card/id/ID, dir, caller, no_id = FALSE) @@ -157,53 +178,48 @@ * * from - Where the projectile is located. */ /obj/structure/table/proc/check_cover(obj/item/projectile/P, turf/from) - var/turf/cover = flipped ? get_turf(src) : get_step(loc, get_dir(from, loc)) - if(get_dist(P.starting, loc) <= 1) //Tables won't help you if people are THIS close - return 1 - if(get_turf(P.original) == cover) - var/chance = 20 - if(ismob(P.original)) - var/mob/M = P.original - if(M.lying) - chance += 20 //Lying down lets you catch less bullets - if(flipped) - if(get_dir(loc, from) == dir) //Flipped tables catch mroe bullets - chance += 20 - else - return 1 //But only from one side - if(prob(chance)) - obj_integrity -= P.damage/2 - if(obj_integrity > 0) - visible_message("[P] hits \the [src]!") - return 0 - else - visible_message("[src] breaks down!") - deconstruct(FALSE) - return 1 - return 1 - -/obj/structure/table/CheckExit(atom/movable/O, turf/target) - if(istype(O) && O.checkpass(PASSTABLE)) - return 1 - if(flipped) - if(get_dir(loc, target) == dir) - return !density - else - return 1 - return 1 + . = TRUE -/obj/structure/table/MouseDrop_T(obj/O, mob/user) - ..() - if((!( istype(O, /obj/item) ) || user.get_active_hand() != O)) - return + if(!flipped) + return . + + if(in_range(P.starting, loc)) // Tables won't help you if people are THIS close + return . + + var/proj_dir = get_dir(from, loc) + var/block_dir = get_dir(get_step(loc, dir), loc) + var/full_protection = (proj_dir & block_dir) + var/half_protection = ((proj_dir == get_clockwise_dir(block_dir)) || (proj_dir == get_anticlockwise_dir(block_dir))) + + if(!full_protection && !half_protection) // Back/side shots may pass + return . + + if(prob(half_protection ? 40 : 60)) + return FALSE // Blocked + + +/obj/structure/table/CheckExit(atom/movable/mover, turf/target) + if(istype(mover) && mover.checkpass(PASSTABLE)) + return TRUE + if(flipped && get_dir(loc, target) == dir) + return !density + return TRUE + + +/obj/structure/table/MouseDrop_T(obj/dropping, mob/user, params) + if(..()) + return TRUE + if(!isitem(dropping) || user.get_active_hand() != dropping) + return FALSE if(isrobot(user)) - return - if(!user.drop_from_active_hand()) - return - if(O.loc != src.loc) + return FALSE + if(!user.drop_item_ground(dropping)) + return FALSE + if(dropping.loc != loc) add_fingerprint(user) - step(O, get_dir(O, src)) - return + step(dropping, get_dir(dropping, src)) + return TRUE + /obj/structure/table/proc/tablepush(obj/item/grab/G, mob/user) if(HAS_TRAIT(user, TRAIT_PACIFISM) || GLOB.pacifism_after_gt) @@ -232,6 +248,7 @@ return TRUE qdel(G) + /obj/structure/table/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/grab)) add_fingerprint(user) @@ -269,6 +286,7 @@ deconstruct(TRUE) TOOL_DISMANTLE_SUCCESS_MESSAGE + /obj/structure/table/wrench_act(mob/user, obj/item/I) if(flags & NODECONSTRUCT) return @@ -282,6 +300,7 @@ deconstruct(TRUE, 1) TOOL_DISMANTLE_SUCCESS_MESSAGE + /obj/structure/table/deconstruct(disassembled = TRUE, wrench_disassembly = 0) if(!(flags & NODECONSTRUCT)) var/turf/T = get_turf(src) @@ -292,119 +311,113 @@ new framestack(T, framestackamount) qdel(src) + /obj/structure/table/proc/straight_table_check(direction) - var/obj/structure/table/T - for(var/angle in list(-90,90)) - T = locate() in get_step(loc,turn(direction,angle)) - if(T && !T.flipped) - return 0 - T = locate() in get_step(loc,direction) - if(!T || T.flipped) - return 1 - if(istype(T,/obj/structure/table/reinforced/)) - if(!T.deconstruction_ready) - return 0 - return T.straight_table_check(direction) + var/obj/structure/table/check_table + for(var/angle in list(-90, 90)) + check_table = locate() in get_step(loc, turn(direction, angle)) + if(check_table && !check_table.flipped) + return FALSE + check_table = locate() in get_step(loc, direction) + if(!check_table || check_table.flipped) + return TRUE + if(istype(check_table, /obj/structure/table/reinforced) && !check_table.deconstruction_ready) + return FALSE + return check_table.straight_table_check(direction) -/obj/structure/table/verb/do_flip() - set name = "Flip table" - set desc = "Flips a non-reinforced table" - set category = null - set src in oview(1) - if(!can_touch(usr) || ismouse(usr)) - return +/obj/structure/table/AltShiftClick(mob/user) + actual_flip(user) - if(!flip(get_cardinal_dir(usr,src))) - to_chat(usr, "It won't budge.") - return - add_fingerprint(usr) - usr.visible_message("[usr] flips \the [src]!") +/obj/structure/table/verb/do_flip() + set name = "Flip/Unflip table" + set desc = "Flips or unflips a table" + set category = null + set src in oview(1) + actual_flip(usr) - if(climbable) - structure_shaken() - return +/obj/structure/table/proc/actual_flip(mob/living/user) + if(!can_be_flipped || !can_touch(user)) + return FALSE -/obj/structure/table/proc/do_put() - set name = "Put table back" - set desc = "Puts flipped table back" - set category = "Object" - set src in oview(1) + if(!flipped) + if(!flip(get_cardinal_dir(user, src))) + to_chat(user, span_notice("It won't budge.")) + return - if(!can_touch(usr) || ismouse(usr)) - return + user.visible_message("[user] flips \the [src]!") - if(!unflip()) - to_chat(usr, "It won't budge.") - return + if(climbable) + structure_shaken() + else + if(!unflip()) + to_chat(user, span_notice("It won't budge.")) /obj/structure/table/proc/flip(direction) if(flipped) - return 0 + return FALSE - if( !straight_table_check(turn(direction,90)) || !straight_table_check(turn(direction,-90)) ) - return 0 - - verbs -=/obj/structure/table/verb/do_flip - verbs +=/obj/structure/table/proc/do_put + if(!straight_table_check(turn(direction,90)) || !straight_table_check(turn(direction,-90))) + return FALSE var/list/targets = list(get_step(src,dir),get_step(src,turn(dir, 45)),get_step(src,turn(dir, -45))) - for(var/atom/movable/A in get_turf(src)) - if(!A.anchored) - spawn(0) - A.throw_at(pick(targets),1,1) + for(var/atom/movable/thing in get_turf(src)) + if(!thing.anchored) + INVOKE_ASYNC(thing, TYPE_PROC_REF(/atom/movable, throw_at), pick(targets), 1, 1) dir = direction if(dir != NORTH) layer = 5 - flipped = 1 + flipped = TRUE smooth = SMOOTH_FALSE flags |= ON_BORDER - for(var/D in list(turn(direction, 90), turn(direction, -90))) - if(locate(/obj/structure/table,get_step(src,D))) - var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,D)) - T.flip(direction) - update_icon() + playsound(loc, flip_sound, 100, TRUE) + + for(var/check_dir in list(turn(direction, 90), turn(direction, -90))) + var/obj/structure/table/other_table = locate(/obj/structure/table, get_step(src, check_dir)) + if(other_table) + other_table.flip(direction) + update_icon(UPDATE_ICON_STATE) creates_cover = FALSE if(isturf(loc)) REMOVE_TRAIT(loc, TRAIT_TURF_COVERED, UNIQUE_TRAIT_SOURCE(src)) - return 1 + return TRUE + /obj/structure/table/proc/unflip() if(!flipped) - return 0 + return FALSE - var/can_flip = 1 - for(var/mob/A in oview(src,0))//loc) - if(istype(A)) - can_flip = 0 + var/can_flip = TRUE + for(var/mob/check in oview(src, 0)) + can_flip = FALSE + break if(!can_flip) - return 0 - - verbs -=/obj/structure/table/proc/do_put - verbs +=/obj/structure/table/verb/do_flip + return FALSE layer = initial(layer) - flipped = 0 + flipped = FALSE smooth = initial(smooth) flags &= ~ON_BORDER - for(var/D in list(turn(dir, 90), turn(dir, -90))) - if(locate(/obj/structure/table,get_step(src,D))) - var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,D)) - T.unflip() + playsound(loc, flip_sound, 100, TRUE) + + for(var/check_dir in list(turn(dir, 90), turn(dir, -90))) + var/obj/structure/table/other_table = locate(/obj/structure/table, get_step(src, check_dir)) + if(other_table) + other_table.unflip() dir = initial(dir) - update_icon() + update_icon(UPDATE_ICON_STATE) creates_cover = TRUE if(isturf(loc)) ADD_TRAIT(loc, TRAIT_TURF_COVERED, UNIQUE_TRAIT_SOURCE(src)) - return 1 + return TRUE /* @@ -433,25 +446,30 @@ qdel(i) . = ..() + /obj/structure/table/glass/Crossed(atom/movable/AM, oldloc) . = ..() if(flags & NODECONSTRUCT) return if(!isliving(AM)) return + + var/mob/living/check = AM + if(check.incorporeal_move || check.flying || check.floating) + return + // Don't break if they're just flying past if(AM.throwing) addtimer(CALLBACK(src, PROC_REF(throw_check), AM), 5) else check_break(AM) + /obj/structure/table/glass/proc/throw_check(mob/living/M) if(M.loc == get_turf(src)) check_break(M) /obj/structure/table/glass/proc/check_break(mob/living/M) - if(M.flying || M.incorporeal_move) - return if(has_gravity(M) && M.mob_size > MOB_SIZE_SMALL) table_shatter(M) @@ -628,9 +646,8 @@ /obj/structure/table/reinforced/flip(direction) if(!deconstruction_ready) - return 0 - else - return ..() + return FALSE + return ..() /obj/structure/table/reinforced/welder_act(mob/user, obj/item/I) . = TRUE @@ -683,15 +700,15 @@ icon_state = "tray" buildstack = /obj/item/stack/sheet/mineral/titanium buildstackamount = 2 + can_be_flipped = FALSE var/list/typecache_can_hold = list(/mob, /obj/item) var/list/held_items = list() /obj/structure/table/tray/Initialize() . = ..() - verbs -= /obj/structure/table/verb/do_flip typecache_can_hold = typecacheof(typecache_can_hold) for(var/atom/movable/held in get_turf(src)) - if(is_type_in_typecache(held, typecache_can_hold)) + if(!held.anchored && held.move_resist != INFINITY && is_type_in_typecache(held, typecache_can_hold)) held_items += held.UID() /obj/structure/table/tray/Move(NewLoc, direct) @@ -717,10 +734,26 @@ continue held.forceMove(NewLoc) + +/obj/structure/table/tray/can_be_pulled(user, force, show_message) + var/atom/movable/puller = user + if(loc != puller.loc) + held_items -= puller.UID() + if(isliving(user)) + var/mob/living/M = user + if(M.UID() in held_items) + return FALSE + return ..() + + /obj/structure/table/tray/item_placed(atom/movable/item) . = ..() if(is_type_in_typecache(item, typecache_can_hold)) held_items += item.UID() + if(isliving(item)) + var/mob/living/M = item + if(M.pulling == src) + M.stop_pulling() /obj/structure/table/tray/deconstruct(disassembled = TRUE, wrench_disassembly = 0) if(!(flags & NODECONSTRUCT)) @@ -758,17 +791,17 @@ . = ..() . += "It's held together by a couple of bolts." + /obj/structure/rack/CanPass(atom/movable/mover, turf/target, height=0) if(height==0) - return 1 - if(density == 0) //Because broken racks -Agouri |TODO: SPRITE!| - return 1 + return TRUE + if(!density) //Because broken racks -Agouri |TODO: SPRITE!| + return TRUE if(istype(mover) && mover.checkpass(PASSTABLE)) - return 1 + return TRUE if(mover.throwing) - return 1 - else - return 0 + return TRUE + return FALSE /obj/structure/rack/CanPathfindPass(obj/item/card/id/ID, dir, caller, no_id = FALSE) @@ -778,23 +811,25 @@ . = . || mover.checkpass(PASSTABLE) -/obj/structure/rack/MouseDrop_T(obj/item/O, mob/user) - if((!(istype(O)) || user.get_active_hand() != O)) - return +/obj/structure/rack/MouseDrop_T(obj/item/dropping, mob/user, params) + . = FALSE + if((!isitem(dropping)) || user.get_active_hand() != dropping) + return . if(isrobot(user)) - return - if(O.loc != src.loc) - if(user.transfer_item_to_loc(O, src.loc)) - add_fingerprint(user) + return . + if(dropping.loc != loc && user.transfer_item_to_loc(dropping, src.loc)) + add_fingerprint(user) + return TRUE + -/obj/structure/rack/attackby(obj/item/W, mob/user, params) +/obj/structure/rack/attackby(obj/item/I, mob/user, params) if(isrobot(user)) return if(user.a_intent == INTENT_HARM) return ..() - if(!(W.flags & ABSTRACT)) - if(user.transfer_item_to_loc(W, src.loc)) - add_fingerprint(user) + if(!(I.flags & ABSTRACT) && user.transfer_item_to_loc(I, loc)) + add_fingerprint(user) + /obj/structure/rack/wrench_act(mob/user, obj/item/I) . = TRUE @@ -842,46 +877,45 @@ desc = "A gun rack for storing guns." icon_state = "gunrack" -/obj/structure/rack/gunrack/MouseDrop_T(obj/O, mob/user) - if(isrobot(user)) - return - if(!user.drop_from_active_hand()) - return - if(!(istype(O, /obj/item/gun))) - to_chat(user, "This item doesn't fit!") - return - if(O.loc != src.loc) - add_fingerprint(user) - var/obj/item/gun/our_gun = O - our_gun.reset_direction() - our_gun.place_on_rack() - our_gun.do_drop_animation(src) - our_gun.Move(loc) -/obj/structure/rack/gunrack/attackby(obj/item/W, mob/user, params) +/obj/structure/rack/gunrack/proc/place_gun(obj/item/gun/our_gun, mob/user, params) + . = FALSE if(!ishuman(user)) - return - if(user.a_intent == INTENT_HARM) - return ..() - if(!(istype(W, /obj/item/gun))) - to_chat(user, "This item doesn't fit!") - return - if(!(W.flags & ABSTRACT) && user.drop_from_active_hand()) + return . + if(!(istype(our_gun))) + to_chat(user, span_warning("This item doesn't fit!")) + return . + if(our_gun.flags & ABSTRACT) + return . + if(!user.drop_item_ground(our_gun)) + return . + if(our_gun.loc != loc) add_fingerprint(user) - var/obj/item/gun/our_gun = W + our_gun.reset_direction() our_gun.place_on_rack() our_gun.do_drop_animation(src) our_gun.Move(loc) var/list/click_params = params2list(params) //Center the icon where the user clicked. if(!click_params || !click_params["icon-x"] || !click_params["icon-y"]) - return + return . //Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf) - W.pixel_x = clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2) - W.pixel_y = 0 - else + our_gun.pixel_x = clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2) + our_gun.pixel_y = 0 + return TRUE + + +/obj/structure/rack/gunrack/MouseDrop_T(obj/item/gun/our_gun, mob/user, params) + return place_gun(our_gun, user, params) + + +/obj/structure/rack/gunrack/attackby(obj/item/I, mob/user, params) + if(!ishuman(user)) return - return + if(user.a_intent == INTENT_HARM) + return ..() + place_gun(I, user, params) + /obj/structure/rack/gunrack/wrench_act(mob/user, obj/item/I) . = TRUE @@ -889,13 +923,15 @@ return deconstruct(TRUE) + /obj/structure/rack/gunrack/Initialize(mapload) . = ..() - if(mapload) - for(var/obj/item/I in loc.contents) - if(istype(I, /obj/item/gun)) - var/obj/item/gun/to_place = I - to_place.place_on_rack() + if(!mapload) + return + + for(var/obj/item/gun/gun in loc) + gun.place_on_rack() + /obj/structure/rack/gunrack/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT)) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index e773b66baf2..8e33df0e985 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "dispenser" density = 1 - anchored = 1.0 + anchored = TRUE var/starting_oxygen_tanks = MAX_TANK_STORAGE // The starting amount of oxygen tanks the dispenser gets when it's spawned var/starting_plasma_tanks = MAX_TANK_STORAGE // Starting amount of plasma tanks var/list/stored_oxygen_tanks = list() // List of currently stored oxygen tanks @@ -21,7 +21,7 @@ /obj/structure/dispenser/Initialize(mapload) . = ..() initialize_tanks() - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/dispenser/Destroy() QDEL_LIST(stored_plasma_tanks) @@ -37,21 +37,23 @@ var/obj/item/tank/internals/oxygen/O = new(src) stored_oxygen_tanks.Add(O) -/obj/structure/dispenser/update_icon() - cut_overlays() + +/obj/structure/dispenser/update_overlays() + . = ..() var/oxy_tank_amount = LAZYLEN(stored_oxygen_tanks) switch(oxy_tank_amount) if(1 to 3) - overlays += "oxygen-[oxy_tank_amount]" + . += "oxygen-[oxy_tank_amount]" if(4 to INFINITY) - overlays += "oxygen-4" + . += "oxygen-4" var/pla_tank_amount = LAZYLEN(stored_plasma_tanks) switch(pla_tank_amount) if(1 to 4) - overlays += "plasma-[pla_tank_amount]" + . += "plasma-[pla_tank_amount]" if(5 to INFINITY) - overlays += "plasma-5" + . += "plasma-5" + /obj/structure/dispenser/attack_hand(mob/user) if(..()) @@ -100,14 +102,14 @@ try_insert_tank(user, stored_plasma_tanks, I) return - if(istype(I, /obj/item/wrench)) + if(I.tool_behaviour == TOOL_WRENCH) add_fingerprint(user) if(anchored) to_chat(user, "You lean down and unwrench [src].") - anchored = 0 + anchored = FALSE else to_chat(user, "You wrench [src] into place.") - anchored = 1 + anchored = TRUE return return ..() @@ -116,14 +118,14 @@ if(!LAZYLEN(tank_list)) return // There are no tanks left to withdraw. - var/obj/item/tank/internals/T = tank_list[1] - tank_list.Remove(T) + var/obj/item/tank/internals/tank = tank_list[1] + tank_list.Remove(tank) - T.forceMove_turf() - user.put_in_hands(T) + tank.forceMove_turf() + user.put_in_hands(tank, ignore_anim = FALSE) - to_chat(user, "You take [T] out of [src].") - update_icon() + to_chat(user, "You take [tank] out of [src].") + update_icon(UPDATE_OVERLAYS) /// Called when the user clicks on the dispenser with a tank. Tries to insert the tank into the dispenser, and updates the UI if successful. /obj/structure/dispenser/proc/try_insert_tank(mob/living/user, list/tank_list, obj/item/tank/T) @@ -137,7 +139,7 @@ add_fingerprint(user) tank_list.Add(T) - update_icon() + update_icon(UPDATE_OVERLAYS) to_chat(user, "You put [T] in [src].") SStgui.update_uis(src) diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 12e14dcf80d..7ebd461fd7e 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -1,15 +1,14 @@ #define CLOSE_DURATION 6 #define OPEN_DURATION 6 -#define LAUNCH_COOLDOWN 50 - - +#define LAUNCH_COOLDOWN 30 // A place where tube pods stop, and people can get in or out. -// Mappers: use "Generate Instances from Directions" for this -// one. +// Mappers: use "Generate Instances from Directions" for this one. /obj/structure/transit_tube/station name = "station tube station" + desc = "The lynchpin of the transit system." icon = 'icons/obj/pipes_and_stuff/not_atmos/transit_tube_station.dmi' - icon_state = "closed" + icon_state = "closed_station0" + base_icon_state = "station0" exit_delay = 1 enter_delay = 2 var/pod_moving = FALSE @@ -18,6 +17,8 @@ var/hatch_state = TRANSIT_TUBE_CLOSED var/list/disallowed_mobs = list(/mob/living/silicon/ai) + /// Direction by which you can board the tube + var/boarding_dir /obj/structure/transit_tube/station/Initialize(mapload) . = ..() @@ -27,26 +28,32 @@ STOP_PROCESSING(SSobj, src) return ..() -// Stations which will send the tube in the opposite direction after their stop. -/obj/structure/transit_tube/station/reverse - reverse_launch = TRUE +/obj/structure/transit_tube/station/init_tube_dirs() + // Tube station directions are simply 90 to either side of + // the exit. + switch(dir) + if(NORTH) + tube_dirs = list(EAST, WEST) + if(SOUTH) + tube_dirs = list(EAST, WEST) + if(EAST) + tube_dirs = list(NORTH, SOUTH) + if(WEST) + tube_dirs = list(NORTH, SOUTH) + boarding_dir = reverse_direction(dir) /obj/structure/transit_tube/station/should_stop_pod(pod, from_dir) return TRUE -/obj/structure/transit_tube/station/Bumped(atom/movable/moving_atom) - if(!pod_moving && hatch_state == TRANSIT_TUBE_OPEN && isliving(moving_atom) && !is_type_in_list(moving_atom, disallowed_mobs)) - var/failed = FALSE +/obj/structure/transit_tube/station/Bumped(mob/living/L) + if(!pod_moving && L.dir == boarding_dir && hatch_state == TRANSIT_TUBE_OPEN && isliving(L) && !is_type_in_list(L, disallowed_mobs)) for(var/obj/structure/transit_tube_pod/pod in loc) - if(pod.contents.len) - failed = TRUE - else if(!pod.moving && (pod.dir in directions())) - pod.move_into(moving_atom) + if(length(pod.contents)) + to_chat(L, "The pod is already occupied.") + return + if(!pod.moving && ((pod.dir in directions()) || (reverse_launch && (turn(pod.dir, 180) in directions())))) + pod.move_into(L) return - if(failed) - to_chat(moving_atom, "The pod is already occupied.") - - /obj/structure/transit_tube/station/attack_hand(mob/user) if(pod_moving) @@ -66,9 +73,7 @@ "You start emptying [pod]'s contents onto the floor.", "You hear a loud noise! As if somebody is throwing stuff on the floor!") if(!do_after(user, 20, target = pod)) return - add_fingerprint(user) for(var/atom/movable/AM in pod) - AM.add_fingerprint(user) pod.eject(AM) if(isliving(AM)) var/mob/living/L = AM @@ -82,7 +87,7 @@ if(ismob(G.affecting) && G.state >= GRAB_AGGRESSIVE) var/mob/living/GM = G.affecting for(var/obj/structure/transit_tube_pod/pod in loc) - pod.visible_message("[user] starts putting [GM] into the [pod]!") + pod.visible_message("[user] starts putting [GM] into [pod]!") if(do_after(user, 30, target = GM) && GM && G && G.affecting == GM) GM.add_fingerprint(user) GM.Weaken(10 SECONDS) @@ -92,31 +97,36 @@ /obj/structure/transit_tube/station/proc/open_hatch() if(hatch_state == TRANSIT_TUBE_CLOSED) - icon_state = "opening" + icon_state = "opening_[base_icon_state]" hatch_state = TRANSIT_TUBE_OPENING - addtimer(CALLBACK(src, PROC_REF(open_hatch_callback)), OPEN_DURATION) - -/obj/structure/transit_tube/station/proc/open_hatch_callback() - if(hatch_state == TRANSIT_TUBE_OPENING) - icon_state = "open" - hatch_state = TRANSIT_TUBE_OPEN - - + addtimer(CALLBACK(src, PROC_REF(finish_animation)), OPEN_DURATION) /obj/structure/transit_tube/station/proc/close_hatch() if(hatch_state == TRANSIT_TUBE_OPEN) - icon_state = "closing" + icon_state = "closing_[base_icon_state]" hatch_state = TRANSIT_TUBE_CLOSING - addtimer(CALLBACK(src, PROC_REF(close_hatch_calllback)), CLOSE_DURATION) + addtimer(CALLBACK(src, PROC_REF(finish_animation)), CLOSE_DURATION) -/obj/structure/transit_tube/station/proc/close_hatch_calllback() - if(hatch_state == TRANSIT_TUBE_CLOSING) - icon_state = "closed" - hatch_state = TRANSIT_TUBE_CLOSED +/obj/structure/transit_tube/station/proc/finish_animation() + switch(hatch_state) + if(TRANSIT_TUBE_OPENING) + icon_state = "open_[base_icon_state]" + hatch_state = TRANSIT_TUBE_OPEN + for(var/obj/structure/transit_tube_pod/pod in loc) + for(var/thing in pod) + if(ismob(thing)) + var/mob/mob_content = thing + if(mob_content.client && mob_content.stat < UNCONSCIOUS) + continue // Let the mobs with clients decide what they want to do themselves. + var/atom/movable/movable_content = thing + movable_content.forceMove(loc) //Everything else is moved out of. + if(TRANSIT_TUBE_CLOSING) + icon_state = "closed_[base_icon_state]" + hatch_state = TRANSIT_TUBE_CLOSED /obj/structure/transit_tube/station/proc/launch_pod() for(var/obj/structure/transit_tube_pod/pod in loc) - if(!pod.moving && (pod.dir in directions())) + if(!pod.moving && ((pod.dir in directions()) || (reverse_launch && (turn(pod.dir, 180) in directions())))) addtimer(CALLBACK(src, PROC_REF(launch_pod_callback), pod), 5) return @@ -135,7 +145,7 @@ if(!nexttube) pod.dir = turn(pod.dir, 180) - if(hatch_state == TRANSIT_TUBE_CLOSED && pod) + if(hatch_state == TRANSIT_TUBE_CLOSED && pod && pod.loc == loc) pod.follow_tube() pod_moving = FALSE @@ -146,6 +156,7 @@ /obj/structure/transit_tube/station/pod_stopped(obj/structure/transit_tube_pod/pod, from_dir) pod_moving = TRUE + pod.stop_following() addtimer(CALLBACK(src, PROC_REF(pod_stopped_callback), pod), 5) /obj/structure/transit_tube/station/proc/pod_stopped_callback(obj/structure/transit_tube_pod/pod) @@ -156,10 +167,99 @@ pod_moving = FALSE pod.mix_air() -// Tube station directions are simply 90 to either side of -// the exit. -/obj/structure/transit_tube/station/init_dirs() - tube_dirs = list(turn(dir, 90), turn(dir, -90)) +/obj/structure/transit_tube/station/flipped + icon_state = "closed_station1" + base_icon_state = "station1" + +/obj/structure/transit_tube/station/flipped/init_tube_dirs() + ..() + boarding_dir = dir + +// Stations which will send the tube in the opposite direction after their stop. +/obj/structure/transit_tube/station/reverse + icon_state = "closed_terminus0" + base_icon_state = "terminus0" + reverse_launch = TRUE + +/obj/structure/transit_tube/station/reverse/init_tube_dirs() + tube_dirs = list(turn(dir, -90)) + boarding_dir = reverse_direction(dir) + +/obj/structure/transit_tube/station/reverse/flipped + icon_state = "closed_terminus1" + base_icon_state = "terminus1" + +/obj/structure/transit_tube/station/reverse/flipped/init_tube_dirs() + ..() + boarding_dir = dir + +//special dispenser station, it creates a pod for you to enter when you bump into it. + +/obj/structure/transit_tube/station/dispenser + name = "station tube pod dispenser" + icon_state = "open_dispenser0" + desc = "The lynchpin of a GOOD transit system." + enter_delay = 1 + base_icon_state = "dispenser0" + hatch_state = TRANSIT_TUBE_OPEN + +/obj/structure/transit_tube/station/dispenser/examine(mob/user) + . = ..() + . += "This station will create a pod for you to ride, no need to wait for one." + . += "Any pods arriving at this station will be reclaimed." + +/obj/structure/transit_tube/station/dispenser/close_hatch() + . = ..() + return + +/obj/structure/transit_tube/station/dispenser/launch_pod() + for(var/obj/structure/transit_tube_pod/pod in loc) + if(!pod.moving) + pod_moving = TRUE + pod.follow_tube() + pod_moving = FALSE + return TRUE + return FALSE + +/obj/structure/transit_tube/station/dispenser/Bumped(mob/living/L) + if(!(istype(L) && L.dir == boarding_dir) || L.anchored) + return + if(isliving(L) && !is_type_in_list(L, disallowed_mobs)) + var/obj/structure/transit_tube_pod/dispensed/pod = new(loc) + L.visible_message("[pod] forms around [L].", "[pod] materializes around you.") + playsound(src, 'sound/weapons/emitter2.ogg', 50, TRUE) + pod.dir = turn(dir, -90) + pod.move_into(L) + launch_pod() + +/obj/structure/transit_tube/station/dispenser/pod_stopped(obj/structure/transit_tube_pod/pod) + playsound(src, 'sound/machines/ding.ogg', 50, TRUE) + qdel(pod) + +/obj/structure/transit_tube/station/dispenser/flipped + icon_state = "open_dispenser1" + base_icon_state = "dispenser1" + +/obj/structure/transit_tube/station/dispenser/flipped/init_tube_dirs() + ..() + boarding_dir = dir +/obj/structure/transit_tube/station/dispenser/reverse + reverse_launch = TRUE + icon_state = "open_terminusdispenser0" + base_icon_state = "terminusdispenser0" + +/obj/structure/transit_tube/station/dispenser/reverse/init_tube_dirs() + tube_dirs = list(turn(dir, 90)) + boarding_dir = reverse_direction(dir) + +/obj/structure/transit_tube/station/dispenser/reverse/flipped + icon_state = "open_terminusdispenser1" + base_icon_state = "terminusdispenser1" + +/obj/structure/transit_tube/station/dispenser/reverse/flipped/init_tube_dirs() + ..() + boarding_dir = dir + #undef CLOSE_DURATION #undef OPEN_DURATION diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm index 476ce469492..584c8136eeb 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube.dm @@ -4,38 +4,50 @@ // Mappers: you can use "Generate Instances from Icon-states" // to get the different pieces. /obj/structure/transit_tube + name = "transit tube" + desc = "A pneumatic tube that brings you from here to there." icon = 'icons/obj/pipes_and_stuff/not_atmos/transit_tube.dmi' - icon_state = "E-W" - density = 1 + icon_state = "straight" + density = TRUE layer = 3.1 - anchored = 1.0 + anchored = TRUE var/list/tube_dirs = null var/exit_delay = 1 var/enter_delay = 0 - // alldirs in global.dm is the same list of directions, but since - // the specific order matters to get a usable icon_state, it is - // copied here so that, in the unlikely case that alldirs is changed, - // this continues to work. - var/global/list/tube_dir_list = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) +/obj/structure/transit_tube/Initialize(mapload, new_direction) + . = ..() + if(new_direction) + setDir(new_direction) + // set up our appearance after the initialize in case someone's setting our direction afterwards + // (especially for things like admin spawning) + addtimer(CALLBACK(src, PROC_REF(setup_appearance)), 1) +/obj/structure/transit_tube/proc/setup_appearance() + init_tube_dirs() + update_appearance() + +/obj/structure/transit_tube/Destroy() + for(var/obj/structure/transit_tube_pod/P in loc) + P.empty_pod() + return ..() /obj/structure/transit_tube/CanPass(atom/movable/mover, turf/target) if(istype(mover) && mover.checkpass(PASSGLASS)) - return 1 + return TRUE return !density // When destroyed by explosions, properly handle contents. /obj/structure/transit_tube/ex_act(severity) switch(severity) - if(1.0) + if(EXPLODE_DEVASTATE) for(var/atom/movable/AM in contents) AM.loc = loc AM.ex_act(severity++) qdel(src) return - if(2.0) + if(EXPLODE_HEAVY) if(prob(50)) for(var/atom/movable/AM in contents) AM.loc = loc @@ -43,20 +55,12 @@ qdel(src) return - if(3.0) + if(EXPLODE_LIGHT) return - -/obj/structure/transit_tube/New(loc) - ..(loc) - - if(tube_dirs == null) - init_dirs() - - // Called to check if a pod should stop upon entering this tube. /obj/structure/transit_tube/proc/should_stop_pod(pod, from_dir) - return 0 + return FALSE // Called when a pod stops in this tube section. /obj/structure/transit_tube/proc/pod_stopped(pod, from_dir) @@ -69,27 +73,21 @@ /obj/structure/transit_tube/proc/directions() return tube_dirs - - /obj/structure/transit_tube/proc/has_entrance(from_dir) from_dir = turn(from_dir, 180) for(var/direction in directions()) if(direction == from_dir) - return 1 - - return 0 - + return TRUE + return FALSE /obj/structure/transit_tube/proc/has_exit(in_dir) for(var/direction in directions()) if(direction == in_dir) - return 1 - - return 0 - + return TRUE + return FALSE // Searches for an exit direction within 45 degrees of the // specified dir. Returns that direction, or 0 if none match. @@ -110,7 +108,6 @@ return near_dir - // Return how many BYOND ticks to wait before entering/exiting // the tube section. Default action is to return the value of // a var, which wouldn't need a proc, but it makes it possible @@ -122,194 +119,157 @@ /obj/structure/transit_tube/proc/enter_delay(pod, to_dir) return enter_delay +/obj/structure/transit_tube/proc/init_tube_dirs() + switch(dir) + if(NORTH, SOUTH) + tube_dirs = list(NORTH, SOUTH) + if(EAST, WEST) + tube_dirs = list(EAST, WEST) -// Parse the icon_state into a list of directions. -// This means that mappers can use Dream Maker's built in -// "Generate Instances from Icon-states" option to get all -// variations. Additionally, as a separate proc, sub-types -// can handle it more intelligently. -/obj/structure/transit_tube/proc/init_dirs() - if(icon_state == "auto") - // Additional delay, for map loading. - spawn(1) - init_dirs_automatic() - - else - tube_dirs = parse_dirs(icon_state) - - if(copytext(icon_state, 1, 3) == "D-" || findtextEx(icon_state, "Pass")) - density = 0 - - - - -// Initialize dirs by searching for tubes that do/might connect -// on nearby turfs. Create corner pieces if nessecary. -// Pick two directions, preferring tubes that already connect -// to loc, or other auto tubes if there aren't enough connections. -/obj/structure/transit_tube/proc/init_dirs_automatic() - var/list/connected = list() - var/list/connected_auto = list() - - for(var/direction in tube_dir_list) - var/location = get_step(loc, direction) - for(var/obj/structure/transit_tube/tube in location) - if(tube.directions() == null && tube.icon_state == "auto") - connected_auto += direction - break - - else if(turn(direction, 180) in tube.directions()) - connected += direction - break - - connected += connected_auto - - tube_dirs = select_automatic_dirs(connected) - - if(length(tube_dirs) == 2 && tube_dir_list.Find(tube_dirs[1]) > tube_dir_list.Find(tube_dirs[2])) - tube_dirs.Swap(1, 2) - - generate_automatic_corners(tube_dirs) - select_automatic_icon_state(tube_dirs) - - - -// Given a list of directions, look a pair that forms a 180 or -// 135 degree angle, and return a list containing the pair. -// If none exist, return list(connected[1], turn(connected[1], 180) -/obj/structure/transit_tube/proc/select_automatic_dirs(connected) - if(length(connected) < 1) - return list() - - for(var/i = 1, i <= length(connected), i++) - for(var/j = i + 1, j <= length(connected), j++) - var/d1 = connected[i] - var/d2 = connected[j] - - if(d1 == turn(d2, 135) || d1 == turn(d2, 180) || d1 == turn(d2, 225)) - return list(d1, d2) - - return list(connected[1], turn(connected[1], 180)) - - - -/obj/structure/transit_tube/proc/select_automatic_icon_state(directions) - if(length(directions) == 2) - icon_state = "[dir2text_short(directions[1])]-[dir2text_short(directions[2])]" - - - -// Look for diagonal directions, generate the decorative corners in each. -/obj/structure/transit_tube/proc/generate_automatic_corners(directions) - for(var/direction in directions) - if(direction == 5 || direction == 6 || direction == 9 || direction == 10) - if(direction & NORTH) - create_automatic_decorative_corner(get_step(loc, NORTH), direction ^ 3) - - else - create_automatic_decorative_corner(get_step(loc, SOUTH), direction ^ 3) - - if(direction & EAST) - create_automatic_decorative_corner(get_step(loc, EAST), direction ^ 12) - - else - create_automatic_decorative_corner(get_step(loc, WEST), direction ^ 12) - - - -// Generate a corner, if one doesn't exist for the direction on the turf. -/obj/structure/transit_tube/proc/create_automatic_decorative_corner(location, direction) - var/state = "D-[dir2text_short(direction)]" - - for(var/obj/structure/transit_tube/tube in location) - if(tube.icon_state == state) - return - - var/obj/structure/transit_tube/tube = new(location) - tube.icon_state = state - tube.init_dirs() - - - -// Uses a list() to cache return values. Since they should -// never be edited directly, all tubes with a certain -// icon_state can just reference the same list. In theory, -// reduces memory usage, and improves CPU cache usage. -// In reality, I don't know if that is quite how BYOND works, -// but it is probably safer to assume the existence of, and -// rely on, a sufficiently smart compiler/optimizer. -/obj/structure/transit_tube/proc/parse_dirs(text) - var/global/list/direction_table = list() - - if(text in direction_table) - return direction_table[text] - - var/list/split_text = splittext(text, "-") - - // If the first token is D, the icon_state represents - // a purely decorative tube, and doesn't actually - // connect to anything. - if(split_text[1] == "D") - direction_table[text] = list() - return null - - var/list/directions = list() - - for(var/text_part in split_text) - var/direction = text2dir_extended(text_part) - - if(direction > 0) - directions += direction - - direction_table[text] = directions - return directions - - - -// A copy of text2dir, extended to accept one and two letter -// directions, and to clearly return 0 otherwise. -/obj/structure/transit_tube/proc/text2dir_extended(direction) - switch(uppertext(direction)) - if("NORTH", "N") - return 1 - if("SOUTH", "S") - return 2 - if("EAST", "E") - return 4 - if("WEST", "W") - return 8 - if("NORTHEAST", "NE") - return 5 - if("NORTHWEST", "NW") - return 9 - if("SOUTHEAST", "SE") - return 6 - if("SOUTHWEST", "SW") - return 10 - else - return 0 - - - -// A copy of dir2text, which returns the short one or two letter -// directions used in tube icon states. -/obj/structure/transit_tube/proc/dir2text_short(direction) - switch(direction) - if(1) - return "N" - if(2) - return "S" - if(4) - return "E" - if(8) - return "W" - if(5) - return "NE" - if(6) - return "SE" - if(9) - return "NW" - if(10) - return "SW" +/obj/structure/transit_tube/update_overlays() + . = ..() + for(var/direction in directions()) + if(!IS_DIR_DIAGONAL(direction)) + . += create_tube_overlay(direction) + continue + if(!(direction & NORTH)) + continue + + . += create_tube_overlay(direction ^ (NORTH|SOUTH), NORTH) + if(direction & EAST) + . += create_tube_overlay(direction ^ (EAST|WEST), EAST) else + . += create_tube_overlay(direction ^ (EAST|WEST), WEST) + + +/obj/structure/transit_tube/proc/create_tube_overlay(direction, shift_dir) + // We use image() because a mutable appearance will have its dir mirror the parent which sort of fucks up what we're doing here + var/image/tube_overlay = image(icon, dir = direction) + if(shift_dir) + tube_overlay.icon_state = "decorative_diag" + switch(shift_dir) + if(NORTH) + tube_overlay.pixel_y = 32 + if(SOUTH) + tube_overlay.pixel_y = -32 + if(EAST) + tube_overlay.pixel_x = 32 + if(WEST) + tube_overlay.pixel_x = -32 + else + tube_overlay.icon_state = "decorative" + + tube_overlay.overlays += emissive_blocker(icon, tube_overlay.icon_state, src) + return tube_overlay + +//Some of these are mostly for mapping use +/obj/structure/transit_tube/horizontal + dir = WEST + +/obj/structure/transit_tube/diagonal + icon_state = "diagonal" + +/obj/structure/transit_tube/diagonal/init_tube_dirs() + switch(dir) + if(NORTH) + tube_dirs = list(NORTHEAST, SOUTHWEST) + if(SOUTH) + tube_dirs = list(NORTHEAST, SOUTHWEST) + if(EAST) + tube_dirs = list(NORTHWEST, SOUTHEAST) + if(WEST) + tube_dirs = list(NORTHWEST, SOUTHEAST) + +//mostly for mapping use +/obj/structure/transit_tube/diagonal/topleft + dir = WEST + +/obj/structure/transit_tube/diagonal/crossing + density = FALSE + icon_state = "diagonal_crossing" + +//mostly for mapping use +/obj/structure/transit_tube/diagonal/crossing/topleft + dir = WEST + + +/obj/structure/transit_tube/curved + icon_state = "curved0" + +/obj/structure/transit_tube/curved/init_tube_dirs() + switch(dir) + if(NORTH) + tube_dirs = list(NORTH, SOUTHWEST) + if(SOUTH) + tube_dirs = list(SOUTH, NORTHEAST) + if(EAST) + tube_dirs = list(EAST, NORTHWEST) + if(WEST) + tube_dirs = list(SOUTHEAST, WEST) + +/obj/structure/transit_tube/curved/flipped + icon_state = "curved1" + +/obj/structure/transit_tube/curved/flipped/init_tube_dirs() + switch(dir) + if(NORTH) + tube_dirs = list(NORTH, SOUTHEAST) + if(SOUTH) + tube_dirs = list(SOUTH, NORTHWEST) + if(EAST) + tube_dirs = list(EAST, SOUTHWEST) + if(WEST) + tube_dirs = list(NORTHEAST, WEST) + + +/obj/structure/transit_tube/junction + icon_state = "junction0" + +/obj/structure/transit_tube/junction/init_tube_dirs() + switch(dir) + if(NORTH) + tube_dirs = list(NORTH, SOUTHEAST, SOUTHWEST)//ending with the prefered direction + if(SOUTH) + tube_dirs = list(SOUTH, NORTHWEST, NORTHEAST) + if(EAST) + tube_dirs = list(EAST, SOUTHWEST, NORTHWEST) + if(WEST) + tube_dirs = list(WEST, NORTHEAST, SOUTHEAST) + +/obj/structure/transit_tube/junction/flipped + icon_state = "junction1" + +/obj/structure/transit_tube/junction/flipped/init_tube_dirs() + switch(dir) + if(NORTH) + tube_dirs = list(NORTH, SOUTHWEST, SOUTHEAST)//ending with the prefered direction + if(SOUTH) + tube_dirs = list(SOUTH, NORTHEAST, NORTHWEST) + if(EAST) + tube_dirs = list(EAST, NORTHWEST, SOUTHWEST) + if(WEST) + tube_dirs = list(WEST, SOUTHEAST, NORTHEAST) + + +/obj/structure/transit_tube/crossing + icon_state = "crossing" + density = FALSE + +//mostly for mapping use +/obj/structure/transit_tube/crossing/horizontal + dir = WEST + +// cosmetic "cap" for tubes. Note that tubes can't enter this. +/obj/structure/transit_tube/cap + icon_state = "cap" + +/obj/structure/transit_tube/cap/init_tube_dirs() + tube_dirs = list(turn(dir, 180)) // back the way we came + +/obj/structure/transit_tube/cap/has_entrance(from_dir) + return FALSE + +/obj/structure/transit_tube/cap/create_tube_overlay() + // cap sprites already have overlays return + diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 9ab4942cefd..bd368eb24f9 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -1,3 +1,6 @@ +#define MOVE_ANIMATION_STAGE_ONE 1 +#define MOVE_ANIMATION_STAGE_TWO 2 + /obj/structure/transit_tube_pod icon = 'icons/obj/pipes_and_stuff/not_atmos/transit_tube_pod.dmi' icon_state = "pod" @@ -6,21 +9,47 @@ density = TRUE var/moving = FALSE var/datum/gas_mixture/air_contents = new() - -/obj/structure/transit_tube_pod/New(loc) - ..(loc) + /// The tube we're currently traveling through + var/obj/structure/transit_tube/current_tube = null + /// The direction of our next transit from pipe to pipe. Stored between process calls here. + var/next_dir + /// The location of our next target tube. Stored same as above + var/next_loc + /// How long to wait when entering a new tube + var/enter_delay = 0 + /// How long to wait when exiting a new tube + var/exit_delay + /// The next time we'll be moving + COOLDOWN_DECLARE(move_cooldown) + /// The move animation mode for the next processing tick + var/current_move_anim_mode = MOVE_ANIMATION_STAGE_ONE + /// Icon state in use while we're occupied + var/occupied_icon_state = "pod_occupied" + +/obj/structure/transit_tube_pod/Initialize(mapload) + . = ..() + // Give auto tubes time to align before trying to start moving + spawn(5) air_contents.oxygen = MOLES_O2STANDARD * 2 air_contents.nitrogen = MOLES_N2STANDARD air_contents.temperature = T20C - // Give auto tubes time to align before trying to start moving - spawn(5) - follow_tube() + for(var/obj/structure/transit_tube/tube in loc) + setDir(pick(tube.directions())) + break + follow_tube() + +/obj/structure/transit_tube_pod/update_icon_state() + . = ..() + icon_state = length(contents) ? occupied_icon_state : initial(icon_state) + +/obj/structure/transit_tube_pod/proc/stop_following() + STOP_PROCESSING(SStransit_tube, src) /obj/structure/transit_tube_pod/Destroy() - for(var/atom/movable/AM in contents) - AM.forceMove(get_turf(src)) + empty_pod() + stop_following() return ..() /obj/structure/transit_tube_pod/Process_Spacemove() @@ -28,69 +57,115 @@ return TRUE else return ..() -/obj/structure/transit_tube_pod/proc/follow_tube(var/reverse_launch) +/obj/structure/transit_tube_pod/proc/empty_pod(atom/location) + if(!location) + location = get_turf(src) + for(var/atom/movable/M in contents) + M.forceMove(location) + update_appearance() + +/obj/structure/transit_tube_pod/crowbar_act(mob/living/user, obj/item/I) + . = ..() if(moving) return - moving = TRUE + if(length(contents)) + I.play_tool_sound(src) + user.visible_message("[user] pries [src] open.") + empty_pod() + +/obj/structure/transit_tube_pod/process() + ..() + + if(!COOLDOWN_FINISHED(src, move_cooldown)) + return + + var/move_result = move_animation(current_move_anim_mode) + if(isnull(move_result)) + if(isnull(current_tube) || (!(dir in current_tube.directions()) && !(reverse_direction(dir) in current_tube.directions()))) + outside_tube() + return PROCESS_KILL - spawn() - var/obj/structure/transit_tube/current_tube = null - var/next_dir - var/next_loc - var/last_delay = 0 - var/exit_delay + current_move_anim_mode = move_result - if(reverse_launch) - dir = turn(dir, 180) // Back it up +/obj/structure/transit_tube_pod/proc/outside_tube() + var/list/savedcontents = contents.Copy() + var/saveddir = dir + var/turf/destination = get_edge_target_turf(src, saveddir) + visible_message("[src] ejects its insides out!") + for(var/i in savedcontents) + var/atom/movable/AM = i + AM.throw_at(destination, rand(1, 3), 5) - for(var/obj/structure/transit_tube/tube in loc) - if(tube.has_exit(dir)) + +/obj/structure/transit_tube_pod/proc/move_animation(stage = MOVE_ANIMATION_STAGE_ONE) + if(stage == MOVE_ANIMATION_STAGE_ONE) + next_dir = current_tube.get_exit(dir) + + if(!next_dir) + moving = FALSE + density = TRUE + return + exit_delay = current_tube.exit_delay + next_loc = get_step(src, next_dir) + current_tube = null + for(var/obj/structure/transit_tube/tube in next_loc) + if(tube.has_entrance(next_dir)) current_tube = tube break - while(current_tube) - next_dir = current_tube.get_exit(dir) + if(isnull(current_tube)) + setDir(next_dir) + Move(get_step(loc, dir), dir) // Allow collisions when leaving the tubes. + moving = FALSE + density = TRUE + return - if(!next_dir) - break + enter_delay = current_tube.enter_delay(src, next_dir) + if(enter_delay > 0) + COOLDOWN_START(src, move_cooldown, enter_delay) + return MOVE_ANIMATION_STAGE_TWO - exit_delay = current_tube.exit_delay(src, dir) - last_delay += exit_delay + stage = MOVE_ANIMATION_STAGE_TWO - sleep(exit_delay) + if(stage == MOVE_ANIMATION_STAGE_TWO) + setDir(next_dir) + forceMove(next_loc) // When moving from one tube to another, skip collision and such. + density = current_tube.density - next_loc = get_step(loc, next_dir) + if(current_tube?.should_stop_pod(src, next_dir)) + current_tube.pod_stopped(src, dir) + else + COOLDOWN_START(src, move_cooldown, exit_delay) + return MOVE_ANIMATION_STAGE_ONE - current_tube = null - for(var/obj/structure/transit_tube/tube in next_loc) - if(tube.has_entrance(next_dir)) - current_tube = tube - break + density = TRUE + moving = FALSE - if(current_tube == null) - setDir(next_dir) - Move(get_step(loc, dir), dir) // Allow collisions when leaving the tubes. - break + return MOVE_ANIMATION_STAGE_ONE - last_delay = current_tube.enter_delay(src, next_dir) - sleep(last_delay) - setDir(next_dir) - forceMove(next_loc) // When moving from one tube to another, skip collision and such. - density = current_tube.density - if(current_tube && current_tube.should_stop_pod(src, next_dir)) - current_tube.pod_stopped(src, dir) - break +/obj/structure/transit_tube_pod/proc/follow_tube(reverse_launch) + if(moving) + return - density = TRUE + moving = TRUE - moving = FALSE + for(var/obj/structure/transit_tube/tube in loc) + if(tube.has_exit(dir)) + current_tube = tube + break + if(current_tube) + START_PROCESSING(SStransit_tube, src) + // move_animation(MOVE_ANIMATION_STAGE_ONE) + else + moving = FALSE // Should I return a copy here? If the caller edits or qdel()s the returned // datum, there might be problems if I don't... /obj/structure/transit_tube_pod/return_air() + RETURN_TYPE(/datum/gas_mixture) var/datum/gas_mixture/GM = new() GM.copy_from(air_contents) return GM @@ -152,9 +227,9 @@ if(!moving) for(var/obj/structure/transit_tube/station/station in loc) - if(dir in station.directions()) + if((dir in station.directions()) || (turn(dir, 180) in station.directions())) if(!station.pod_moving) - if(direction == station.dir) + if(direction == turn(station.boarding_dir, 180)) if(station.hatch_state == TRANSIT_TUBE_OPEN) eject(mob, direction) @@ -173,8 +248,8 @@ return /obj/structure/transit_tube_pod/proc/move_into(atom/movable/A) - icon_state = "pod_occupied" A.forceMove(src) + update_appearance() /obj/structure/transit_tube_pod/proc/eject_mindless(direction) for(var/atom/movable/A in contents) @@ -187,9 +262,24 @@ /obj/structure/transit_tube_pod/proc/eject(atom/movable/A, direction) - icon_state = "pod" A.forceMove(loc) + update_appearance() A.Move(get_step(loc, direction), direction) if(ismob(A)) var/mob/M = A M.reset_perspective(null) + + +/obj/structure/transit_tube_pod/dispensed + name = "temporary transit tube pod" + desc = "Gets you from here to there, and no further." + icon_state = "temppod" + occupied_icon_state = "temppod_occupied" + + +/obj/structure/transit_tube_pod/dispensed/outside_tube() + if(!QDELETED(src)) + qdel(src) + +#undef MOVE_ANIMATION_STAGE_TWO +#undef MOVE_ANIMATION_STAGE_ONE diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index d0769b4cd0a..27febace5d5 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "toilet00" density = 0 - anchored = 1 + anchored = TRUE var/open = 0 //if the lid is up var/cistern = 0 //if the cistern bit is open var/w_items = 0 //the combined w_class of all the items in the cistern @@ -52,7 +52,8 @@ open = !open update_icon() -/obj/structure/toilet/update_icon() + +/obj/structure/toilet/update_icon_state() icon_state = "toilet[open][cistern]" if(!anchored) pixel_x = 0 @@ -129,7 +130,7 @@ user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.") cistern = !cistern update_icon() - return + /obj/structure/toilet/wrench_act(mob/user, obj/item/I) . = TRUE @@ -156,19 +157,19 @@ if(!loc || !anchored) return user.visible_message("[user] disconnects [src]!", "You disconnect [src]!") - anchored = 0 + anchored = FALSE if("Connect") user.visible_message("[user] starts connecting [src].", "You begin connecting [src]...") if(I.use_tool(src, user, 40, volume = I.tool_volume)) if(!loc || anchored) return user.visible_message("[user] connects [src]!", "You connect [src]!") - anchored = 1 + anchored = TRUE if("Rotate") var/list/dir_choices = list("North" = NORTH, "East" = EAST, "South" = SOUTH, "West" = WEST) var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in dir_choices dir = dir_choices[selected] - update_icon() //is this necessary? probably not + update_icon() /obj/structure/toilet/proc/stash_goods(obj/item/I, mob/user) if(!I) @@ -217,7 +218,7 @@ desc = "Поговаривают, что 7 веков назад у каждого арабского шейха был такой унитаз." icon_state = "gold_toilet00" -/obj/structure/toilet/golden_toilet/update_icon() +/obj/structure/toilet/golden_toilet/update_icon_state() . = ..() icon_state = "gold_toilet[open][cistern]" @@ -226,7 +227,7 @@ desc = "Престижное седалище для престижной персоны. Судя по форме, был идеально подготовлен под седальное место Капитана." icon_state = "captain_toilet00" -/obj/structure/toilet/captain_toilet/update_icon() +/obj/structure/toilet/captain_toilet/update_icon_state() . = ..() icon_state = "captain_toilet[open][cistern]" @@ -236,7 +237,7 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "urinal" density = 0 - anchored = 1 + anchored = TRUE /obj/structure/urinal/attackby(obj/item/I, mob/user, params) @@ -268,7 +269,7 @@ if(!loc || !anchored) return user.visible_message("[user] disconnects [src]!", "You disconnect [src]!") - anchored = 0 + anchored = FALSE pixel_x = 0 pixel_y = 0 else @@ -277,25 +278,32 @@ if(!loc || anchored) return user.visible_message("[user] connects [src]!", "You connect [src]!") - anchored = 1 + anchored = TRUE pixel_x = 0 pixel_y = 32 + +#define SHOWER_FREEZING "freezing" +#define SHOWER_NORMAL "normal" +#define SHOWER_BOILING "boiling" + /obj/machinery/shower name = "shower" desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division." icon = 'icons/obj/watercloset.dmi' icon_state = "shower" - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE use_power = NO_POWER_USE - var/on = 0 - var/obj/effect/mist/mymist = null - var/ismist = 0 //needs a var so we can make it linger~ - var/watertemp = "normal" //freezing, normal, or boiling + ///Is the shower on or off? + var/on = FALSE + ///What temperature the shower reagents are set to. + var/current_temperature = SHOWER_NORMAL var/mobpresent = 0 //true if there is a mob on the shower's loc, this is to ease process() + ///What sound will be played on loop when the shower is on and pouring water. var/datum/looping_sound/showering/soundloop + /obj/machinery/shower/New(turf/T, newdir = SOUTH, building = FALSE) ..() soundloop = new(list(src), FALSE) @@ -310,9 +318,12 @@ pixel_y = -5 layer = FLY_LAYER + /obj/machinery/shower/Destroy() - QDEL_NULL(mymist) QDEL_NULL(soundloop) + var/obj/effect/mist/mist = locate() in loc + if(!QDELETED(mist)) + QDEL_IN(mist, 25 SECONDS) return ..() //add heat controls? when emagged, you can freeze to death in it? @@ -321,164 +332,176 @@ name = "mist" icon = 'icons/obj/watercloset.dmi' icon_state = "mist" - layer = MOB_LAYER + 1 - anchored = 1 + layer = FLY_LAYER + anchored = TRUE mouse_opacity = MOUSE_OPACITY_TRANSPARENT -/obj/machinery/shower/attack_hand(mob/M as mob) - add_fingerprint(M) + +/obj/machinery/shower/attack_hand(mob/user) on = !on update_icon() + handle_mist() + add_fingerprint(user) if(on) + START_PROCESSING(SSmachines, src) + process() soundloop.start() - if(M.loc == loc) - wash(M) - check_heat(M) - M.water_act(100, convertHeat(), src) - for(var/atom/movable/G in src.loc) - G.clean_blood() - G.water_act(100, convertHeat(), src) else soundloop.stop() + var/turf/simulated/source_turf = loc + if(istype(source_turf) && !source_turf.density) + source_turf.MakeSlippery(TURF_WET_WATER, 5 SECONDS) + /obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob, params) if(I.type == /obj/item/analyzer) add_fingerprint(user) - to_chat(user, "The water temperature seems to be [watertemp].") - if(on) - add_fingerprint(user) - I.water_act(100, convertHeat(), src) + to_chat(user, span_notice("The water temperature seems to be [current_temperature].")) return ..() + /obj/machinery/shower/wrench_act(mob/user, obj/item/I) - . = TRUE - if(!I.tool_use_check(user, 0)) - return - to_chat(user, "You begin to adjust the temperature valve with the [I].") - if(I.use_tool(src, user, 50, volume = I.tool_volume)) - switch(watertemp) - if("normal") - watertemp = "freezing" - if("freezing") - watertemp = "boiling" - if("boiling") - watertemp = "normal" - user.visible_message("[user] adjusts the shower with the [I].", "You adjust [src] to [watertemp].") - update_icon() //letsa update whenever we change the temperature, since the mist might need to change + to_chat(user, span_notice("You begin to adjust the temperature valve with [I].")) + if(I.use_tool(src, user, 5 SECONDS)) + switch(current_temperature) + if(SHOWER_NORMAL) + current_temperature = SHOWER_FREEZING + if(SHOWER_FREEZING) + current_temperature = SHOWER_BOILING + if(SHOWER_BOILING) + current_temperature = SHOWER_NORMAL + user.visible_message( + span_notice("[user] adjusts the shower with [I]."), + span_notice("You adjust [src] to [current_temperature] temperature."), + ) + add_hiddenprint(user) + handle_mist() + return TRUE + /obj/machinery/shower/welder_act(mob/user, obj/item/I) . = TRUE if(on) - to_chat(user, "Turn [src] off before you attempt to cut it loose.") + to_chat(user, span_warning("Turn [src] off before you attempt to cut it loose.")) return if(!I.tool_use_check(user, 0)) return - visible_message("[user] begins slicing [src] free...", "You begin slicing [src] free...", "You hear welding.") - if(I.use_tool(src, user, 40, volume = I.tool_volume)) - if(mymist) - qdel(mymist) - user.visible_message("[user] cuts [src] loose!", "You cut [src] loose!") - var/obj/item/mounted/shower/S = new /obj/item/mounted/shower(get_turf(user)) - transfer_fingerprints_to(S) + user.visible_message( + span_notice("[user] begins slicing [src] free..."), + span_notice("You begin slicing [src] free..."), + span_italics("You hear welding."), + ) + if(I.use_tool(src, user, 4 SECONDS, volume = I.tool_volume)) + user.visible_message( + span_notice("[user] cuts [src] loose!"), + span_notice("You cut [src] loose!>"), + ) + var/obj/item/mounted/shower/shower = new /obj/item/mounted/shower(get_turf(user)) + transfer_prints_to(shower, TRUE) qdel(src) -/obj/machinery/shower/update_icon() //this makes the shower mist up or clear mist (depending on water temperature) - overlays.Cut() //once it's been on for a while, in addition to handling the water overlay. - if(on) - overlays += image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir) - var/mist_time = 50 //5 seconds at normal temperature to build up mist - if(watertemp == "freezing") - mist_time = 70 //7 seconds on freezing temperature to disperse existing mist - if(watertemp == "boiling") - mist_time = 20 //2 seconds on boiling temperature to build up mist - addtimer(CALLBACK(src, PROC_REF(update_mist)), mist_time) - else - addtimer(CALLBACK(src, PROC_REF(update_mist)), 250) //25 seconds for mist to disperse after being turned off -/obj/machinery/shower/proc/update_mist() +/obj/machinery/shower/update_overlays() + . = ..() if(on) - if(watertemp == "freezing") - if(mymist) - qdel(mymist) - ismist = 0 - return - if(mymist) - return - ismist = 1 - mymist = new /obj/effect/mist(loc) - else - if(mymist) - qdel(mymist) - ismist = 0 + . += image(icon, icon_state = "water", layer = ABOVE_MOB_LAYER, dir = src.dir) -/obj/machinery/shower/Crossed(atom/movable/O, oldloc) - ..() - wash(O) - if(ismob(O)) - mobpresent += 1 - check_heat(O) - -/obj/machinery/shower/Uncrossed(atom/movable/O) - if(ismob(O)) - mobpresent -= 1 + +/obj/machinery/shower/proc/handle_mist() + // If there is no mist, and the shower was turned on (on a non-freezing temp): make mist in 5 seconds + // If there was already mist, and the shower was turned off (or made cold): remove the existing mist in 25 sec + var/obj/effect/mist/mist = locate() in loc + if(!mist && on && current_temperature != SHOWER_FREEZING) + addtimer(CALLBACK(src, PROC_REF(make_mist)), 5 SECONDS) + + if(mist && (!on || current_temperature == SHOWER_FREEZING)) + addtimer(CALLBACK(src, PROC_REF(clear_mist)), 25 SECONDS) + + +/obj/machinery/shower/proc/make_mist() + var/obj/effect/mist/mist = locate() in loc + if(!mist && on && current_temperature != SHOWER_FREEZING) + new /obj/effect/mist(loc) + + +/obj/machinery/shower/proc/clear_mist() + var/obj/effect/mist/mist = locate() in loc + if(mist && (!on || current_temperature == SHOWER_FREEZING)) + qdel(mist) + + +/obj/machinery/shower/Crossed(atom/movable/AM, oldloc) ..() + if(on) + wash(AM) + /obj/machinery/shower/proc/convertHeat() - switch(watertemp) - if("boiling") + switch(current_temperature) + if(SHOWER_BOILING) return 340.15 - if("normal") + if(SHOWER_NORMAL) return 310.15 - if("freezing") + if(SHOWER_FREEZING) return 230.15 + //Yes, showers are super powerful as far as washing goes. -/obj/machinery/shower/proc/wash(atom/movable/O as obj|mob) - if(!on) return +/obj/machinery/shower/proc/wash(atom/target) + if(!on) + return + + if(isitem(target)) + var/obj/item/item = target + item.extinguish() - if(istype(O, /obj/item)) - var/obj/item/I = O - I.extinguish() + target.water_act(100, convertHeat(), src) - O.water_act(100, convertHeat(), src) + if(isliving(target)) + var/mob/living/l_target = target + l_target.ExtinguishMob() + l_target.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily + to_chat(l_target, span_warning("You've been drenched in water!")) - if(isliving(O)) - var/mob/living/L = O - L.ExtinguishMob() - L.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily - to_chat(L, "You've been drenched in water!") - L.clean_blood() + target.clean_blood() - if(isturf(loc)) - var/turf/tile = loc - loc.clean_blood() - for(var/obj/effect/E in tile) - if(E.is_cleanable()) - qdel(E) /obj/machinery/shower/process() - if(!on || !mobpresent) - return - for(var/mob/living/carbon/C in loc) - if(prob(33)) - wash(C) //re-applies water and re-cleans mob while they remain under the shower, 33% chance per process to avoid message spam/quick death - check_heat(C) + if(on) + if(isturf(loc)) + var/turf/tile = loc + tile.water_act(100, convertHeat(), src) + tile.clean_blood() + for(var/obj/effect/effect in tile) + if(effect.is_cleanable()) + qdel(effect) + for(var/thing in loc) + wash(thing) + else + on = FALSE + soundloop.stop() + handle_mist() + update_icon(UPDATE_OVERLAYS) -/obj/machinery/shower/proc/check_heat(mob/M as mob) - if(!on || watertemp == "normal") + +/obj/machinery/shower/proc/check_heat(mob/M) + if(current_temperature == SHOWER_NORMAL) return if(iscarbon(M)) var/mob/living/carbon/C = M - if(watertemp == "freezing") + if(current_temperature == SHOWER_FREEZING) //C.bodytemperature = max(80, C.bodytemperature - 80) to_chat(C, "The water is freezing!") - return - if(watertemp == "boiling") + + else if(current_temperature == SHOWER_BOILING) //C.bodytemperature = min(500, C.bodytemperature + 35) C.adjustFireLoss(5) to_chat(C, "The water is searing!") - return + +#undef SHOWER_FREEZING +#undef SHOWER_NORMAL +#undef SHOWER_BOILING /obj/item/bikehorn/rubberducky @@ -502,7 +525,7 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "sink" desc = "A sink used for washing one's hands and face." - anchored = 1 + anchored = TRUE var/busy = 0 //Something's being washed at the moment var/can_move = 1 //if the sink can be disconnected and moved var/can_rotate = 1 //if the sink can be rotated to face alternate directions @@ -621,10 +644,9 @@ var/list/dir_choices = list("North" = NORTH, "East" = EAST, "South" = SOUTH, "West" = WEST) var/selected = input(user, "Select a direction for the connector.", "Connector Direction") in dir_choices dir = dir_choices[selected] - update_icon() //is this necessary? probably not + update_icon(UPDATE_ICON_STATE) -/obj/structure/sink/update_icon() - ..() +/obj/structure/sink/update_icon_state() layer = OBJ_LAYER if(!anchored) pixel_x = 0 @@ -741,9 +763,9 @@ if(do_after(user, 30, target = user)) user.visible_message("[user] finishes building a new [result_name]!", "You finish building a new [result_name]!") var/obj/structure/S = new result(T) - S.anchored = 0 + S.anchored = FALSE S.dir = user.dir - S.update_icon() + S.update_icon(UPDATE_ICON_STATE) user.temporarily_remove_item_from_inventory(src, force = TRUE) qdel(src) if(prob(50)) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 4a66c4326cd..0c4249e085c 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -50,7 +50,7 @@ setDir(ini_dir) move_update_air(T) -/obj/structure/windoor_assembly/update_icon() +/obj/structure/windoor_assembly/update_icon_state() var/temp_state = state if(temp_state == "03") temp_state = "02" @@ -162,7 +162,7 @@ add_fingerprint(user) //Update to reflect changes(if applicable) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/windoor_assembly/crowbar_act(mob/user, obj/item/I) //Crowbar to complete the assembly, Step 7 complete. if(state != "03") @@ -228,7 +228,7 @@ state = "02" electronics.forceMove(loc) electronics = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/windoor_assembly/wirecutter_act(mob/user, obj/item/I) if(state != "02") @@ -243,7 +243,7 @@ new/obj/item/stack/cable_coil(get_turf(user), 1) state = "01" name = "[(src.secure) ? "secure" : ""] anchored windoor assembly" - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/windoor_assembly/wrench_act(mob/user, obj/item/I) if(state != "01") @@ -274,7 +274,7 @@ to_chat(user, "You loosen bolts on [src].") anchored = FALSE name = "[(src.secure) ? "secure" : ""] windoor assembly" - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/windoor_assembly/welder_act(mob/user, obj/item/I) if(state != "01") @@ -312,7 +312,7 @@ setDir(target_dir) ini_dir = dir - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE /obj/structure/windoor_assembly/AltClick(mob/user) @@ -339,5 +339,5 @@ facing = "l" to_chat(usr, "The windoor will now slide to the left.") - update_icon() - return + update_icon(UPDATE_ICON_STATE) + diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 1d8ea14736a..316cfc4afc9 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -44,7 +44,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", var/glass_type = /obj/item/stack/sheet/glass var/glass_amount = 1 var/cancolor = FALSE - var/image/crack_overlay + var/mutable_appearance/crack_overlay var/list/debris = list() var/real_explosion_block //ignore this, just use explosion_block var/breaksound = "shatter" @@ -325,6 +325,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", if(I.use_tool(src, user, 40, volume = I.tool_volume)) obj_integrity = max_integrity WELDER_REPAIR_SUCCESS_MESSAGE + update_icon(UPDATE_OVERLAYS) /obj/structure/window/proc/check_state(checked_state) if(state == checked_state) @@ -478,23 +479,25 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", //This proc is used to update the icons of nearby windows. /obj/structure/window/proc/update_nearby_icons() - update_icon() + update_icon(UPDATE_OVERLAYS) if(smooth) queue_smooth_neighbors(src) -/obj/structure/window/update_icon() - if(!QDELETED(src)) - if(!fulltile) - return - var/ratio = obj_integrity / max_integrity - ratio = CEILING(ratio*4, 1) * 25 - if(smooth) - queue_smooth(src) - overlays -= crack_overlay - if(ratio > 75) - return - crack_overlay = image('icons/obj/structures.dmi',"damage[ratio]",-(layer+0.1)) - overlays += crack_overlay +/obj/structure/window/update_overlays() + . = ..() + if(QDELETED(src) || !fulltile) + return + + var/ratio = obj_integrity / max_integrity + ratio = CEILING(ratio * 4, 1) * 25 + if(smooth) + queue_smooth(src) + if(ratio > 75) + return + + crack_overlay = mutable_appearance('icons/obj/structures.dmi', "damage[ratio]", -(layer + 0.01), appearance_flags = RESET_COLOR) + . += crack_overlay + /obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() @@ -596,35 +599,38 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", use_power(5) active = !active - update_icon() + update_icon(UPDATE_ICON_STATE) - for(var/obj/structure/window/reinforced/polarized/W in range(src,range)) - if(W.id == src.id || !W.id) - spawn(0) - W.toggle() - return - for(var/obj/machinery/door/airlock/G in range(src,range)) - if(G.id == src.id) - spawn(0) - if(G.glass) - G.airlock_material = null - G.glass = FALSE - G.update_icon() - if(G.density) - G.opacity = 1 - else - G.airlock_material = "glass" - G.glass = TRUE - G.update_icon() - G.opacity = 0 - return + for(var/obj/structure/window/reinforced/polarized/window in range(src,range)) + if(window.id == id || !window.id) + INVOKE_ASYNC(window, TYPE_PROC_REF(/obj/structure/window/reinforced/polarized, toggle)) -/obj/machinery/button/windowtint/power_change() - ..() + for(var/obj/machinery/door/airlock/airlock in range(src,range)) + if(airlock.id == id) + INVOKE_ASYNC(src, PROC_REF(async_update), airlock) + + +/obj/machinery/button/windowtint/proc/async_update(obj/machinery/door/airlock/airlock) + if(airlock.glass) + airlock.airlock_material = null + airlock.glass = FALSE + airlock.update_icon() + if(airlock.density) + airlock.set_opacity(TRUE) + else + airlock.airlock_material = "glass" + airlock.glass = TRUE + airlock.update_icon() + airlock.set_opacity(FALSE) + + +/obj/machinery/button/windowtint/power_change(forced = FALSE) + if(!..()) + return if(active && !powered(power_channel)) toggle_tint() -/obj/machinery/button/windowtint/update_icon() +/obj/machinery/button/windowtint/update_icon_state() icon_state = "light[active]" /obj/structure/window/plasmabasic @@ -900,7 +906,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", /obj/structure/window/reinforced/clockwork/ratvar_act() obj_integrity = max_integrity - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/window/reinforced/clockwork/narsie_act() take_damage(rand(25, 75), BRUTE) diff --git a/code/game/objects/structures/wryn.dm b/code/game/objects/structures/wryn.dm index 5afad33eac2..c10d16b84ae 100644 --- a/code/game/objects/structures/wryn.dm +++ b/code/game/objects/structures/wryn.dm @@ -68,41 +68,29 @@ plane = FLOOR_PLANE icon_state = "wax_floor" max_integrity = 10 + var/current_dir var/static/list/floorImageCache -/obj/structure/wryn/floor/proc/updateOverlays() - - overlays.Cut() - - if(!floorImageCache || !floorImageCache.len) - floorImageCache = list() - floorImageCache.len = 4 - floorImageCache["north"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_n", layer=2.11, pixel_y = -32) - floorImageCache["south"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_s", layer=2.11, pixel_y = 32) - floorImageCache["east"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_e", layer=2.11, pixel_x = -32) - floorImageCache["west"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_w", layer=2.11, pixel_x = 32) - - var/turf/N = get_step(src, NORTH) - var/turf/S = get_step(src, SOUTH) - var/turf/E = get_step(src, EAST) - var/turf/W = get_step(src, WEST) - if(!locate(/obj/structure/wryn) in N.contents) - if(istype(N, /turf/simulated/floor)) - overlays += floorImageCache["south"] - if(!locate(/obj/structure/wryn) in S.contents) - if(istype(S, /turf/simulated/floor)) - overlays += floorImageCache["north"] - if(!locate(/obj/structure/wryn) in E.contents) - if(istype(E, /turf/simulated/floor)) - overlays += floorImageCache["west"] - if(!locate(/obj/structure/wryn) in W.contents) - if(istype(W, /turf/simulated/floor)) - overlays += floorImageCache["east"] + +/obj/structure/wryn/floor/update_overlays() + . = ..() + for(var/check_dir in GLOB.cardinal) + var/turf/check = get_step(src, check_dir) + if(issimulatedturf(check) && !(locate(/obj/structure/wryn) in check)) + . += floorImageCache["[GetOppositeDir(check_dir)]"] /obj/structure/wryn/floor/proc/fullUpdateWeedOverlays() - for(var/obj/structure/wryn/floor/W in range(1,src)) - W.updateOverlays() + if(!length(floorImageCache)) + floorImageCache = list(4) + floorImageCache["[NORTH]"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_n", layer=2.11, pixel_y = -32) + floorImageCache["[SOUTH]"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_s", layer=2.11, pixel_y = 32) + floorImageCache["[EAST]"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_e", layer=2.11, pixel_x = -32) + floorImageCache["[WEST]"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_w", layer=2.11, pixel_x = 32) + + for(var/obj/structure/wryn/floor/floor in range(1,src)) + floor.update_icon(UPDATE_OVERLAYS) + /obj/structure/wryn/floor/New(pos) ..() diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index cd9196f7eed..dbcb598f793 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -11,7 +11,7 @@ name = "engine" icon = 'icons/turf/shuttle/misc.dmi' density = 1 - anchored = 1.0 + anchored = TRUE resistance_flags = INDESTRUCTIBLE // То что у нас двигатели ломаются от пары пуль - бред var/list/obj/structure/fillers = list() // Для коллизии более больших двигателей diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 6d15f484e9e..d7859121be4 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -3,6 +3,7 @@ name = "station" var/wet = 0 var/image/wet_overlay = null + var/mutable_appearance/melting_olay var/thermite = 0 oxygen = MOLES_O2STANDARD @@ -83,7 +84,7 @@ switch(src.wet) if(TURF_WET_WATER) if(!(M.slip("the wet floor", WATER_WEAKEN_TIME, tilesSlipped = 0, walkSafely = 1))) - M.inertia_dir = 0 + M.inertia_dir = NONE return if(TURF_WET_LUBE) //lube @@ -92,7 +93,7 @@ if(TURF_WET_ICE) // Ice if(M.slip("the icy floor", 4 SECONDS, tilesSlipped = 0, walkSafely = 0)) - M.inertia_dir = 0 + M.inertia_dir = NONE if(prob(5)) var/obj/item/organ/external/affected = M.get_organ(BODY_ZONE_HEAD) if(affected) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index b5c04cb2031..9f5842de11d 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -125,12 +125,11 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama /turf/simulated/floor/blob_act(obj/structure/blob/B) return -/turf/simulated/floor/update_icon() +/turf/simulated/floor/update_overlays() + . = ..() update_visuals() - overlays -= current_overlay if(current_overlay) - overlays.Add(current_overlay) - return 1 + . += current_overlay /turf/simulated/floor/proc/break_tile_to_plating() var/turf/simulated/floor/plating/T = make_plating(FALSE) diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index d44b6ecb80c..b3dcf69dee9 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -114,7 +114,7 @@ . = ..() update_icon() -/turf/simulated/floor/grass/update_icon() +/turf/simulated/floor/grass/update_icon_state() icon_state = "grass[pick("1","2","3","4")]" /turf/simulated/floor/grass/attackby(obj/item/C, mob/user, params) @@ -159,13 +159,13 @@ . = ..() update_icon() + /turf/simulated/floor/carpet/broken_states() return list("damaged") -/turf/simulated/floor/carpet/update_icon() - if(!..()) - return - dir = 0 //Prevents wrong smoothing + +/turf/simulated/floor/carpet/update_icon_state() + dir = NONE //Prevents wrong smoothing if(!broken && !burnt) if(smooth) queue_smooth(src) diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm index 58e2a708994..53418593002 100644 --- a/code/game/turfs/simulated/floor/indestructible.dm +++ b/code/game/turfs/simulated/floor/indestructible.dm @@ -274,7 +274,7 @@ icon = 'icons/turf/floors/seadrop-o.dmi' layer = MOB_LAYER + 0.1 smooth = SMOOTH_TRUE - anchored = 1 + anchored = TRUE canSmoothWith = list( /turf/simulated/floor/indestructible/beach/water/drop, /turf/simulated/floor/indestructible/beach/water/drop/dense, /turf/simulated/floor/indestructible/beach/water, /turf/simulated/floor/indestructible/beach/water/dense, diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index dfd63d5ea4c..40851bd4313 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -23,49 +23,52 @@ . = ..() update_icon() + /turf/simulated/floor/light/broken_states() return list("light_broken") -/turf/simulated/floor/light/update_icon() - ..() - if(on) - switch(state) - if(LIGHTFLOOR_ON) - icon_state = "light_on" - set_light(5, null,LIGHT_COLOR_LIGHTBLUE) - if(LIGHTFLOOR_WHITE) - icon_state = "light_on-w" - set_light(5, null,LIGHT_COLOR_WHITE) - if(LIGHTFLOOR_RED) - icon_state = "light_on-r" - set_light(5, null,LIGHT_COLOR_RED) - if(LIGHTFLOOR_GREEN) - icon_state = "light_on-g" - set_light(5, null,LIGHT_COLOR_PURE_GREEN) - if(LIGHTFLOOR_YELLOW) - icon_state = "light_on-y" - set_light(5, null,"#FFFF00") - if(LIGHTFLOOR_BLUE) - icon_state = "light_on-b" - set_light(5, null,LIGHT_COLOR_DARKBLUE) - if(LIGHTFLOOR_PURPLE) - icon_state = "light_on-p" - set_light(5, null,LIGHT_COLOR_PURPLE) - if(LIGHTFLOOR_GENERICCYCLE) - icon_state = "light_on-cycle_all" - set_light(5, null,LIGHT_COLOR_WHITE) - if(LIGHTFLOOR_CYCLEA) - icon_state = "light_on-dancefloor_A" - set_light(5,null,LIGHT_COLOR_RED) - if(LIGHTFLOOR_CYCLEB) - icon_state = "light_on-dancefloor_B" - set_light(5, null,LIGHT_COLOR_DARKBLUE) - else - icon_state = "light_off" - set_light(0) - else + +/turf/simulated/floor/light/update_icon_state() + if(!on) set_light(0) icon_state = "light_off" + return + + switch(state) + if(LIGHTFLOOR_ON) + icon_state = "light_on" + set_light(5, null,LIGHT_COLOR_LIGHTBLUE) + if(LIGHTFLOOR_WHITE) + icon_state = "light_on-w" + set_light(5, null,LIGHT_COLOR_WHITE) + if(LIGHTFLOOR_RED) + icon_state = "light_on-r" + set_light(5, null,LIGHT_COLOR_RED) + if(LIGHTFLOOR_GREEN) + icon_state = "light_on-g" + set_light(5, null,LIGHT_COLOR_PURE_GREEN) + if(LIGHTFLOOR_YELLOW) + icon_state = "light_on-y" + set_light(5, null,"#FFFF00") + if(LIGHTFLOOR_BLUE) + icon_state = "light_on-b" + set_light(5, null,LIGHT_COLOR_DARKBLUE) + if(LIGHTFLOOR_PURPLE) + icon_state = "light_on-p" + set_light(5, null,LIGHT_COLOR_PURPLE) + if(LIGHTFLOOR_GENERICCYCLE) + icon_state = "light_on-cycle_all" + set_light(5, null,LIGHT_COLOR_WHITE) + if(LIGHTFLOOR_CYCLEA) + icon_state = "light_on-dancefloor_A" + set_light(5,null,LIGHT_COLOR_RED) + if(LIGHTFLOOR_CYCLEB) + icon_state = "light_on-dancefloor_B" + set_light(5, null,LIGHT_COLOR_DARKBLUE) + else + icon_state = "light_off" + set_light(0) + /turf/simulated/floor/light/BeforeChange() set_light(0) diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm index dd3b20f0b17..4440de90854 100644 --- a/code/game/turfs/simulated/floor/mineral.dm +++ b/code/game/turfs/simulated/floor/mineral.dm @@ -17,12 +17,11 @@ /turf/simulated/floor/mineral/broken_states() return list("[initial(icon_state)]_dam") -/turf/simulated/floor/mineral/update_icon() - if(!..()) - return 0 - if(!broken && !burnt) - if(!(icon_state in icons)) - icon_state = initial(icon_state) + +/turf/simulated/floor/mineral/update_icon_state() + if(!broken && !burnt && !(icon_state in icons)) + icon_state = initial(icon_state) + //PLASMA /turf/simulated/floor/mineral/plasma diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index 99f943c53e4..366d9d2a12b 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -8,9 +8,7 @@ /turf/simulated/floor/plasteel/burnt_states() return list("floorscorched1", "floorscorched2") -/turf/simulated/floor/plasteel/update_icon() - if(!..()) - return 0 +/turf/simulated/floor/plasteel/update_icon_state() if(!broken && !burnt) icon_state = icon_regular_floor dir = floor_regular_dir diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 8896f455dda..a37d7d83633 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -32,9 +32,7 @@ . = ..() burn_tile() -/turf/simulated/floor/plating/update_icon() - if(!..()) - return +/turf/simulated/floor/plating/update_icon_state() if(!broken && !burnt) icon_state = icon_plating //Because asteroids are 'platings' too. @@ -191,7 +189,7 @@ /turf/simulated/floor/engine/attackby(obj/item/C, mob/user, params) if(!C || !user) return - if(istype(C, /obj/item/wrench)) + if(C.tool_behaviour == TOOL_WRENCH) to_chat(user, span_notice("You begin removing rods...")) playsound(src, C.usesound, 80, 1) if(do_after(user, 30 * C.toolspeed * gettoolspeedmod(user), target = src)) @@ -227,12 +225,20 @@ /turf/simulated/floor/engine/cult name = "engraved floor" icon_state = "cult" + var/holy = FALSE + /turf/simulated/floor/engine/cult/Initialize(mapload) . = ..() - if(SSticker.mode)//only do this if the round is going..otherwise..fucking asteroid.. - if(!icon_state == "holy") - icon_state = SSticker.cultdat.cult_floor_icon_state + update_icon(UPDATE_ICON_STATE) + + +/turf/simulated/floor/engine/cult/update_icon_state() + if(SSticker?.cultdat && !holy) + icon_state = SSticker.cultdat.cult_floor_icon_state + return + icon_state = initial(icon_state) + /turf/simulated/floor/engine/cult/narsie_act() return @@ -246,6 +252,7 @@ /turf/simulated/floor/engine/cult/holy icon_state = "holy" + holy = TRUE //air filled floors; used in atmos pressure chambers @@ -361,7 +368,7 @@ icon_state = "ironfoam" metal = MFOAM_IRON -/turf/simulated/floor/plating/metalfoam/update_icon() +/turf/simulated/floor/plating/metalfoam/update_icon_state() switch(metal) if(MFOAM_ALUMINUM) icon_state = "metalfoam" @@ -418,14 +425,6 @@ /turf/simulated/floor/plating/metalfoam/proc/smash() ChangeTurf(baseturf) -/turf/simulated/floor/plating/abductor - name = "alien floor" - icon_state = "alienpod1" - -/turf/simulated/floor/plating/abductor/Initialize(mapload) - . = ..() - icon_state = "alienpod[rand(1,9)]" - /turf/simulated/floor/plating/ice name = "ice sheet" desc = "A sheet of solid ice. Looks slippery." diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index 4c23b51b895..53f66b42a32 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -104,14 +104,16 @@ else update_icon() -/turf/simulated/mineral/update_icon() + +/turf/simulated/mineral/update_overlays() + . = ..() if(hardness != initial(hardness)) var/amount = hardness var/mutable_appearance/cracks = mutable_appearance('icons/turf/mining.dmi',"rock_cracks_[amount]",ON_EDGED_TURF_LAYER) var/matrix/M = new M.Translate(4,4) cracks.transform = M - add_overlay(cracks) + . += cracks /turf/simulated/mineral/attack_animal(mob/living/simple_animal/user) diff --git a/code/game/turfs/simulated/shuttle.dm b/code/game/turfs/simulated/shuttle.dm index 10c78c46610..5d010f0649c 100644 --- a/code/game/turfs/simulated/shuttle.dm +++ b/code/game/turfs/simulated/shuttle.dm @@ -61,7 +61,7 @@ /turf/simulated/wall/shuttle/try_decon(obj/item/I, mob/user, params) return -/turf/simulated/wall/shuttle/thermitemelt(mob/user as mob, speed) +/turf/simulated/wall/shuttle/thermitemelt(mob/user, time) return /turf/simulated/wall/shuttle/nodiagonal diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 07d46679d71..752889d54f8 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -25,6 +25,8 @@ thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall + var/melting = FALSE //TRUE if wall is currently being melted with thermite + var/can_dismantle_with_welder = TRUE var/hardness = 40 //lower numbers are harder. Used to determine the probability of a hulk smashing through. var/slicing_duration = 100 @@ -71,27 +73,25 @@ if(rotting) . += span_warning("There is fungus growing on [src].") -/turf/simulated/wall/update_icon() + +/turf/simulated/wall/update_overlays() + . = ..() if(!damage_overlays[1]) //list hasn't been populated generate_overlays() queue_smooth(src) if(!damage) - if(damage_overlay) - overlays -= damage_overlays[damage_overlay] - damage_overlay = 0 return - var/overlay = round(damage / damage_cap * damage_overlays.len) + 1 - if(overlay > damage_overlays.len) - overlay = damage_overlays.len + var/overlay = round(damage / damage_cap * length(damage_overlays)) + 1 + if(overlay > length(damage_overlays)) + overlay = length(damage_overlays) if(damage_overlay && overlay == damage_overlay) //No need to update. return - if(damage_overlay) - overlays -= damage_overlays[damage_overlay] - overlays += damage_overlays[overlay] - damage_overlay = overlay + + . += damage_overlays[overlay] + /turf/simulated/wall/proc/generate_overlays() var/alpha_inc = 256 / damage_overlays.len @@ -245,35 +245,87 @@ /turf/simulated/wall/burn_down() if(istype(sheet_type, /obj/item/stack/sheet/mineral/diamond)) return - ChangeTurf(/turf/simulated/floor) + return ChangeTurf(/turf/simulated/floor) + -/turf/simulated/wall/proc/thermitemelt(mob/user as mob, speed) - var/wait = 100 - if(speed) - wait = speed +#define THERMITE_PER_SECOND 2.5 +#define DAMAGE_PER_SECOND 60 + +/** + * Melts down wall into its base turf. + * + * Arguments: + * * user - who used thermite, optional argument used to show message. + * * time - optional override; thermite reagent will not be used for melting, only passed time matters. + */ +/turf/simulated/wall/proc/thermitemelt(mob/user, time) + set waitfor = FALSE + + if(melting) + return if(istype(sheet_type, /obj/item/stack/sheet/mineral/diamond)) return - var/obj/effect/overlay/O = new/obj/effect/overlay( src ) - O.name = "Thermite" - O.desc = "Looks hot." - O.icon = 'icons/effects/fire.dmi' - O.icon_state = "2" - O.anchored = 1 - O.density = 1 - O.layer = 5 + var/obj/effect/overlay/visuals = new(src) + visuals.name = "Thermite" + visuals.desc = "Looks hot." + visuals.icon = 'icons/effects/fire.dmi' + visuals.icon_state = "2" + visuals.anchored = TRUE + visuals.density = TRUE + visuals.layer = FLY_LAYER - src.ChangeTurf(/turf/simulated/floor/plating) - - var/turf/simulated/floor/F = src - F.burn_tile() - F.icon_state = "plating" if(user) - to_chat(user, span_warning("The thermite starts melting through the wall.")) + to_chat(user, span_warning("The thermite starts melting through [src].")) + + if(time) + melting = TRUE + var/sound_timer = 10 + while(time > 0) + if(QDELETED(src)) + return + sound_timer++ + if(sound_timer >= 10) + sound_timer = 0 + playsound(src, 'sound/items/welder.ogg', 100, TRUE) + time = max(0, time - 0.1 SECONDS) + sleep(0.1 SECONDS) + if(QDELETED(src)) + return + var/turf/simulated/floor/our_floor = burn_down() + our_floor.burn_tile() + our_floor.cut_overlay(melting_olay) + if(visuals) + qdel(visuals) + return + + melting = TRUE + + while(reagents.get_reagent_amount("thermite") > 0) + if(QDELETED(src)) + return + reagents.remove_reagent("thermite", THERMITE_PER_SECOND) + if(damage_cap - damage <= DAMAGE_PER_SECOND) + var/turf/simulated/floor/our_floor = burn_down() + our_floor.burn_tile() + break + take_damage(DAMAGE_PER_SECOND) + playsound(src, 'sound/items/welder.ogg', 100, TRUE) + sleep(1 SECONDS) + + if(QDELETED(src)) + return + + if(iswallturf(src)) + melting = FALSE + + cut_overlay(melting_olay) + if(visuals) + qdel(visuals) + +#undef THERMITE_PER_SECOND +#undef DAMAGE_PER_SECOND - spawn(wait) - if(O) qdel(O) - return //Interactions @@ -353,7 +405,7 @@ /turf/simulated/wall/welder_act(mob/user, obj/item/I) . = TRUE - if(thermite && I.use_tool(src, user, volume = I.tool_volume)) + if(reagents?.get_reagent_amount("thermite") && I.use_tool(src, user, volume = I.tool_volume)) thermitemelt(user) return if(rotting) diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm index 19d8ef7d187..739e68a34fd 100644 --- a/code/game/turfs/simulated/walls_indestructible.dm +++ b/code/game/turfs/simulated/walls_indestructible.dm @@ -59,7 +59,7 @@ /turf/simulated/wall/indestructible/rcd_deconstruct_act() return RCD_NO_ACT -/turf/simulated/wall/indestructible/thermitemelt(mob/user as mob, speed) +/turf/simulated/wall/indestructible/thermitemelt(mob/user, time) return /turf/simulated/wall/indestructible/fakeglass diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 5caf1ae9d52..ee8318877f8 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -267,7 +267,7 @@ /turf/simulated/wall/mineral/titanium/nodecon/try_decon(obj/item/I, mob/user, params) return -/turf/simulated/wall/mineral/titanium/nodecon/thermitemelt(mob/user as mob, speed) +/turf/simulated/wall/mineral/titanium/nodecon/thermitemelt(mob/user, time) return /turf/simulated/wall/mineral/titanium/nodecon/burn_down() diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index 037bcda8ef2..b7afc177525 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -8,6 +8,7 @@ sheet_type = /obj/item/stack/sheet/runed_metal sheet_amount = 1 girder_type = /obj/structure/girder/cult + var/holy = FALSE /turf/simulated/wall/cult_fake name = "runed metal wall" @@ -20,12 +21,18 @@ sheet_amount = 1 girder_type = /obj/structure/girder/cult_fake + /turf/simulated/wall/cult/Initialize(mapload) . = ..() - if(SSticker.mode)//game hasn't started offically don't do shit.. - new /obj/effect/temp_visual/cult/turf(src) - if(!icon_state == "holy") - icon_state = SSticker.cultdat.cult_wall_icon_state + update_icon(UPDATE_ICON_STATE) + + +/turf/simulated/wall/cult/update_icon_state() + if(SSticker?.cultdat && !holy) + icon_state = SSticker.cultdat.cult_wall_icon_state + return + icon_state = initial(icon_state) + /turf/simulated/wall/cult_fake/Initialize(mapload) . = ..() @@ -42,6 +49,7 @@ icon_state = "holy" sheet_type = /obj/item/stack/sheet/metal girder_type = /obj/structure/girder + holy = TRUE /turf/simulated/wall/cult/artificer/break_wall() new /obj/effect/temp_visual/cult/turf(get_turf(src)) diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index 6739b559b77..2a4ddf66252 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -93,7 +93,7 @@ return ..() /turf/simulated/wall/r_wall/welder_act(mob/user, obj/item/I) - if(thermite && I.use_tool(src, user, volume = I.tool_volume)) + if(reagents?.get_reagent_amount("thermite") && I.use_tool(src, user, volume = I.tool_volume)) thermitemelt(user) return TRUE if(!(d_state in list(RWALL_COVER, RWALL_SUPPORT_RODS, RWALL_CUT_COVER))) @@ -232,9 +232,8 @@ if(prob(30)) dismantle_wall() -/turf/simulated/wall/r_wall/update_icon() - . = ..() +/turf/simulated/wall/r_wall/update_icon_state() if(d_state) icon_state = "r_wall-[d_state]" smooth = SMOOTH_FALSE @@ -243,6 +242,7 @@ smooth = SMOOTH_TRUE icon_state = "" + /turf/simulated/wall/r_wall/devastate_wall() new sheet_type(src, sheet_amount) new /obj/item/stack/sheet/metal(src, 2) diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index e558733e1af..816a23dce65 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -62,9 +62,9 @@ /turf/space/transit/Initialize(mapload) . = ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/turf/space/transit/update_icon() +/turf/space/transit/update_icon_state() var/p = 9 var/angle = 0 var/state = 1 diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 15e049bb4ae..03c09ca7fcc 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -8,6 +8,7 @@ var/slowdown = 0 //negative for faster, positive for slower var/transparent_floor = FALSE //used to check if pipes should be visible under the turf or not + /// Set if the turf should appear on a different layer while in-game and map editing, otherwise use normal layer. var/real_layer = TURF_LAYER layer = MAP_EDITOR_TURF_LAYER @@ -375,19 +376,24 @@ L.Add(T) return L -//Idem, but don't check for ID and goes through open doors -/turf/proc/AdjacentTurfs(list/closed) - var/list/L = new() - var/turf/simulated/T - for(var/dir in GLOB.alldirs2) //arbitrarily ordered list to favor non-diagonal moves in case of ties + +/// Returns the adjacent turfs. Can check for density or cardinal directions only instead of all 8, or just dense turfs entirely. dense_only takes precedence over open_only. +/turf/proc/AdjacentTurfs(open_only = FALSE, cardinal_only = FALSE, dense_only = FALSE) + var/list/L = list() + var/turf/T + var/list/directions = cardinal_only ? GLOB.cardinal : GLOB.alldirs + for(var/dir in directions) T = get_step(src, dir) - if(T in closed) //turf already proceeded by A* + if(!istype(T)) continue - if(istype(T) && !T.density) - if(!CanAtmosPass(T)) - L.Add(T) + if(dense_only && !T.density) + continue + if((open_only && T.density) && !dense_only) + continue + L.Add(T) return L + // check for all turfs, including space ones /turf/proc/AdjacentTurfsSpace(obj/item/card/id/ID = null, list/closed)//check access if one is passed var/list/L = new() @@ -456,7 +462,7 @@ for(var/obj/O in contents) //this is for deleting things like wires contained in the turf if(O.level != 1) continue - if(O.invisibility == INVISIBILITY_MAXIMUM) + if(O.invisibility == INVISIBILITY_MAXIMUM || O.invisibility == INVISIBILITY_ABSTRACT) O.singularity_act() ChangeTurf(baseturf) return 2 diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index b2466aafa1b..61f3037598d 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2313,7 +2313,7 @@ if(!P.ico) P.ico = new P.ico += "paper_stamp-[stampvalue]" - P.overlays += stampoverlay + LAZYADD(P.stamp_overlays, stampoverlay) P.stamps += "
"
P.update_icon()
P.faxmachineid = fax.UID()
@@ -2408,7 +2408,7 @@
if(!P.ico)
P.ico = new
P.ico += "paper_stamp-[stampvalue]"
- P.overlays += stampoverlay
+ LAZYADD(P.stamp_overlays, stampoverlay)
P.stamps += "
"
P.update_icon()
fax.receivefax(P)
@@ -2620,15 +2620,14 @@
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/stamp/centcom
- P.overlays += stampoverlay
P.stamps += "
"
else if(stamptype == "text")
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/stamp
- P.overlays += stampoverlay
P.stamps += "
[stampvalue]" + LAZYADD(P.stamp_overlays, stampoverlay) if(destination != "All Departments") if(!fax.receivefax(P)) @@ -3647,10 +3646,8 @@ hunter_mob.equipOutfit(O, FALSE) var/obj/item/pinpointer/advpinpointer/N = new /obj/item/pinpointer/advpinpointer(hunter_mob) hunter_mob.equip_to_slot_or_del(N, slot_in_backpack) - N.mode = 3 //MODE_ADV, not defined here N.setting = 2 //SETTING_OBJECT, not defined here - N.target = H - N.pinpoint_at(N.target) + N.pinpoint_at(H) N.modelocked = TRUE if(!locate(/obj/item/implant/dust, hunter_mob)) var/obj/item/implant/dust/D = new /obj/item/implant/dust(hunter_mob) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index c234228a186..f3db9508e82 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -661,7 +661,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) F.active = 1 F.state = 2 F.power = 250 - F.anchored = 1 + F.anchored = TRUE F.warming_up = 3 F.start_fields() F.update_icon() diff --git a/code/modules/admin/verbs/honksquad.dm b/code/modules/admin/verbs/honksquad.dm index 7ea997d11b1..bbb27a3be88 100644 --- a/code/modules/admin/verbs/honksquad.dm +++ b/code/modules/admin/verbs/honksquad.dm @@ -97,7 +97,7 @@ GLOBAL_VAR_INIT(sent_clownsequritysquad, 0) new_honksquad.mind.assigned_role = SPECIAL_ROLE_HONKSQUAD new_honksquad.mind.special_role = SPECIAL_ROLE_HONKSQUAD new_honksquad.mind.offstation_role = TRUE - new_honksquad.add_language("Clownish") + new_honksquad.add_language(LANGUAGE_CLOWN) new_honksquad.change_voice() SSticker.mode.traitors |= new_honksquad.mind//Adds them to current traitor list. Which is really the extra antagonist list. new_honksquad.equip_honksquad(honk_leader_selected, rankName) diff --git a/code/modules/antagonists/changeling/changeling_datum.dm b/code/modules/antagonists/changeling/changeling_datum.dm index 8deac41e17f..abcaeda0bf5 100644 --- a/code/modules/antagonists/changeling/changeling_datum.dm +++ b/code/modules/antagonists/changeling/changeling_datum.dm @@ -343,7 +343,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E for(var/datum/language/language in new_languages) if(is_type_in_UID_list(language, absorbed_languages)) continue - owner.current.add_language("[language.name]") + owner.current.add_language(language.name) absorbed_languages += language.UID() @@ -352,8 +352,8 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E */ /datum/antagonist/changeling/proc/update_languages() for(var/lang_UID in absorbed_languages) - var/datum/language/lang = locateUID(lang_UID) - owner.current.add_language("[lang.name]") + var/datum/language/language = locateUID(lang_UID) + owner.current.add_language(language.name) /** @@ -378,10 +378,10 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E ignored_languages += human_user.dna.species.secondary_langs for(var/lang_UID in absorbed_languages) - var/datum/language/lang = locateUID(lang_UID) - if(lang.name in ignored_languages) + var/datum/language/language = locateUID(lang_UID) + if(language.name in ignored_languages) continue - user.remove_language("[lang.name]") + user.remove_language(language.name) /** diff --git a/code/modules/antagonists/changeling/powers/hivemind.dm b/code/modules/antagonists/changeling/powers/hivemind.dm index 4193596a411..113716a6494 100644 --- a/code/modules/antagonists/changeling/powers/hivemind.dm +++ b/code/modules/antagonists/changeling/powers/hivemind.dm @@ -35,11 +35,11 @@ GLOBAL_LIST_EMPTY(hivemind_bank) linglink.cling = cling linglink.Grant(user)*/ - if(!((GLOB.all_languages["Changeling"] in user.languages)||(GLOB.all_languages["Infiltrated changeling"] in user.languages))) + if(!((GLOB.all_languages[LANGUAGE_HIVE_CHANGELING] in user.languages)||(GLOB.all_languages[LANGUAGE_HIVE_EVENTLING] in user.languages))) if(!cling.evented) - user.add_language("Changeling") + user.add_language(LANGUAGE_HIVE_CHANGELING) else - user.add_language("Infiltrated changeling") + user.add_language(LANGUAGE_HIVE_EVENTLING) /datum/action/changeling/hivemind_pick/Remove(mob/user) @@ -52,10 +52,10 @@ GLOBAL_LIST_EMPTY(hivemind_bank) linglink.Remove(user) QDEL_NULL(linglink)*/ - if(GLOB.all_languages["Changeling"] in user.languages) - user.remove_language("Changeling") - if(GLOB.all_languages["Infiltrated changeling"] in user.languages) - user.remove_language("Infiltrated changeling") + if(GLOB.all_languages[LANGUAGE_HIVE_CHANGELING] in user.languages) + user.remove_language(LANGUAGE_HIVE_CHANGELING) + if(GLOB.all_languages[LANGUAGE_HIVE_EVENTLING] in user.languages) + user.remove_language(LANGUAGE_HIVE_EVENTLING) ..() @@ -67,10 +67,10 @@ GLOBAL_LIST_EMPTY(hivemind_bank) QDEL_NULL(linglink)*/ - if(owner && (GLOB.all_languages["Changeling"] in owner.languages)) - owner.remove_language("Changeling") - if(owner && (GLOB.all_languages["Infiltrated changeling"] in owner.languages)) - owner.remove_language("Infiltrated changeling") + if(owner && (GLOB.all_languages[LANGUAGE_HIVE_CHANGELING] in owner.languages)) + owner.remove_language(LANGUAGE_HIVE_CHANGELING) + if(owner && (GLOB.all_languages[LANGUAGE_HIVE_EVENTLING] in owner.languages)) + owner.remove_language(LANGUAGE_HIVE_EVENTLING) return ..() diff --git a/code/modules/antagonists/changeling/powers/linglink.dm b/code/modules/antagonists/changeling/powers/linglink.dm index 867600317bd..c33cfd6ffa9 100644 --- a/code/modules/antagonists/changeling/powers/linglink.dm +++ b/code/modules/antagonists/changeling/powers/linglink.dm @@ -76,11 +76,11 @@ to_chat(target, "You can now communicate in the changeling hivemind, say \":g message\" to communicate!") for(var/mob/ling in GLOB.mob_list) - if(GLOB.all_languages["Changeling"] in ling.languages) + if(GLOB.all_languages[LANGUAGE_HIVE_CHANGELING] in ling.languages) to_chat(ling, span_changeling("We can sense a foreign presence in the hivemind...")) cling?.is_linking = FALSE - target.add_language("Changeling") + target.add_language(LANGUAGE_HIVE_CHANGELING) target.say(":g AAAAARRRRGGGGGHHHHH!!") target.reagents.add_reagent("salbutamol", 40) // So they don't choke to death while you interrogate them @@ -95,7 +95,7 @@ if(QDELETED(target)) return - target.remove_language("Changeling") + target.remove_language(LANGUAGE_HIVE_CHANGELING) to_chat(target, span_userdanger("The link cannot be sustained any longer, your connection to the hivemind has faded!")) if(!QDELETED(user)) diff --git a/code/modules/antagonists/space_dragon/carp_rift.dm b/code/modules/antagonists/space_dragon/carp_rift.dm index ebaa9518fe9..a7e2f9cf6b4 100644 --- a/code/modules/antagonists/space_dragon/carp_rift.dm +++ b/code/modules/antagonists/space_dragon/carp_rift.dm @@ -92,6 +92,13 @@ return ..() +/obj/structure/carp_rift/update_icon_state() + if(charge_state == CHARGE_COMPLETED) + icon_state = "carp_rift_charged" + return + icon_state = (carp_stored > 0) ? "carp_rift_carpspawn" : "carp_rift" + + /obj/structure/carp_rift/process(seconds_per_tick) // If we're fully charged, just start mass spawning carp. if(charge_state == CHARGE_COMPLETED) @@ -132,7 +139,7 @@ // Can we increase the carp spawn pool size? if(last_carp_inc >= carp_interval) carp_stored += 3 - icon_state = "carp_rift_carpspawn" + update_icon(UPDATE_ICON_STATE) if(light_color != LIGHT_COLOR_PURPLE) light_color = LIGHT_COLOR_PURPLE update_light() @@ -146,7 +153,7 @@ GLOB.command_announcement.Announce("Пространственный объект достиг максимального энергетического заряда в зоне [initial(A.name)]. Пожалуйста, ожидайте.", "Отдел Изучения Дикой Природы") max_integrity = INFINITY obj_integrity = INFINITY - icon_state = "carp_rift_charged" + update_icon(UPDATE_ICON_STATE) light_color = LIGHT_COLOR_YELLOW update_light() armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) @@ -210,7 +217,7 @@ to_chat(newcarp, span_boldwarning("Вы прибыли, чтобы помочь космическому дракону защищать разломы. Следуйте поставленной миссии и защитите разлом любой ценой!")) carp_stored-- if(carp_stored <= 0 && charge_state < CHARGE_COMPLETED) - icon_state = "carp_rift" + update_icon(UPDATE_ICON_STATE) light_color = LIGHT_COLOR_BLUE update_light() return TRUE diff --git a/code/modules/antagonists/space_ninja/creeping_widow/creeping_widow_martial_art.dm b/code/modules/antagonists/space_ninja/creeping_widow/creeping_widow_martial_art.dm index 9094a9f4c16..00d7a1f3c83 100644 --- a/code/modules/antagonists/space_ninja/creeping_widow/creeping_widow_martial_art.dm +++ b/code/modules/antagonists/space_ninja/creeping_widow/creeping_widow_martial_art.dm @@ -15,7 +15,12 @@ icon = 'icons/obj/ninjaobjects.dmi' icon_state = "injector" attack_verb = list("poked", "prodded") - var/used = 0 + var/used = FALSE + + +/obj/item/creeping_widow_injector/update_icon_state() + icon_state = "injector[used ? "-used" : ""]" + /obj/item/creeping_widow_injector/attack_self(mob/living/carbon/human/user as mob) if(!used) @@ -26,13 +31,13 @@ var/datum/martial_art/ninja_martial_art/N = new/datum/martial_art/ninja_martial_art(null) N.teach(user) - used = 1 - icon_state = "injector-used" + used = TRUE + update_icon(UPDATE_ICON_STATE) desc = "A strange autoinjector made of a black metal.
It appears to be used up and empty." - return 0 - else - to_chat(user, "The [src] has been used already!") - return 1 + return FALSE + + to_chat(user, "The [src] has been used already!") + return TRUE // Ninja martial art datum diff --git a/code/modules/antagonists/space_ninja/machinery/ninja_mindscan_machine.dm b/code/modules/antagonists/space_ninja/machinery/ninja_mindscan_machine.dm index 3d56278ff8e..8f99583a893 100644 --- a/code/modules/antagonists/space_ninja/machinery/ninja_mindscan_machine.dm +++ b/code/modules/antagonists/space_ninja/machinery/ninja_mindscan_machine.dm @@ -26,7 +26,7 @@ /obj/machinery/ninja_mindscan_machine/Initialize() . = ..() - update_state_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/ninja_mindscan_machine/Destroy() if(occupant) @@ -54,7 +54,7 @@ ui_interact(user) /// Сюда вписать код ответственный за пихание оккупанта -/obj/machinery/ninja_mindscan_machine/MouseDrop_T(atom/movable/dropped as mob|obj, mob/user as mob) +/obj/machinery/ninja_mindscan_machine/MouseDrop_T(atom/movable/dropped, mob/user, params) // Только ниндзя умеет работать с этой машиной, но я всё равно оставлю проверки ниже во избежание других проблем. if(!isninja(user)) to_chat(user, span_boldwarning("ERROR!!! UNAUTORISED USER!!!")) @@ -106,6 +106,7 @@ if(!Adjacent(dropped_mob) && !Adjacent(user)) to_chat(user, span_boldnotice("You're not close enough to [src].")) return + . = TRUE if(dropped_mob != user) visible_message("[user] starts putting [dropped_mob] into the [src].") if(do_after(user, 20, target = dropped_mob)) @@ -156,7 +157,7 @@ to_chat(possible_occupant, span_notice("[on_enter_occupant_message]")) occupant = possible_occupant occupant.SetSleeping(120 SECONDS) - update_state_icon() + update_icon(UPDATE_ICON_STATE) desc = "[initial(desc)] ([occupant.name])" if(findtext("[possible_occupant.key]","@",1,2)) var/found_text = replacetext(possible_occupant.key, "@", "") @@ -172,7 +173,7 @@ return occupant.forceMove(get_turf(src)) occupant = null - update_state_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/ninja_mindscan_machine/force_eject_occupant(mob/target) go_out() @@ -190,9 +191,9 @@ new /obj/effect/temp_visual/dir_setting/ninja/phase(teleport_loc, effect_dir) new /obj/item/radio/headset(teleport_loc) //Если парня запрёт в техах, без средства связи... будет не круто, не так ли? to_chat(ninja, "[span_boldnotice("VOID-Shift")] occupant translocation successful") - update_state_icon() + update_icon(UPDATE_ICON_STATE) -/obj/machinery/ninja_mindscan_machine/proc/update_state_icon() +/obj/machinery/ninja_mindscan_machine/update_icon_state() icon_state = occupant ? initial(icon_state) : "[initial(icon_state)]_open" /obj/machinery/ninja_mindscan_machine/proc/get_occupant_icon() diff --git a/code/modules/antagonists/space_ninja/machinery/ninja_teleporter.dm b/code/modules/antagonists/space_ninja/machinery/ninja_teleporter.dm index 17374d85054..3d6749e53fd 100644 --- a/code/modules/antagonists/space_ninja/machinery/ninja_teleporter.dm +++ b/code/modules/antagonists/space_ninja/machinery/ninja_teleporter.dm @@ -4,7 +4,7 @@ desc = "A console used to send a Spider Clan operative long distances rapidly." icon = 'icons/obj/ninjaobjects.dmi' icon_state = "teleconsole" - anchored = 1 + anchored = TRUE density = 0 /obj/structure/ninjatele/attack_hand(mob/user as mob) diff --git a/code/modules/antagonists/space_ninja/ninja_borg_module.dm b/code/modules/antagonists/space_ninja/ninja_borg_module.dm index d3fb2a1ea51..57b5319b055 100644 --- a/code/modules/antagonists/space_ninja/ninja_borg_module.dm +++ b/code/modules/antagonists/space_ninja/ninja_borg_module.dm @@ -26,7 +26,6 @@ /mob/living/silicon/robot/syndicate/saboteur/ninja/New(loc) ..() mmi = new /obj/item/mmi/robotic_brain/ninja(src) - mmi.icon_state = "wanter" /mob/living/silicon/robot/syndicate/saboteur/ninja/init(alien = FALSE, mob/living/silicon/ai/ai_to_sync_to = null) . = ..() diff --git a/code/modules/antagonists/space_ninja/ninja_datum.dm b/code/modules/antagonists/space_ninja/ninja_datum.dm index 404504579dc..5d1a77c26b4 100644 --- a/code/modules/antagonists/space_ninja/ninja_datum.dm +++ b/code/modules/antagonists/space_ninja/ninja_datum.dm @@ -222,7 +222,7 @@ var/warning = cell.charge >= check_percentage ? "" : "_warning" hud.ninja_energy_display.icon_state = "ninja_energy_display_[my_suit.color_choice][warning]" hud.ninja_energy_display.maptext = "
Health: [health_scan]" + if(scanning && user_health) + dat += "
Health: [user_health]" var/datum/browser/popup = new(user, "hscan", name, 400, 400, src) popup.set_content(dat) popup.open() - return /obj/item/assembly/health/Topic(href, href_list) ..() - if(!ismob(usr)) + if(!isliving(usr)) return - var/mob/user = usr + var/mob/living/user = usr - if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) - usr << browse(null, "window=hscan") - onclose(usr, "hscan") + if(user.incapacitated() || user.restrained() || !in_range(loc, user)) + user << browse(null, "window=hscan") + onclose(user, "hscan") return if(href_list["scanning"]) toggle_scan() if(href_list["close"]) - usr << browse(null, "window=hscan") + user << browse(null, "window=hscan") return attack_self(user) - return + + +#undef MAX_HEALTH_ACTIVATE +#undef MIN_HEALTH_ACTIVATE + diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 7a27cf88768..1c48989a0a5 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -13,11 +13,6 @@ var/obj/item/assembly/a_left = null var/obj/item/assembly/a_right = null -/obj/item/assembly_holder/proc/attach(obj/item/D, obj/item/D2, mob/user) - return - -/obj/item/assembly_holder/proc/process_activation(var/obj/item/D) - return /obj/item/assembly_holder/Destroy() if(a_left) @@ -26,7 +21,8 @@ a_right.holder = null return ..() -/obj/item/assembly_holder/attach(obj/item/D, obj/item/D2, mob/user) + +/obj/item/assembly_holder/proc/attach(obj/item/D, obj/item/D2, mob/user) if(!D || !D2) return FALSE if(!isassembly(D) || !isassembly(D2)) @@ -50,35 +46,52 @@ if(has_prox_sensors()) AddComponent(/datum/component/proximity_monitor) name = "[A1.name]-[A2.name] assembly" - update_icon() + update_icon(UPDATE_OVERLAYS) return TRUE + /obj/item/assembly_holder/proc/has_prox_sensors() if(istype(a_left, /obj/item/assembly/prox_sensor) || istype(a_right, /obj/item/assembly/prox_sensor)) return TRUE return FALSE -/obj/item/assembly_holder/update_icon() - overlays.Cut() + +/obj/item/assembly_holder/proc/process_activation(obj/D, normal = TRUE, special = TRUE, mob/user) + if(!D) + return FALSE + if(normal && a_right && a_left) + if(a_right != D) + a_right.pulsed() + if(a_left != D) + a_left.pulsed() + if(master) + var/datum/signal/signal = new + signal.source = src + signal.user = user + master.receive_signal(signal) + return TRUE + + +/obj/item/assembly_holder/update_overlays() + . = ..() if(a_left) - overlays += "[a_left.icon_state]_left" + . += "[a_left.icon_state]_left" for(var/O in a_left.attached_overlays) - overlays += "[O]_l" + . += "[O]_l" if(a_right) - overlays += "[a_right.icon_state]_right" + . += "[a_right.icon_state]_right" for(var/O in a_right.attached_overlays) - overlays += "[O]_r" - if(master) - master.update_icon() + . += "[O]_r" + master?.update_icon() /obj/item/assembly_holder/examine(mob/user) . = ..() - if(in_range(src, user) || loc == user) + if(in_range(src, user)) if(secured) - . += "[src] is ready!" + . += span_notice("[src] can be attached!") else - . += "[src] can be attached!" + . += span_notice("[src] need to be secured!") /obj/item/assembly_holder/HasProximity(atom/movable/AM) @@ -94,6 +107,7 @@ if(a_right) a_right.Crossed(AM, oldloc) + /obj/item/assembly_holder/on_found(mob/finder) if(a_left) a_left.on_found(finder) @@ -107,26 +121,31 @@ if(a_right) a_right.hear_talk(M, message_pieces) + /obj/item/assembly_holder/hear_message(mob/living/M, msg) if(a_left) a_left.hear_message(M, msg) if(a_right) a_right.hear_message(M, msg) + /obj/item/assembly_holder/proc/process_movement(mob/user) // infrared beams and prox sensors if(a_left && a_right) a_left.holder_movement(user) a_right.holder_movement(user) + /obj/item/assembly_holder/Move() . = ..() process_movement() return + /obj/item/assembly_holder/pickup(mob/user) . = ..() process_movement(user) + /obj/item/assembly_holder/Bump(atom/A) ..() var/triggered @@ -138,6 +157,7 @@ triggered = AM process_movement(triggered) + /obj/item/assembly_holder/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) // called when a throw stops ..() var/triggered @@ -145,16 +165,17 @@ triggered = throwing.thrower process_movement(triggered) + /obj/item/assembly_holder/attack_hand(mob/user)//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess if(a_left && a_right) a_left.holder_movement(user) a_right.holder_movement(user) ..() - return + /obj/item/assembly_holder/screwdriver_act(mob/user, obj/item/I) if(!a_left || !a_right) - to_chat(user, "BUG:Assembly part missing, please report this!") + to_chat(user, span_warning("BUG:Assembly part missing, please report this!")) return . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) @@ -163,16 +184,17 @@ a_right.toggle_secure() secured = !secured if(secured) - to_chat(user, "[src] is ready!") + to_chat(user, span_notice("[src] can now be attached!")) else - to_chat(user, "[src] can now be taken apart!") + to_chat(user, span_notice("[src] can now be taken apart!")) update_icon() + /obj/item/assembly_holder/attack_self(mob/user) add_fingerprint(user) if(secured) if(!a_left || !a_right) - to_chat(user, "Assembly part missing!") + to_chat(user, span_warning("Assembly part missing!")) return if(istype(a_left, a_right.type))//If they are the same type it causes issues due to window code switch(alert("Which side would you like to use?",,"Left","Right")) @@ -190,24 +212,11 @@ return FALSE if(a_left) a_left.holder = null - a_left.loc = T + a_left.forceMove(T) + user.put_in_hands(a_left, ignore_anim = FALSE) if(a_right) a_right.holder = null - a_right.loc = T + a_right.forceMove(T) + user.put_in_hands(a_left, ignore_anim = FALSE) qdel(src) - -/obj/item/assembly_holder/process_activation(obj/D, normal = TRUE, special = TRUE, mob/user) - if(!D) - return FALSE - if(normal && a_right && a_left) - if(a_right != D) - a_right.pulsed(0) - if(a_left != D) - a_left.pulsed(0) - if(master) - var/datum/signal/signal = new - signal.source = src - signal.user = user - master.receive_signal(signal) - return TRUE diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index b81acbbe2b0..0389339efb7 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -4,42 +4,62 @@ icon_state = "igniter" materials = list(MAT_METAL=500, MAT_GLASS=50) origin_tech = "magnets=1" - var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread + var/datum/effect_system/spark_spread/sparks -/obj/item/assembly/igniter/New() - ..() - sparks.set_up(2, 0, src) + +/obj/item/assembly/igniter/Initialize(mapload) + . = ..() + sparks = new /datum/effect_system/spark_spread + sparks.set_up(2, FALSE, src) sparks.attach(src) + /obj/item/assembly/igniter/Destroy() QDEL_NULL(sparks) return ..() -/obj/item/assembly/igniter/describe() - return "The igniter is [secured ? "secured." : "unsecured."]" +/obj/item/assembly/igniter/examine(mob/user) + . = ..() + . += span_notice("The igniter is [secured ? "secured." : "unsecured."]") /obj/item/assembly/igniter/activate() if(!..()) - return FALSE//Cooldown check + return FALSE //Cooldown check + var/turf/location = get_turf(loc) if(location) - location.hotspot_expose(1000,1000) + location.hotspot_expose(1000, 1000) + + sparks.start() + if(istype(loc, /obj/item/assembly_holder)) - if(istype(loc.loc, /obj/structure/reagent_dispensers/fueltank)) - var/obj/structure/reagent_dispensers/fueltank/tank = loc.loc + var/locloc = loc.loc + if(istype(locloc, /obj/structure/reagent_dispensers/fueltank)) + var/obj/structure/reagent_dispensers/fueltank/tank = locloc if(tank) - tank.boom(TRUE) - if(istype(loc.loc, /obj/item/reagent_containers/glass/beaker)) - var/obj/item/reagent_containers/glass/beaker/beakerbomb = loc.loc + tank.boom(TRUE) // this qdel's `src` + + if(istype(locloc, /obj/item/onetankbomb)) + var/obj/item/onetankbomb/bomb = locloc + if(bomb?.bombtank) + bomb.bombtank.detonate() + + else if(istype(locloc, /obj/item/reagent_containers/glass/beaker)) + var/obj/item/reagent_containers/glass/beaker/beakerbomb = locloc if(beakerbomb) beakerbomb.heat_beaker() - sparks.start() + + else if(istype(locloc, /obj/item/grenade/chem_grenade)) + var/obj/item/grenade/chem_grenade/CG = locloc + CG.prime() + return TRUE /obj/item/assembly/igniter/attack_self(mob/user) - activate() + if(!istype(loc, /obj/item/assembly_holder)) + activate() add_fingerprint(user) - return + diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 7211b74d433..01506870ac0 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -7,7 +7,7 @@ bomb_name = "tripwire mine" - secured = FALSE // toggle_secure()'ed in New() for correct adding to processing_objects, won't work otherwise + secured = FALSE // toggle_secure()'ed in Initialize() for correct adding to processing_objects, won't work otherwise dir = EAST var/on = FALSE var/visible = TRUE @@ -18,6 +18,13 @@ var/emission_cycles = 0 var/emission_cap = 20 + +/obj/item/assembly/infra/Initialize(mapload) + . = ..() + if(!secured) + toggle_secure() + + /obj/item/assembly/infra/Destroy() if(first) QDEL_NULL(first) @@ -25,12 +32,12 @@ fire_location = null return ..() -/obj/item/assembly/infra/describe() - return "The assembly is [secured ? "secure" : "not secure"]. The infrared trigger is [on ? "on" : "off"]." /obj/item/assembly/infra/examine(mob/user) . = ..() - . += describe() + . += span_notice("The assembly is [secured ? "secure" : "not secure"]. The infrared trigger is [on ? "on" : "off"].") + . += span_info("Alt-Click to rotate it.") + /obj/item/assembly/infra/activate() if(!..()) @@ -39,6 +46,7 @@ update_icon() return TRUE + /obj/item/assembly/infra/toggle_secure() secured = !secured if(secured) @@ -51,25 +59,22 @@ update_icon() return secured -/obj/item/assembly/infra/New() - ..() - if(!secured) - toggle_secure() -/obj/item/assembly/infra/proc/arm() // Forces the device to arm no matter its current state. +/// Forces the device to arm no matter its current state. +/obj/item/assembly/infra/proc/arm() if(!secured) // Checked because arm() might be called sometime after the object is spawned. toggle_secure() - on = 1 + on = TRUE -/obj/item/assembly/infra/update_icon() - overlays.Cut() + +/obj/item/assembly/infra/update_overlays() + . = ..() attached_overlays = list() if(on) - overlays += "infrared_on" + . += "infrared_on" attached_overlays += "infrared_on" + holder?.update_icon() - if(holder) - holder.update_icon() /obj/item/assembly/infra/process() var/turf/T = get_turf(src) @@ -89,7 +94,7 @@ emission_cycles = 0 var/obj/effect/beam/i_beam/I = new /obj/effect/beam/i_beam(T) I.master = src - I.density = 1 + I.density = TRUE I.dir = dir I.update_icon() first = I @@ -100,30 +105,36 @@ I.limit = 8 I.process() + /obj/item/assembly/infra/attack_hand() qdel(first) ..() -/obj/item/assembly/infra/Move() - var/t = dir + +/obj/item/assembly/infra/Move(atom/newloc, direct = 0, movetime) + var/prev_dir = dir . = ..() - dir = t + dir = prev_dir qdel(first) + /obj/item/assembly/infra/holder_movement() if(!holder) return FALSE qdel(first) return TRUE + /obj/item/assembly/infra/equipped(mob/user, slot, initial) qdel(first) return ..() + /obj/item/assembly/infra/pickup(mob/user) qdel(first) return ..() + /obj/item/assembly/infra/proc/trigger_beam(atom/movable/AM) var/mob/triggered if(AM.throwing?.thrower) @@ -132,15 +143,17 @@ triggered = AM if(!secured || !on || cooldown > 0) return FALSE + cooldown = 2 + pulse(FALSE, triggered) audible_message("[bicon(src)] *beep* *beep*", hearing_distance = 3) if(first) qdel(first) - cooldown = 2 - addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10) - pulse(FALSE, triggered) + addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 1 SECONDS) + /obj/item/assembly/infra/interact(mob/user)//TODO: change this this to the wire control panel - if(!secured) return + if(!secured) + return user.set_machine(src) var/dat = {"Infrared Laser Status: [on ? "On" : "Off"]
@@ -153,6 +166,7 @@ popup.set_content(dat) popup.open() + /obj/item/assembly/infra/Topic(href, href_list) ..() if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) @@ -167,38 +181,51 @@ if(first) first.vis_spread(visible) if(href_list["rotate"]) - rotate() + rotate(usr) if(href_list["close"]) usr << browse(null, "window=infra") return if(usr) attack_self(usr) -/obj/item/assembly/infra/verb/rotate()//This could likely be better + +/obj/item/assembly/infra/AltClick(mob/user) + if(!Adjacent(user)) + return ..() + rotate(user) + + +/obj/item/assembly/infra/verb/rotate_verb() set name = "Rotate Infrared Laser" set category = "Object" set src in usr - if(usr.stat || !usr.canmove || usr.restrained()) + rotate(usr) + + +/obj/item/assembly/infra/proc/rotate(mob/living/user = usr) + if(!isliving(user) || user.incapacitated() || user.restrained()) return dir = turn(dir, 90) - if(usr.machine == src) - interact(usr) + if(user.machine == src) + interact(user) if(first) qdel(first) +/obj/item/assembly/infra/armed/Initialize(mapload) + . = ..() + addtimer(CALLBACK(src, PROC_REF(delayed_arm)), 0.3 SECONDS) + + +/obj/item/assembly/infra/armed/proc/delayed_arm() + if(holder?.master) + dir = holder.master.dir + arm() -/obj/item/assembly/infra/armed/New() - ..() - spawn(3) - if(holder) - if(holder.master) - dir = holder.master.dir - arm() /obj/item/assembly/infra/armed/stealth visible = FALSE @@ -222,19 +249,31 @@ pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSFENCE +/obj/effect/beam/i_beam/Destroy() + if(master && master.first == src) + master.first = null + QDEL_NULL(next) + if(previous) + previous.next = null + master?.last = previous + return ..() + + /obj/effect/beam/i_beam/proc/hit(atom/movable/AM) - if(master) - master.trigger_beam(AM) + master?.trigger_beam(AM) qdel(src) -/obj/effect/beam/i_beam/proc/vis_spread(v) - visible = v + +/obj/effect/beam/i_beam/proc/vis_spread(new_visibility) + visible = new_visibility if(next) - next.vis_spread(v) + next.vis_spread(new_visibility) + -/obj/effect/beam/i_beam/update_icon() +/obj/effect/beam/i_beam/update_icon_state() transform = turn(matrix(), dir2angle(dir)) + /obj/effect/beam/i_beam/process() life_cycles++ if(loc.density || !master || life_cycles >= life_cap) @@ -242,18 +281,15 @@ return if(left > 0) left-- - if(left < 1) - if(!(visible)) - invisibility = INVISIBILITY_ABSTRACT - else - invisibility = FALSE + if(left < 1 && !visible) + invisibility = INVISIBILITY_ABSTRACT else - invisibility = FALSE + invisibility = 0 if(!next && (limit > 0)) var/obj/effect/beam/i_beam/I = new /obj/effect/beam/i_beam(loc) I.master = master - I.density = 1 + I.density = TRUE I.dir = dir I.update_icon() I.previous = src @@ -266,12 +302,15 @@ master.last = I I.process() + /obj/effect/beam/i_beam/Bump() qdel(src) + /obj/effect/beam/i_beam/Bumped(atom/movable/moving_atom) hit(moving_atom) + /obj/effect/beam/i_beam/Crossed(atom/movable/AM, oldloc) if(!isobj(AM) && !isliving(AM)) return @@ -279,11 +318,3 @@ return hit(AM) -/obj/effect/beam/i_beam/Destroy() - if(master.first == src) - master.first = null - QDEL_NULL(next) - if(previous) - previous.next = null - master.last = previous - return ..() diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index dde6183ca6f..01a1b6734a6 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -8,133 +8,165 @@ bomb_name = "contact mine" + /obj/item/assembly/mousetrap/examine(mob/user) . = ..() if(armed) - . += "It looks like it's armed." + . += span_warning("It looks like it's armed.") + . += span_info("Alt-Click to hide it.") + /obj/item/assembly/mousetrap/activate() - if(..()) - armed = !armed - if(!armed) - if(ishuman(usr)) - var/mob/living/carbon/human/user = usr - if((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)) - to_chat(user, "Your hand slips, setting off the trigger.") - pulse(0, user) - update_icon() - if(usr) - playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) - -/obj/item/assembly/mousetrap/describe() - return "The pressure switch is [armed ? "primed" : "safe"]." - -/obj/item/assembly/mousetrap/update_icon() - if(armed) - icon_state = "mousetraparmed" - else - icon_state = "mousetrap" + if(!..()) + return + + armed = !armed + if(!armed && ishuman(usr)) + var/mob/living/carbon/human/user = usr + if((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)) + to_chat(user, "Your hand slips, setting off the trigger.") + pulse(FALSE, user) + + update_icon() + + if(usr) + playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3) + + +/obj/item/assembly/mousetrap/update_icon_state() + icon_state = "mousetrap[armed ? "armed": ""]" if(holder) holder.update_icon() + /obj/item/assembly/mousetrap/proc/triggered(mob/target, type = "feet") if(!armed) return + var/obj/item/organ/external/affecting = null + if(ishuman(target)) - var/mob/living/carbon/human/H = target - if(PIERCEIMMUNE in H.dna.species.species_traits) + var/mob/living/carbon/human/h_target = target + if(h_target.dna && (PIERCEIMMUNE in h_target.dna.species.species_traits)) playsound(src, 'sound/effects/snap.ogg', 50, TRUE) armed = FALSE update_icon() - pulse(FALSE, target) + pulse(FALSE, h_target) return FALSE + switch(type) if("feet") - if(!H.shoes) - affecting = H.get_organ(pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) - H.Weaken(6 SECONDS) + if(!h_target.shoes) + affecting = h_target.get_organ(pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) + h_target.Weaken(6 SECONDS) + if(BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND) - if(!H.gloves) - affecting = H.get_organ(type) - H.Stun(6 SECONDS) + if(!h_target.gloves) + affecting = h_target.get_organ(type) + h_target.Stun(6 SECONDS) + if(affecting) affecting.receive_damage(1, 0) - else if(ismouse(target)) - var/mob/living/simple_animal/mouse/M = target - visible_message("SPLAT!") - M.apply_damage(5, "brute") - if (M.stat == DEAD) - M.splat(item = src) - playsound(loc, 'sound/effects/snap.ogg', 50, 1) + + else if(ismouse(target) && target.stat != DEAD) + var/mob/living/simple_animal/mouse/mouse = target + visible_message(span_danger("SPLAT!")) + mouse.death() + mouse.splat(src) + + playsound(loc, 'sound/effects/snap.ogg', 50, TRUE) layer = MOB_LAYER - 0.2 armed = FALSE update_icon() - pulse(0, target) + pulse(FALSE, target) + /obj/item/assembly/mousetrap/attack_self(mob/living/user) if(!armed) - to_chat(user, "You arm [src].") + to_chat(user, span_notice("You arm [src].")) else if((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)) triggered(user, user.hand ? BODY_ZONE_PRECISE_L_HAND : BODY_ZONE_PRECISE_R_HAND) - user.visible_message("[user] accidentally sets off [src], breaking [user.p_their()] fingers.", \ - "You accidentally trigger [src]!") + user.visible_message( + span_warning("[user] accidentally sets off [src], breaking [user.p_their()] fingers."), + span_warning("You accidentally trigger [src]!"), + ) return - to_chat(user, "You disarm [src].") + to_chat(user, span_notice("You disarm [src].")) armed = !armed update_icon() - playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) + playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3) + /obj/item/assembly/mousetrap/attack_hand(mob/living/user) - if(armed) - if((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)) - triggered(user, user.hand ? BODY_ZONE_PRECISE_L_HAND : BODY_ZONE_PRECISE_R_HAND) - user.visible_message("[user] accidentally sets off [src], breaking [user.p_their()] fingers.", \ - "You accidentally trigger [src]!") - return + if(armed && (user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)) + triggered(user, user.hand ? BODY_ZONE_PRECISE_L_HAND : BODY_ZONE_PRECISE_R_HAND) + user.visible_message( + span_warning("[user] accidentally sets off [src], breaking [user.p_their()] fingers."), + span_warning("You accidentally trigger [src]!"), + ) + return ..() + /obj/item/assembly/mousetrap/Crossed(atom/movable/AM, oldloc) if(armed) if(ishuman(AM)) - var/mob/living/carbon/H = AM - if(H.m_intent == MOVE_INTENT_RUN) - triggered(H) - H.visible_message("[H] accidentally steps on [src].", \ - "You accidentally step on [src]") + var/mob/living/carbon/h_target = AM + if(h_target.m_intent == MOVE_INTENT_RUN) + triggered(h_target) + h_target.visible_message( + span_warning("[h_target] accidentally steps on [src]."), + span_warning("You accidentally step on [src]!"), + ) else if(ismouse(AM)) triggered(AM) else if(AM.density) // For mousetrap grenades, set off by anything heavy triggered(AM) ..() + /obj/item/assembly/mousetrap/on_found(mob/finder) if(armed) - finder.visible_message("[finder] accidentally sets off [src], breaking [finder.p_their()] fingers.", \ - "You accidentally trigger [src]!") + finder.visible_message( + span_warning("[finder] accidentally sets off [src], breaking [finder.p_their()] fingers."), + span_warning("You accidentally trigger [src]!"), + ) triggered(finder, finder.hand ? BODY_ZONE_PRECISE_L_HAND : BODY_ZONE_PRECISE_R_HAND) return TRUE //end the search! return FALSE + /obj/item/assembly/mousetrap/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) if(!armed) return ..() - visible_message("[src] is triggered by [AM].") - triggered(null) + visible_message(span_warning("[src] is triggered by [AM].")) + triggered() + /obj/item/assembly/mousetrap/armed icon_state = "mousetraparmed" - armed = 1 + armed = TRUE -/obj/item/assembly/mousetrap/verb/hide_under() +/obj/item/assembly/mousetrap/AltClick(mob/user) + if(!Adjacent(user)) + return ..() + hide_under(user) + + +/obj/item/assembly/mousetrap/verb/hide_under_verb() set src in oview(1) set name = "Hide" set category = "Object" - if(usr.stat) + hide_under(usr) + + +/obj/item/assembly/mousetrap/proc/hide_under(mob/user = usr) + if(!isliving(user) || user.incapacitated() || user.restrained()) return - layer = TURF_LAYER+0.2 - to_chat(usr, "You hide [src].") + layer = TURF_LAYER + 0.2 + to_chat(user, span_notice("You hide [src].")) + diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index cce1f06410f..671c69b23be 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -5,22 +5,27 @@ materials = list(MAT_METAL = 800, MAT_GLASS = 200) origin_tech = "magnets=1;engineering=1" - secured = 0 + secured = FALSE bomb_name = "proximity mine" - var/scanning = 0 - var/timing = 0 + var/scanning = FALSE + var/timing = FALSE var/time = 10 + /obj/item/assembly/prox_sensor/ComponentInitialize() . = ..() AddComponent(/datum/component/proximity_monitor) -/obj/item/assembly/prox_sensor/describe() + +/obj/item/assembly/prox_sensor/examine(mob/user) + . = ..() if(timing) - return "The proximity sensor is arming." - return "The proximity sensor is [scanning ? "armed" : "disarmed"]." + . += span_notice("The proximity sensor is arming.") + else + . += span_notice("The proximity sensor is [scanning ? "armed" : "disarmed"].") + /obj/item/assembly/prox_sensor/activate() if(!..()) @@ -29,17 +34,19 @@ update_icon() return FALSE + /obj/item/assembly/prox_sensor/toggle_secure() secured = !secured if(secured) START_PROCESSING(SSobj, src) else - scanning = 0 - timing = 0 + scanning = FALSE + timing = FALSE STOP_PROCESSING(SSobj, src) update_icon() return secured + /obj/item/assembly/prox_sensor/HasProximity(atom/movable/AM) if(!isobj(AM) && !isliving(AM)) return @@ -48,6 +55,7 @@ if(AM.move_speed < 12) sense(AM) + /obj/item/assembly/prox_sensor/proc/sense(atom/movable/AM) var/mob/triggered if(ismob(AM)) @@ -55,23 +63,24 @@ if(!secured || !scanning || cooldown > 0) return FALSE cooldown = 2 - visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*") - addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10) pulse(FALSE, triggered) + visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*") + addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 1 SECONDS) + /obj/item/assembly/prox_sensor/process() if(timing && (time >= 0)) time-- if(timing && time <= 0) - timing = 0 + timing = FALSE toggle_scan() time = 10 + /obj/item/assembly/prox_sensor/dropped(mob/user, silent = FALSE) - ..() - spawn(0) - sense(user) - return + . = ..() + INVOKE_ASYNC(src, PROC_REF(sense), user) + /obj/item/assembly/prox_sensor/proc/toggle_scan() if(!secured) @@ -79,28 +88,31 @@ scanning = !scanning update_icon() -/obj/item/assembly/prox_sensor/update_icon() - overlays.Cut() + +/obj/item/assembly/prox_sensor/update_overlays() + . = ..() attached_overlays = list() if(timing) - overlays += "prox_timing" + . += "prox_timing" attached_overlays += "prox_timing" if(scanning) - overlays += "prox_scanning" + . += "prox_scanning" attached_overlays += "prox_scanning" - if(holder) - holder.update_icon() + holder?.update_icon() -/obj/item/assembly/prox_sensor/Move() + +/obj/item/assembly/prox_sensor/Move(atom/newloc, direct = NONE, movetime) . = ..() sense() + /obj/item/assembly/prox_sensor/holder_movement(user) sense(user) + /obj/item/assembly/prox_sensor/interact(mob/user)//TODO: Change this to the wires thingy if(!secured) - user.show_message("The [name] is unsecured!") + user.show_message(span_warning("The [name] is unsecured!")) return FALSE var/second = time % 60 var/minute = (time - second) / 60 @@ -112,6 +124,7 @@ popup.set_content(dat) popup.open() + /obj/item/assembly/prox_sensor/Topic(href, href_list) ..() if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) @@ -137,3 +150,4 @@ if(usr) attack_self(usr) + diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index 4c1e8ae6d1b..e2ccef0b2bc 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -9,26 +9,27 @@ w_class = WEIGHT_CLASS_HUGE flags = CONDUCT + /obj/item/assembly/shock_kit/Destroy() QDEL_NULL(part1) QDEL_NULL(part2) return ..() -/obj/item/assembly/shock_kit/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/wrench) && !status) - var/turf/T = loc - if(ismob(T)) - T = T.loc - part1.loc = T - part2.loc = T - part1.master = null - part2.master = null - part1 = null - part2 = null - qdel(src) - return + +/obj/item/assembly/shock_kit/wrench_act(mob/living/user, obj/item/I) + . = TRUE + if(!status) + return . add_fingerprint(user) - return + var/drop_loc = drop_location() + part1.forceMove(drop_loc) + part2.forceMove(drop_loc) + part1.master = null + part2.master = null + part1 = null + part2 = null + qdel(src) + /obj/item/assembly/shock_kit/screwdriver_act(mob/user, obj/item/I) . = TRUE @@ -36,18 +37,19 @@ return status = !status if(status) - to_chat(user, "[src] is now ready to be attached to a chair!") + to_chat(user, span_notice("[src] is now ready to be attached to a chair!")) else - to_chat(user, "[src] is now ready!") + to_chat(user, span_notice("[src] is now ready!")) + -/obj/item/assembly/shock_kit/attack_self(mob/user as mob) +/obj/item/assembly/shock_kit/attack_self(mob/user) part1.attack_self(user, status) part2.attack_self(user, status) add_fingerprint(user) - return + /obj/item/assembly/shock_kit/receive_signal() if(istype(loc, /obj/structure/chair/e_chair)) - var/obj/structure/chair/e_chair/C = loc - C.shock() - return + var/obj/structure/chair/e_chair/chair = loc + chair.shock() + diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 406f70f17c0..9d0f1b830e4 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -7,7 +7,7 @@ origin_tech = "magnets=1;bluespace=1" wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE - secured = 1 + secured = TRUE var/receiving = FALSE bomb_name = "remote-control bomb" @@ -18,24 +18,32 @@ var/datum/radio_frequency/radio_connection var/airlock_wire = null -/obj/item/assembly/signaler/New() - ..() - if(SSradio) - set_frequency(frequency) /obj/item/assembly/signaler/Initialize() - ..() + . = ..() if(SSradio) set_frequency(frequency) + /obj/item/assembly/signaler/Destroy() if(SSradio) SSradio.remove_object(src, frequency) radio_connection = null return ..() -/obj/item/assembly/signaler/describe() - return "[src]'s power light is [receiving ? "on" : "off"]" + +/obj/item/assembly/signaler/examine(mob/user) + . = ..() + . += span_notice("The power light is [receiving ? "on" : "off"].") + . += span_info("Alt+Click to send a signal.") + + +/obj/item/assembly/signaler/AltClick(mob/user) + if(!isliving(user) || user.incapacitated() || user.restrained() || !Adjacent(user)) + return ..() + to_chat(user, span_notice("You activate [src].")) + activate() + /obj/item/assembly/signaler/activate() if(cooldown > 0) @@ -46,10 +54,10 @@ signal() return TRUE -/obj/item/assembly/signaler/update_icon() - if(holder) - holder.update_icon() - return + +/obj/item/assembly/signaler/update_icon_state() + holder?.update_icon() + /obj/item/assembly/signaler/interact(mob/user, flag1) var/t1 = "-------" @@ -81,13 +89,14 @@ "} var/datum/browser/popup = new(user, "radio", name, 400, 400) popup.set_content(dat) - popup.open(0) + popup.open(FALSE) onclose(user, "radio") + /obj/item/assembly/signaler/Topic(href, href_list) ..() - if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) + if(usr.incapacitated() || usr.restrained() || !Adjacent(usr)) usr << browse(null, "window=radio") onclose(usr, "radio") return @@ -103,16 +112,17 @@ code = round(code) code = min(100, code) code = max(1, code) + if(href_list["receive"]) receiving = !receiving if(href_list["send"]) - spawn( 0 ) - signal() + INVOKE_ASYNC(src, PROC_REF(signal)) if(usr) attack_self(usr) + /obj/item/assembly/signaler/proc/signal() if(!radio_connection) return @@ -129,6 +139,7 @@ if(usr) GLOB.lastsignalers.Add("[time] : [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) : [format_frequency(frequency)]/[code]") + /obj/item/assembly/signaler/receive_signal(datum/signal/signal) if(!receiving || !signal) return FALSE @@ -140,15 +151,15 @@ return FALSE pulse(1, signal.user) - for(var/mob/O in hearers(1, loc)) - O.show_message("[bicon(src)] *beep* *beep*", 3, "*beep* *beep*", 2) + for(var/mob/hearer in hearers(1, loc)) + hearer.show_message("[bicon(src)] *beep* *beep*", 3, "*beep* *beep*", 2) return TRUE + /obj/item/assembly/signaler/proc/set_frequency(new_frequency) - if(!SSradio) - sleep(20) if(!SSradio) return SSradio.remove_object(src, frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, RADIO_CHAT) + diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index c4393ce999f..6084f4cd5ec 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -15,10 +15,18 @@ var/set_time = 10 var/mob/user // for logging -/obj/item/assembly/timer/describe() + +/obj/item/assembly/timer/Destroy() + user = null + return ..() + +/obj/item/assembly/timer/examine(mob/user) + . = ..() if(timing) - return "The timer is counting down from [time]!" - return "The timer is set for [time] seconds." + . += span_notice("The timer is counting down from [time]!") + else + . += span_notice("The timer is set for [time] seconds.") + /obj/item/assembly/timer/activate() if(!..()) @@ -27,6 +35,7 @@ update_icon() return FALSE + /obj/item/assembly/timer/toggle_secure() secured = !secured if(secured) @@ -37,13 +46,17 @@ update_icon() return secured + /obj/item/assembly/timer/proc/timer_end() if(!secured || cooldown > 0) return FALSE - visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*") cooldown = 2 - addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10) pulse(FALSE, user) + update_icon() + if(loc) + loc.visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*") + addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10) + /obj/item/assembly/timer/process() if(timing && (time > 0)) @@ -53,18 +66,19 @@ timer_end() time = set_time -/obj/item/assembly/timer/update_icon() - overlays.Cut() + +/obj/item/assembly/timer/update_overlays() + . = ..() attached_overlays = list() if(timing) - overlays += "timer_timing" + . += "timer_timing" attached_overlays += "timer_timing" - if(holder) - holder.update_icon() + holder?.update_icon() + -/obj/item/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires +/obj/item/assembly/timer/interact(mob/user)//TODO: Have this use the wires if(!secured) - user.show_message("The [name] is unsecured!") + user.show_message(span_warning("The [name] is unsecured!")) return FALSE var/second = time % 60 var/minute = (time - second) / 60 @@ -90,9 +104,10 @@ popup.set_content(dat) popup.open() + /obj/item/assembly/timer/Topic(href, href_list) ..() - if(usr.incapacitated() || !in_range(loc, usr)) + if(usr.incapacitated() || usr.restrained() || !Adjacent(usr)) usr << browse(null, "window=timer") onclose(usr, "timer") return diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 7dc382cde69..61b965b8c23 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -4,38 +4,48 @@ icon_state = "voice" materials = list(MAT_METAL=500, MAT_GLASS=50) origin_tech = "magnets=1;engineering=1" - var/listening = 0 + var/listening = FALSE var/recorded = null //the activation message var/recorded_type = 0 // 0 for say, 1 for emote bomb_name = "voice-activated bomb" -/obj/item/assembly/voice/describe() + +/obj/item/assembly/voice/examine(mob/user) + . = ..() if(recorded || listening) - return "A meter on [src] flickers with every nearby sound." + . += span_notice("A meter on it flickers with every nearby sound.") else - return "[src] is deactivated." + . += span_notice("It is deactivated.") -/obj/item/assembly/voice/hear_talk(mob/living/M as mob, list/message_pieces) + +/obj/item/assembly/voice/hear_talk(mob/living/M, list/message_pieces) hear_input(M, multilingual_to_message(message_pieces), 0) -/obj/item/assembly/voice/hear_message(mob/living/M as mob, msg) + +/obj/item/assembly/voice/hear_message(mob/living/M, msg) hear_input(M, msg, 1) -/obj/item/assembly/voice/proc/hear_input(mob/living/M as mob, msg, type) + +/obj/item/assembly/voice/proc/hear_input(mob/living/M, msg, type) if(!istype(M,/mob/living)) return if(listening) + if(findtext(msg, "")) + recorded = strip_html_properly(msg) + else + recorded = msg recorded = msg recorded_type = type - listening = 0 + listening = FALSE var/turf/T = get_turf(src) //otherwise it won't work in hand T.visible_message("[bicon(src)] beeps, \"Activation message is [type ? "the sound when one [recorded]" : "'[recorded]'."]\"") else if(findtext(msg, recorded) && type == recorded_type) var/turf/T = get_turf(src) //otherwise it won't work in hand - T.visible_message("[bicon(src)] beeps!") + T.visible_message(span_warning("[bicon(src)] beeps!")) pulse(0, M) + /obj/item/assembly/voice/activate() return // previously this toggled listning when not in a holder, that's a little silly. It was only called in attack_self that way. @@ -52,7 +62,8 @@ /obj/item/assembly/voice/toggle_secure() . = ..() - listening = 0 + listening = FALSE + /obj/item/assembly/voice/noise name = "noise sensor" @@ -62,16 +73,22 @@ origin_tech = "magnets=1;engineering=1" bomb_name = "noise-activated bomb" + /obj/item/assembly/voice/noise/attack_self(mob/user) return -/obj/item/assembly/voice/noise/describe() - return "[src] does not appear to have any controls." -/obj/item/assembly/voice/noise/hear_talk(mob/living/M as mob, list/message_pieces) +/obj/item/assembly/voice/noise/examine(mob/user) + . = ..() + . += span_notice("It does not appear to have any controls.") + + +/obj/item/assembly/voice/noise/hear_talk(mob/living/M, list/message_pieces) return -/obj/item/assembly/voice/noise/hear_message(mob/living/M as mob, msg) + +/obj/item/assembly/voice/noise/hear_message(mob/living/M, msg) pulse(0, M) var/turf/T = get_turf(src) //otherwise it won't work in hand - T.visible_message("[bicon(src)] beeps!") + T.visible_message(span_warning("[bicon(src)] beeps!")) + diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index eaf849d8a00..c4049335180 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -4,74 +4,74 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) desc = "A mysterious gateway built by unknown hands, it allows for faster than light travel to far-flung locations." icon = 'icons/obj/machines/gateway.dmi' icon_state = "off" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - var/active = 0 + var/active = FALSE + /obj/machinery/gateway/Initialize() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) update_density_from_dir() -/obj/machinery/gateway/proc/update_density_from_dir() - if(dir == 2) - density = 0 +/obj/machinery/gateway/proc/update_density_from_dir() + if(dir == SOUTH) + density = FALSE -/obj/machinery/gateway/update_icon() - if(active) - icon_state = "on" - return - icon_state = "off" +/obj/machinery/gateway/update_icon_state() + icon_state = active ? "on" : "off" //this is da important part wot makes things go /obj/machinery/gateway/centerstation - density = 1 icon_state = "offcenter" use_power = IDLE_POWER_USE //warping vars var/list/linked = list() - var/ready = 0 //have we got all the parts for a gateway? + var/ready = FALSE //have we got all the parts for a gateway? var/wait = 0 //this just grabs world.time at world start var/obj/machinery/gateway/centeraway/awaygate = null + /obj/machinery/gateway/centerstation/New() ..() if(!GLOB.the_gateway) GLOB.the_gateway = src -/obj/machinery/gateway/centerstation/Initialize() - ..() - update_icon() + +/obj/machinery/gateway/centerstation/Initialize(mapload) + . = ..() + update_icon(UPDATE_ICON_STATE) wait = world.time + CONFIG_GET(number/gateway_delay) return INITIALIZE_HINT_LATELOAD -/obj/machinery/gateway/centerstation/LateInitialize() - awaygate = locate(/obj/machinery/gateway/centeraway) in GLOB.machines - -/obj/machinery/gateway/centerstation/update_density_from_dir() - return /obj/machinery/gateway/centerstation/Destroy() if(GLOB.the_gateway == src) GLOB.the_gateway = null return ..() -/obj/machinery/gateway/centerstation/update_icon() - if(active) - icon_state = "oncenter" - return - icon_state = "offcenter" + +/obj/machinery/gateway/centerstation/LateInitialize() + awaygate = locate(/obj/machinery/gateway/centeraway) in GLOB.machines + + +/obj/machinery/gateway/centerstation/update_density_from_dir() + return +/obj/machinery/gateway/centerstation/update_icon_state() + icon_state = active ? "oncenter" : "offcenter" + /obj/machinery/gateway/centerstation/process() if(stat & (NOPOWER)) - if(active) toggleoff() + if(active) + toggleoff() return if(active) @@ -90,18 +90,18 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) continue //this is only done if we fail to find a part - ready = 0 + ready = FALSE toggleoff() break - if(linked.len == 8) - ready = 1 + if(length(linked) == 8) + ready = TRUE -/obj/machinery/gateway/centerstation/proc/toggleon(mob/user as mob) +/obj/machinery/gateway/centerstation/proc/toggleon(mob/user) if(!ready) return - if(linked.len != 8) + if(length(linked) != 8) return if(!powered()) return @@ -115,21 +115,21 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) return for(var/obj/machinery/gateway/G in linked) - G.active = 1 + G.active = TRUE G.update_icon() - active = 1 - update_icon() + active = TRUE + update_icon(UPDATE_ICON_STATE) /obj/machinery/gateway/centerstation/proc/toggleoff() for(var/obj/machinery/gateway/G in linked) - G.active = 0 - G.update_icon() - active = 0 - update_icon() + G.active = FALSE + G.update_icon(UPDATE_ICON_STATE) + active = FALSE + update_icon(UPDATE_ICON_STATE) -/obj/machinery/gateway/centerstation/attack_hand(mob/user as mob) +/obj/machinery/gateway/centerstation/attack_hand(mob/user) add_fingerprint(user) if(!ready) detect() @@ -152,17 +152,16 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) moving_atom.forceMove(get_step(awaygate.loc, SOUTH)) moving_atom.dir = SOUTH return - else - var/obj/effect/landmark/dest = pick(GLOB.awaydestinations) - if(dest) - moving_atom.forceMove(dest.loc) - moving_atom.dir = SOUTH - use_power(5000) - return + + var/obj/effect/landmark/dest = pick(GLOB.awaydestinations) + if(dest) + moving_atom.forceMove(dest.loc) + moving_atom.dir = SOUTH + use_power(5000) -/obj/machinery/gateway/centerstation/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W,/obj/item/multitool)) +/obj/machinery/gateway/centerstation/attackby(obj/item/W, mob/user, params) + if(ismultitool(W)) add_fingerprint(user) to_chat(user, "The gate is already calibrated, there is no work for you to do here.") return @@ -172,13 +171,12 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) /obj/machinery/gateway/centeraway - density = 1 icon_state = "offcenter" use_power = NO_POWER_USE var/calibrating_on_activating = FALSE - var/calibrated = 1 + var/calibrated = TRUE var/list/linked = list() //a list of the connected gateway chunks - var/ready = 0 + var/ready = FALSE var/obj/machinery/gateway/centeraway/stationgate = null @@ -191,11 +189,9 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) /obj/machinery/gateway/centeraway/update_density_from_dir() return -/obj/machinery/gateway/centeraway/update_icon() - if(active) - icon_state = "oncenter" - return - icon_state = "offcenter" + +/obj/machinery/gateway/centeraway/update_icon_state() + icon_state = active ? "oncenter" : "offcenter" /obj/machinery/gateway/centeraway/proc/detect() @@ -210,18 +206,18 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) continue //this is only done if we fail to find a part - ready = 0 + ready = FALSE toggleoff() break - if(linked.len == 8) - ready = 1 + if(length(linked) == 8) + ready = TRUE -/obj/machinery/gateway/centeraway/proc/toggleon(mob/user as mob) +/obj/machinery/gateway/centeraway/proc/toggleon(mob/user) if(!ready) return - if(linked.len != 8) + if(length(linked) != 8) return if(!stationgate) stationgate = locate(/obj/machinery/gateway/centerstation) in GLOB.machines @@ -232,21 +228,21 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) calibrated = TRUE for(var/obj/machinery/gateway/G in linked) - G.active = 1 - G.update_icon() - active = 1 - update_icon() + G.active = TRUE + G.update_icon(UPDATE_ICON_STATE) + active = TRUE + update_icon(UPDATE_ICON_STATE) /obj/machinery/gateway/centeraway/proc/toggleoff() for(var/obj/machinery/gateway/G in linked) - G.active = 0 - G.update_icon() - active = 0 - update_icon() + G.active = FALSE + G.update_icon(UPDATE_ICON_STATE) + active = FALSE + update_icon(UPDATE_ICON_STATE) -/obj/machinery/gateway/centeraway/attack_hand(mob/user as mob) +/obj/machinery/gateway/centeraway/attack_hand(mob/user) add_fingerprint(user) if(!ready) detect() @@ -285,21 +281,24 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) if(M.client) M.client.move_delay = max(world.time + 5, M.client.move_delay) -/obj/machinery/gateway/centeraway/proc/exilecheck(var/mob/living/carbon/M) - for(var/obj/item/implant/exile/E in M)//Checking that there is an exile implant in the contents - if(E.imp_in == M)//Checking that it's actually implanted vs just in their pocket - to_chat(M, "The station gate has detected your exile implant and is blocking your entry.") - return 1 - return 0 -/obj/machinery/gateway/centeraway/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W,/obj/item/multitool)) +/obj/machinery/gateway/centeraway/proc/exilecheck(mob/living/carbon/user) + for(var/obj/item/implant/exile/imp in user)//Checking that there is an exile implant in the contents + if(imp.imp_in == user)//Checking that it's actually implanted vs just in their pocket + to_chat(user, "The station gate has detected your exile implant and is blocking your entry.") + return TRUE + return FALSE + + +/obj/machinery/gateway/centeraway/attackby(obj/item/W, mob/user, params) + if(ismultitool(W)) if(calibrated) to_chat(user, "The gate is already calibrated, there is no work for you to do here.") return else add_fingerprint(user) to_chat(user, "Recalibration successful!: This gate's systems have been fine tuned. Travel to this gate will now be on target.") - calibrated = 1 + calibrated = TRUE return return ..() + diff --git a/code/modules/awaymissions/map_rng.dm b/code/modules/awaymissions/map_rng.dm index 6e3a8e82e3a..30edb32fcb4 100644 --- a/code/modules/awaymissions/map_rng.dm +++ b/code/modules/awaymissions/map_rng.dm @@ -3,7 +3,7 @@ icon = 'icons/mob/screen_gen.dmi' icon_state = "x2" invisibility = INVISIBILITY_ABSTRACT - anchored = 1 + anchored = TRUE density = 0 opacity = 0 var/template_name = null diff --git a/code/modules/awaymissions/mission_code/academy.dm b/code/modules/awaymissions/mission_code/academy.dm index 3e488ba1edc..065b2749f7d 100644 --- a/code/modules/awaymissions/mission_code/academy.dm +++ b/code/modules/awaymissions/mission_code/academy.dm @@ -44,191 +44,6 @@ icon_state = "monocle" item_state = "headset" -// Die of Fate -/obj/item/dice/d20/fate - name = "\improper Die of Fate" - desc = "A die with twenty sides. You can feel unearthly energies radiating from it. Using this might be VERY risky." - icon_state = "d20" - var/reusable = TRUE - var/used = FALSE - -/obj/item/dice/d20/fate/stealth - name = "d20" - desc = "A die with twenty sides. The preferred die to throw at the GM." - -/obj/item/dice/d20/fate/one_use - reusable = FALSE - -/obj/item/dice/d20/fate/one_use/stealth - name = "d20" - desc = "A die with twenty sides. The preferred die to throw at the GM." - -/obj/item/dice/d20/fate/cursed - name = "cursed Die of Fate" - desc = "A die with twenty sides. You feel that rolling this is a REALLY bad idea." - color = "#00BB00" - - rigged = DICE_TOTALLY_RIGGED - rigged_value = 1 - -/obj/item/dice/d20/fate/diceroll(mob/user) - . = ..() - if(!used) - if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards)) - to_chat(user, "You feel the magic of the dice is restricted to ordinary humans!") - return - - if(!reusable) - used = TRUE - - var/turf/T = get_turf(src) - T.visible_message("[src] flares briefly.") - - addtimer(CALLBACK(src, PROC_REF(effect), user, .), 1 SECONDS) - -/obj/item/dice/d20/fate/equipped(mob/user, slot, initial) - . = ..() - - if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards)) - to_chat(user, "You feel the magic of the dice is restricted to ordinary humans! You should leave it alone.") - user.drop_item_ground(src) - -/obj/item/dice/d20/fate/proc/create_smoke(amount) - var/datum/effect_system/smoke_spread/smoke = new - smoke.set_up(amount, 0, drop_location()) - smoke.start() - -/obj/item/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user, roll) - var/turf/T = get_turf(src) - switch(roll) - if(1) - //Dust - T.visible_message("[user] turns to dust!") - user.dust() - if(2) - //Death - T.visible_message("[user] suddenly dies!") - user.death() - if(3) - //Swarm of creatures - T.visible_message("A swarm of creatures surround [user]!") - for(var/direction in GLOB.alldirs) - new /mob/living/simple_animal/hostile/netherworld(get_step(get_turf(user),direction)) - if(4) - //Destroy Equipment - T.visible_message("Everything [user] is holding and wearing disappears!") - for(var/obj/item/I in user) - if(istype(I, /obj/item/implant) || istype(I, /obj/item/organ)) - continue - qdel(I) - if(5) - //Monkeying - T.visible_message("[user] transforms into a monkey!") - user.monkeyize() - if(6) - //Cut speed - T.visible_message("[user] starts moving slower!") - var/datum/species/S = user.dna.species - S.speed_mod += 1 - if(7) - //Throw - T.visible_message("Unseen forces throw [user]!") - user.Stun(12 SECONDS) - user.adjustBruteLoss(50) - var/throw_dir = GLOB.cardinal - var/atom/throw_target = get_edge_target_turf(user, throw_dir) - user.throw_at(throw_target, 200, 4) - if(8) - //Fueltank Explosion - T.visible_message("An explosion bursts into existence around [user]!") - explosion(get_turf(user),-1,0,2, flame_range = 2, cause = src) - if(9) - //Cold - T.visible_message("[user] looks a little under the weather!") - var/datum/disease/virus/cold/D = new - D.Contract(user) - if(10) - //Nothing - T.visible_message("Nothing seems to happen.") - if(11) - //Cookie - T.visible_message("A cookie appears out of thin air!") - var/obj/item/reagent_containers/food/snacks/cookie/C = new(drop_location()) - create_smoke(2) - C.name = "Cookie of Fate" - if(12) - //Healing - T.visible_message("[user] looks very healthy!") - user.revive() - if(13) - //Mad Dosh - T.visible_message("Mad dosh shoots out of [src]!") - var/turf/Start = get_turf(src) - for(var/direction in GLOB.alldirs) - var/turf/dirturf = get_step(Start,direction) - if(rand(0,1)) - new /obj/item/stack/spacecash/c1000(dirturf) - else - var/obj/item/storage/bag/money/M = new(dirturf) - for(var/i in 1 to rand(5,50)) - new /obj/item/coin/gold(M) - if(14) - //Free Gun - T.visible_message("An impressive gun appears!") - create_smoke(2) - new /obj/item/gun/projectile/revolver/mateba(drop_location()) - if(15) - //Random One-use spellbook - T.visible_message("A magical looking book drops to the floor!") - create_smoke(2) - new /obj/item/spellbook/oneuse/random(drop_location()) - if(16) - //Servant & Servant Summon - T.visible_message("A Dice Servant appears in a cloud of smoke!") - var/mob/living/carbon/human/H = new(drop_location()) - create_smoke(2) - - H.equipOutfit(/datum/outfit/butler) - var/datum/mind/servant_mind = new /datum/mind() - var/datum/objective/O = new - O.owner = servant_mind - O.target = user.mind - O.explanation_text = "Serve [user.real_name]." - servant_mind.objectives += O - servant_mind.transfer_to(H) - - var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the servant of [user.real_name]?", ROLE_WIZARD, poll_time = 30 SECONDS, source = H) - if(LAZYLEN(candidates)) - var/mob/dead/observer/C = pick(candidates) - message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Dice Servant") - H.key = C.key - to_chat(H, "You are a servant of [user.real_name]. You must do everything in your power to follow their orders.") - - var/obj/effect/proc_holder/spell/summonmob/S = new - S.target_mob = H - user.mind.AddSpell(S) - - if(17) - //Tator Kit - T.visible_message("A suspicious box appears!") - new /obj/item/storage/box/syndicate(drop_location()) - create_smoke(2) - if(18) - //Captain ID - T.visible_message("A golden identification card appears!") - new /obj/item/card/id/captains_spare(drop_location()) - create_smoke(2) - if(19) - //Instrinct Resistance - T.visible_message("[user] looks very robust!") - var/datum/species/S = user.dna.species - S.brute_mod *= 0.5 - S.burn_mod *= 0.5 - - if(20) - //Free wizard! - T.visible_message("Magic flows out of [src] and into [user]!") - user.mind.make_Wizard() // Butler outfit /datum/outfit/butler diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm index 26017e4c37c..f57e3ce7ae9 100644 --- a/code/modules/awaymissions/mission_code/beach.dm +++ b/code/modules/awaymissions/mission_code/beach.dm @@ -5,7 +5,7 @@ opacity = 0 mouse_opacity = MOUSE_OPACITY_TRANSPARENT density = 0 - anchored = 1 + anchored = TRUE invisibility = INVISIBILITY_ABSTRACT var/water_frequency = 15 diff --git a/code/modules/awaymissions/mission_code/blackmarketpackers.dm b/code/modules/awaymissions/mission_code/blackmarketpackers.dm index 37f1ef8b212..dec17fd5ae8 100644 --- a/code/modules/awaymissions/mission_code/blackmarketpackers.dm +++ b/code/modules/awaymissions/mission_code/blackmarketpackers.dm @@ -188,7 +188,7 @@ icon_state = "destroyed_target_prism" /obj/machinery/broken/porta_turret/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/crowbar)) + if(I.tool_behaviour == TOOL_CROWBAR) to_chat(user, "You begin prying the metal coverings off.") if(do_after(user, 20 * I.toolspeed * gettoolspeedmod(user), target = src)) if(prob(70)) @@ -206,8 +206,7 @@ /obj/machinery/firealarm/triggered_nosignals report_fire_alarms = FALSE show_alert_level = FALSE - triggered = TRUE - icon_state = "fire1" + //Spieder spawner diff --git a/code/modules/awaymissions/mission_code/challenge.dm b/code/modules/awaymissions/mission_code/challenge.dm index 49662238100..7de2e5b8bc0 100644 --- a/code/modules/awaymissions/mission_code/challenge.dm +++ b/code/modules/awaymissions/mission_code/challenge.dm @@ -27,7 +27,7 @@ desc = "A heavy duty industrial laser" icon = 'icons/obj/engines_and_power/singularity.dmi' icon_state = "emitter" - anchored = 1 + anchored = TRUE density = 1 use_power = NO_POWER_USE diff --git a/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation.dm b/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation.dm index db62708fbbb..f067c68b895 100644 --- a/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation.dm +++ b/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation.dm @@ -100,9 +100,9 @@ /datum/outfit/oldstation/post_equip(mob/living/carbon/human/H) . = ..() - H.remove_language("Galactic Common") - H.set_default_language(GLOB.all_languages["Sol Common"]) - H.dna.species.default_language = "Sol Common" + H.remove_language(LANGUAGE_GALACTIC_COMMON) + H.set_default_language(GLOB.all_languages[LANGUAGE_SOL_COMMON]) + H.dna.species.default_language = LANGUAGE_SOL_COMMON /datum/outfit/oldstation/officer name = "Old station officer" diff --git a/code/modules/awaymissions/mission_code/ruins/USSP_gorky17.dm b/code/modules/awaymissions/mission_code/ruins/USSP_gorky17.dm index 1f8cfc6ff85..76ea3476529 100644 --- a/code/modules/awaymissions/mission_code/ruins/USSP_gorky17.dm +++ b/code/modules/awaymissions/mission_code/ruins/USSP_gorky17.dm @@ -342,7 +342,7 @@ /////////////////// Paper notes /obj/item/paper/gorky17 - language = "Neo-Russkiya" + language = LANGUAGE_NEO_RUSSIAN /obj/item/paper/gorky17/talisman name = "Проклятый талисман" info = "
"
dat += "
"
- if(cargo.len)
- for(var/obj/O in cargo)
- output += "Unload : [O]
" - for(var/mob/living/L in cargo) - output += "Unload : [L]
" - else - output += "Nothing" - output += "
"
- return output
-
-/obj/mecha/working/Destroy()
- for(var/mob/M in src)
- if(M == occupant)
- continue
- M.loc = get_turf(src)
- M.loc.Entered(M)
- step_rand(M)
- for(var/atom/movable/A in cargo)
- A.loc = get_turf(src)
- var/turf/T = get_turf(A)
- if(T)
- T.Entered(A)
- step_rand(A)
- return ..()
-
-/obj/mecha/working/ex_act(severity)
- ..()
- for(var/X in cargo)
- var/obj/O = X
- if(prob(30 / severity))
- cargo -= O
- O.forceMove(drop_location())
+ update_icon(UPDATE_OVERLAYS)
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 8e81c35e4e9..dc9fae405c7 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -23,11 +23,11 @@
return TRUE
-/atom/movable/MouseDrop_T(mob/living/M, mob/living/user)
+/atom/movable/MouseDrop_T(mob/living/dropping, mob/living/user, params)
. = ..()
- if(can_buckle && istype(M) && istype(user))
- if(user_buckle_mob(M, user))
- return TRUE
+ if(can_buckle && istype(dropping) && istype(user) && user_buckle_mob(dropping, user))
+ return TRUE
+
/atom/movable/proc/has_buckled_mobs()
return length(buckled_mobs)
diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm
index 45281197bf1..c69f4011433 100644
--- a/code/game/objects/effects/bump_teleporter.dm
+++ b/code/game/objects/effects/bump_teleporter.dm
@@ -7,7 +7,7 @@ GLOBAL_LIST_EMPTY(bump_teleporters)
var/id = null // id of this bump_teleporter.
var/id_target = null // id of bump_teleporter which this moves you to.
invisibility = INVISIBILITY_ABSTRACT // nope, can't see this
- anchored = 1
+ anchored = TRUE
density = 1
opacity = 0
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index 617ebf6d62b..535dc6d88ab 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -1,7 +1,5 @@
#define DRYING_TIME 5 * 60 * 10 //for 1 unit of depth in puddle (amount var)
-GLOBAL_LIST_EMPTY(splatter_cache)
-
/obj/effect/decal/cleanable/blood
name = "blood"
var/dryname = "dried blood"
@@ -47,10 +45,13 @@ GLOBAL_LIST_EMPTY(splatter_cache)
deltimer(dry_timer)
return ..()
-/obj/effect/decal/cleanable/blood/update_icon()
+/obj/effect/decal/cleanable/blood/update_icon(updates = ALL)
+ if(!updates)
+ return
if(basecolor == "rainbow")
basecolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]"
color = basecolor
+ . = ..()
/obj/effect/decal/cleanable/blood/proc/dry()
name = dryname
@@ -144,21 +145,27 @@ GLOBAL_LIST_EMPTY(splatter_cache)
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
no_clear = TRUE
mergeable_decal = FALSE
-
+ var/image/giblets
var/fleshcolor = "#FFFFFF"
-/obj/effect/decal/cleanable/blood/gibs/update_icon()
- var/image/giblets = new(base_icon, "[icon_state]_flesh", dir)
+
+/obj/effect/decal/cleanable/blood/gibs/update_icon(updates = ALL)
+ if(!updates)
+ return
+ giblets = new(base_icon, "[icon_state]_flesh", dir)
if(!fleshcolor || fleshcolor == "rainbow")
fleshcolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]"
giblets.color = fleshcolor
var/icon/blood = new(base_icon,"[icon_state]",dir)
-
icon = blood
- overlays.Cut()
- overlays += giblets
. = ..()
+
+/obj/effect/decal/cleanable/blood/gibs/update_overlays()
+ . = ..()
+ . += giblets
+
+
/obj/effect/decal/cleanable/blood/gibs/ex_act(severity)
return
diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm
index 4537beeb4fb..fca8e26ff43 100644
--- a/code/game/objects/effects/decals/Cleanable/robots.dm
+++ b/code/game/objects/effects/decals/Cleanable/robots.dm
@@ -11,7 +11,7 @@
/obj/effect/decal/cleanable/blood/gibs/robot/can_bloodcrawl_in()
return FALSE
-/obj/effect/decal/cleanable/blood/gibs/robot/update_icon()
+/obj/effect/decal/cleanable/blood/gibs/robot/update_icon(updates = ALL)
color = "#FFFFFF"
. = ..(NONE)
diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm
index eb09fe2599d..ecb8ef0743d 100644
--- a/code/game/objects/effects/decals/Cleanable/tracks.dm
+++ b/code/game/objects/effects/decals/Cleanable/tracks.dm
@@ -84,8 +84,8 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache)
update_icon()
-/obj/effect/decal/cleanable/blood/footprints/update_icon()
- overlays.Cut()
+/obj/effect/decal/cleanable/blood/footprints/update_overlays()
+ . = ..()
for(var/Ddir in GLOB.cardinal)
if(entered_dirs & Ddir)
@@ -97,7 +97,7 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache)
GLOB.fluidtrack_cache["entered-[blood_state]-[Ddir]"] = I
if(I)
I.color = basecolor
- overlays += I
+ . += I
if(exited_dirs & Ddir)
var/image/I
if(GLOB.fluidtrack_cache["exited-[blood_state]-[Ddir]"])
@@ -107,9 +107,10 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache)
GLOB.fluidtrack_cache["exited-[blood_state]-[Ddir]"] = I
if(I)
I.color = basecolor
- overlays += I
+ . += I
+
+ alpha = BLOODY_FOOTPRINT_BASE_ALPHA + bloodiness
- alpha = BLOODY_FOOTPRINT_BASE_ALPHA+bloodiness
/proc/createFootprintsFrom(atom/movable/A, dir, turf/T)
var/obj/effect/decal/cleanable/blood/footprints/FP = new /obj/effect/decal/cleanable/blood/footprints(T)
diff --git a/code/game/objects/effects/effect_system/effects_explosion.dm b/code/game/objects/effects/effect_system/effects_explosion.dm
index cd79ee747fe..9276465daed 100644
--- a/code/game/objects/effects/effect_system/effects_explosion.dm
+++ b/code/game/objects/effects/effect_system/effects_explosion.dm
@@ -2,7 +2,7 @@
name = "explosive particles"
icon_state = "explosion_particle"
opacity = 1
- anchored = 1
+ anchored = TRUE
/obj/effect/particle_effect/expl_particles/New()
..()
@@ -26,7 +26,7 @@
icon = 'icons/effects/96x96.dmi'
icon_state = "explosion"
opacity = 1
- anchored = 1
+ anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
pixel_x = -32
pixel_y = -32
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index 135cbffaeba..2e2d0423cc9 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -6,7 +6,7 @@
name = "foam"
icon_state = "foam"
opacity = 0
- anchored = 1
+ anchored = TRUE
density = 0
layer = OBJ_LAYER + 0.9
animate_movement = 0
@@ -37,7 +37,7 @@
var/obj/structure/foamedmetal/M = new(src.loc)
M.metal = metal
- M.updateicon()
+ M.update_state()
flick("[icon_state]-disolve", src)
sleep(5)
@@ -194,15 +194,20 @@
/obj/structure/foamedmetal/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
playsound(src.loc, 'sound/weapons/tap.ogg', 100, TRUE)
-/obj/structure/foamedmetal/proc/updateicon()
+
+/obj/structure/foamedmetal/proc/update_state()
if(metal == MFOAM_ALUMINUM)
- icon_state = "metalfoam"
max_integrity = 20
obj_integrity = max_integrity
else
- icon_state = "ironfoam"
max_integrity = 50
obj_integrity = max_integrity
+ update_icon(UPDATE_ICON_STATE)
+
+
+/obj/structure/foamedmetal/update_icon_state()
+ icon_state = (metal == MFOAM_ALUMINUM) ? "metalfoam" : "ironfoam"
+
/obj/structure/foamedmetal/attack_hand(mob/user)
user.changeNext_move(CLICK_CD_MELEE)
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index 2cba4ad52fc..e234ab15f1b 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -11,7 +11,7 @@
pixel_x = -32
pixel_y = -32
opacity = 1
- anchored = 0
+ anchored = FALSE
var/steps = 0
var/lifetime = 5
var/direction
diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm
index a721820fdd0..64eeee49057 100644
--- a/code/game/objects/effects/forcefields.dm
+++ b/code/game/objects/effects/forcefields.dm
@@ -3,7 +3,7 @@
name = "FORCEWALL"
icon = 'icons/effects/effects.dmi'
icon_state = "m_shield"
- anchored = 1
+ anchored = TRUE
opacity = 0
density = 1
var/lifetime = 30 SECONDS
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index a3fb5959215..5eae820fe87 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -3,7 +3,7 @@
icon = 'icons/misc/landmarks.dmi'
icon_state = "standart"
layer = 5
- anchored = 1.0
+ anchored = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
/obj/effect/landmark/New()
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 820f7357954..d7a5d31501e 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -2,7 +2,7 @@
name = "dummy mine"
desc = "I Better stay away from that thing."
density = 0
- anchored = 1
+ anchored = TRUE
icon = 'icons/obj/items.dmi'
icon_state = "uglyminearmed"
var/triggered = 0
diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
index 0a8de954cab..8d7ee82c1fb 100644
--- a/code/game/objects/effects/misc.dm
+++ b/code/game/objects/effects/misc.dm
@@ -23,13 +23,13 @@
icon = 'icons/obj/items.dmi'
icon_state = "strangepresent"
density = 1
- anchored = 0
+ anchored = FALSE
/obj/effect/mark
var/mark = ""
icon = 'icons/misc/mark.dmi'
icon_state = "blank"
- anchored = 1
+ anchored = TRUE
layer = 99
plane = HUD_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
@@ -50,12 +50,12 @@
name = "begin"
icon = 'icons/obj/stationobjs.dmi'
icon_state = "begin"
- anchored = 1.0
+ anchored = TRUE
/obj/effect/projection
name = "Projection"
desc = "This looks like a projection of something."
- anchored = 1.0
+ anchored = TRUE
/obj/effect/shut_controller
@@ -69,7 +69,7 @@
icon_state = "showcase_1"
desc = "A stand with the empty body of a cyborg bolted to it."
density = 1
- anchored = 1
+ anchored = TRUE
/obj/effect/spawner
name = "object spawner"
@@ -121,3 +121,19 @@
. = ..()
if(!ismob(loc))
return INITIALIZE_HINT_QDEL
+
+/obj/effect/frosty_breath //used only for unathi firebreath, so... yeah..
+ icon = 'icons/effects/effects.dmi'
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ layer = ABOVE_MOB_LAYER
+ anchored = TRUE
+
+/obj/effect/frosty_breath/Initialize(mapload, mob/living/carbon/C)
+ . = ..()
+ dir = C.dir
+ if(C.buckled)
+ pixel_y = (C.buckled.buckle_offset + 10)
+ if(dir == NORTH)
+ layer = BELOW_MOB_LAYER
+ flick("breath_[C.lying_prev]", src)
+ QDEL_IN(src, 2 SECONDS)
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index c7e66b6226e..abf62b88a03 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -24,7 +24,7 @@
icon_state = "palm1"
density = 1
layer = 5
- anchored = 1
+ anchored = TRUE
/obj/effect/overlay/palmtree_l
name = "Palm tree"
@@ -32,7 +32,7 @@
icon_state = "palm2"
density = 1
layer = 5
- anchored = 1
+ anchored = TRUE
/obj/effect/overlay/coconut
name = "Coconuts"
@@ -54,7 +54,7 @@
name = "Wallrot"
desc = "Ick..."
icon = 'icons/effects/wallrot.dmi'
- anchored = 1
+ anchored = TRUE
density = 1
layer = 5
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index ffe8b4a9e48..a8813512a65 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -125,6 +125,9 @@
/obj/item/wirecutters = 10,
/obj/item/wrench = 40,
/obj/item/relic = 35,
+ /obj/item/weaponcrafting/revolverbarrel = 3,
+ /obj/item/weaponcrafting/revolverbarrel/steel = 2,
+ /obj/item/ammo_box/magazine/internal/cylinder/improvised/steel = 2,
/obj/item/weaponcrafting/receiver = 2,
/obj/item/clothing/gloves/knuckles = 1,
/obj/item/clothing/shoes/brown = 30,
@@ -162,7 +165,7 @@
/obj/item/storage/pill_bottle/fakedeath = 2,
/obj/item/storage/box/syndie_kit/mr_chang_technique = 1,
/obj/item/clothing/glasses/chameleon/meson = 7,
- "" = 68
+ "" = 61
)
/obj/effect/spawner/lootdrop/crate_spawner // for ruins
diff --git a/code/game/objects/effects/spawners/windowspawner.dm b/code/game/objects/effects/spawners/windowspawner.dm
index 5f19720b481..0ce1cbc4eb3 100644
--- a/code/game/objects/effects/spawners/windowspawner.dm
+++ b/code/game/objects/effects/spawners/windowspawner.dm
@@ -5,7 +5,7 @@
var/useFull = 0
var/useGrille = 1
var/windowtospawn = /obj/structure/window/basic
- anchored = 1 // No sliding out while you prime
+ anchored = TRUE // No sliding out while you prime
/obj/effect/spawner/window/Initialize()
. = ..()
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 5a9d0b5ee6f..a52929e1997 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -92,7 +92,7 @@
name = "spiderling"
desc = "It never stays still for long."
icon_state = "spiderling"
- anchored = 0
+ anchored = FALSE
layer = 2.75
max_integrity = 3
var/amount_grown = 0
@@ -247,7 +247,7 @@
desc = "Green squishy mess."
icon = 'icons/effects/effects.dmi'
icon_state = "greenshatter"
- anchored = 1
+ anchored = TRUE
/obj/structure/spider/cocoon
name = "cocoon"
diff --git a/code/game/objects/effects/temporary_visuals/cult.dm b/code/game/objects/effects/temporary_visuals/cult.dm
index a1b2d4320a9..6ee3c867931 100644
--- a/code/game/objects/effects/temporary_visuals/cult.dm
+++ b/code/game/objects/effects/temporary_visuals/cult.dm
@@ -44,6 +44,12 @@
icon_state = "space"
duration = 600
layer = ABOVE_OBJ_LAYER
+ var/from_lava = FALSE
+
+
+/obj/effect/temp_visual/cult/portal/update_icon_state()
+ icon_state = from_lava ? "lava" : "space"
+
/obj/effect/temp_visual/emp/cult
name = "cult emp sparks"
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 66b816090af..f78054226c0 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -267,7 +267,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g
msg += "No tech origins detected." - for(var/mob/living/L in cargo) - output += "Unload : [L]
" - else - output += "Nothing" - output += "
" - if(materials.len) + if(length(materials)) msg += "Extractable materials:
" for(var/mat in materials) msg += "[CallMaterialName(mat)]
" //Capitize first word, remove the "$" @@ -532,6 +532,12 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g if((src == user.l_ear || src == user.r_ear) && (user.head.flags_inv & HIDEHEADSETS)) return TRUE + if(user.wear_mask) + if(src == user.glasses && (user.wear_mask.flags_inv & HIDEGLASSES)) + return TRUE + if((src == user.l_ear || src == user.r_ear) && (user.wear_mask.flags_inv & HIDEHEADSETS)) + return TRUE + return FALSE @@ -1153,12 +1159,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g /obj/item/update_atom_colour() . = ..() - if(!is_equipped()) - return update_equipped_item() - for(var/action in actions) - var/datum/action/myaction = action - myaction.UpdateButtonIcon() /obj/item/proc/add_tape() diff --git a/code/game/objects/items/ashtray.dm b/code/game/objects/items/ashtray.dm index 251b95fdadc..31c0cdee0c7 100644 --- a/code/game/objects/items/ashtray.dm +++ b/code/game/objects/items/ashtray.dm @@ -49,47 +49,73 @@ pixel_y = rand(-5, 5) pixel_x = rand(-6, 6) + /obj/item/storage/ashtray/attackby(obj/item/I, mob/user, params) if(!can_be_inserted(I)) return - handle_item_insertion(I) - if(istype(I, /obj/item/clothing/mask/cigarette)) - var/obj/item/clothing/mask/cigarette/cig = I - if(cig.lit == TRUE) - visible_message("[user] crushes [cig] in [src], putting it out.") - var/obj/item/butt = new cig.type_butt(src) - cig.transfer_fingerprints_to(butt) - qdel(cig) - if(cig.lit == FALSE) - visible_message("[user] places [cig] in [src] without even smoking it. Why did [user.p_they()] do that?") - return - visible_message("[user] places [I] in [src].") -/obj/item/storage/ashtray/update_icon() - if(contents.len == storage_slots) + var/is_cig = istype(I, /obj/item/clothing/mask/cigarette) + if(is_cig || istype(I, /obj/item/cigbutt) || istype(I, /obj/item/match)) + if(!user.drop_item_ground(I)) + return + + handle_item_insertion(I) + + var/message_done = FALSE + if(is_cig) + var/obj/item/clothing/mask/cigarette/cig = I + if(cig.lit) + message_done = TRUE + visible_message("[user] crushes [cig] in [src], putting it out.") + var/obj/item/butt = new cig.type_butt(src) + cig.transfer_fingerprints_to(butt) + qdel(cig) + else + to_chat(user, "You place [cig] in [src] without even smoking it. Why would you do that?") + + if(!message_done) + visible_message("[user] places [I] in [src].") + add_fingerprint(user) + update_appearance(UPDATE_DESC|UPDATE_ICON_STATE) + + +/obj/item/storage/ashtray/update_icon_state() + if(length(contents) == storage_slots) icon_state = icon_full - desc = initial(desc) + " It's stuffed full." - return - if(contents.len >= storage_slots * 0.5) + else if(length(contents) > storage_slots * 0.5) icon_state = icon_half - desc = initial(desc) + " It's half-filled." - return - if(contents.len < storage_slots * 0.5) + else icon_state = initial(icon_state) + + +/obj/item/storage/ashtray/update_desc(updates = ALL) + . = ..() + if(length(contents) == storage_slots) + desc = initial(desc) + " It's stuffed full." + else if(length(contents) > storage_slots * 0.5) + desc = initial(desc) + " It's half-filled." + else desc = initial(desc) + +/obj/item/storage/ashtray/proc/empty_tray() + for(var/obj/item/I in contents) + I.forceMove(loc) + update_appearance(UPDATE_DESC|UPDATE_ICON_STATE) + + /obj/item/storage/ashtray/deconstruct() var/obj/item/trash/broken_ashtray/shards = new(get_turf(src)) - shards.icon_state = src.icon_broken + shards.icon_state = icon_broken visible_message("Oops, [src] broke into a lot of pieces!") return ..() + /obj/item/storage/ashtray/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) - if(contents.len) - for(var/obj/item/I in contents) - I.forceMove(loc) - update_icon() + if(length(contents)) visible_message("[src] slams into [hit_atom] spilling its contents!") + empty_tray() if(rand(1,20) > max_integrity) deconstruct() return ..() + diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index da89819b411..6a8f6d0fece 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -23,45 +23,55 @@ close_sound = 'sound/items/zip.ogg' open_sound_volume = 15 close_sound_volume = 15 + density = FALSE + integrity_failure = FALSE var/item_path = /obj/item/bodybag - density = 0 - integrity_failure = 0 -/obj/structure/closet/body_bag/attackby(W as obj, mob/user as mob, params) - if(istype(W, /obj/item/pen)) - var/t = rename_interactive(user, W) +/obj/structure/closet/body_bag/attackby(obj/item/I, mob/user, params) + if(is_pen(I)) + var/t = rename_interactive(user, I) if(isnull(t)) return - cut_overlays() if(t) - add_fingerprint(user) - add_overlay(image(icon, "bodybag_label")) + update_icon(UPDATE_OVERLAYS) return - if(istype(W, /obj/item/wirecutters)) - add_fingerprint(user) - to_chat(user, "You cut the tag off the bodybag") - name = "body bag" - cut_overlays() + if(I.tool_behaviour == TOOL_WIRECUTTER) + to_chat(user, "You cut the tag off the bodybag.") + name = initial(name) + update_icon(UPDATE_OVERLAYS) return return ..() /obj/structure/closet/body_bag/close() if(..()) - density = 0 - return 1 - return 0 + density = FALSE + return TRUE + return FALSE -/obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location) - . = ..() - if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) - if(!ishuman(usr) || opened || length(contents)) - return FALSE - visible_message("[usr] folds up the [name]") +/obj/structure/closet/body_bag/update_icon_state() + icon_state = opened ? icon_opened : icon_closed + + +/obj/structure/closet/body_bag/update_overlays() + . = list() + if(name != initial(name)) + . += "bodybag_label" + + +/obj/structure/closet/body_bag/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) + if(over_object == usr && ishuman(usr) && !usr.incapacitated() && !opened && !length(contents) && usr.Adjacent(src)) + usr.visible_message( + span_notice("[usr] folds up [src]."), + span_notice("You fold up [src]."), + ) new item_path(get_turf(src)) qdel(src) + return FALSE + return ..() + /obj/structure/closet/body_bag/relaymove(mob/user as mob) if(user.stat) @@ -72,8 +82,3 @@ if(!open()) to_chat(user, "It won't budge!") -/obj/structure/closet/body_bag/update_icon() - if(!opened) - icon_state = icon_closed - else - icon_state = icon_opened diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index d25e23e1b0f..cb50ac08180 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -1,3 +1,7 @@ +#define TALL_CANDLE 1 +#define MID_CANDLE 2 +#define SHORT_CANDLE 3 + /obj/item/candle name = "red candle" desc = "In Greek myth, Prometheus stole fire from the Gods and gave it to humankind. The jewelry he kept for himself." @@ -6,36 +10,40 @@ item_state = "candle1" w_class = WEIGHT_CLASS_TINY var/wax = 200 - var/lit = 0 - var/infinite = 0 - var/start_lit = 0 + /// Index for the icon state + var/wax_index = TALL_CANDLE + var/lit = FALSE + var/infinite = FALSE + var/start_lit = FALSE + var/flickering = FALSE light_color = "#E09D37" -/obj/item/candle/New() - ..() + +/obj/item/candle/Initialize(mapload) + . = ..() if(start_lit) // No visible message light(show_message = 0) + /obj/item/candle/Destroy() STOP_PROCESSING(SSobj, src) return ..() -/obj/item/candle/update_icon() - var/i - if(wax>150) - i = 1 - else if(wax>80) - i = 2 - else i = 3 - icon_state = "candle[i][lit ? "_lit" : ""]" + +/obj/item/candle/update_icon_state() + if(flickering) + icon_state = "candle[wax_index]_flicker" + else + icon_state = "candle[wax_index][lit ? "_lit" : ""]" + /obj/item/candle/can_enter_storage(obj/item/storage/S, mob/user) if(lit) to_chat(user, "[S] can't hold [src] while it's lit!") return FALSE - else - return TRUE + return TRUE + /obj/item/candle/attackby(obj/item/W, mob/user, params) if(is_hot(W)) @@ -43,16 +51,19 @@ return return ..() + /obj/item/candle/welder_act(mob/user, obj/item/I) . = TRUE if(I.tool_use_check(user, 0)) //Don't need to flash eyes because you are a badass light("[user] casually lights the [name] with [I], what a badass.") + /obj/item/candle/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) if(!lit) light() //honk return ..() + /obj/item/candle/proc/light(show_message) if(!lit) lit = 1 @@ -60,7 +71,32 @@ usr.visible_message(show_message) set_light(CANDLE_LUM) START_PROCESSING(SSobj, src) - update_icon() + update_icon(UPDATE_ICON_STATE) + + +/obj/item/candle/proc/update_wax_index() + var/new_wax_index + if(wax > 150) + new_wax_index = TALL_CANDLE + else if(wax > 80) + new_wax_index = MID_CANDLE + else + new_wax_index = SHORT_CANDLE + if(wax_index != new_wax_index) + wax_index = new_wax_index + return TRUE + return FALSE + + +/obj/item/candle/proc/start_flickering() + flickering = TRUE + update_icon(UPDATE_ICON_STATE) + addtimer(CALLBACK(src, PROC_REF(stop_flickering)), 4 SECONDS, TIMER_UNIQUE) + + +/obj/item/candle/proc/stop_flickering() + flickering = FALSE + update_icon(UPDATE_ICON_STATE) /obj/item/candle/process() @@ -68,28 +104,49 @@ return if(!infinite) wax-- + if(wax_index != SHORT_CANDLE) // It's not at its shortest + if(update_wax_index()) + update_icon(UPDATE_ICON_STATE) if(!wax) - new/obj/item/trash/candle(src.loc) - if(istype(src.loc, /mob)) - var/mob/M = src.loc - M.temporarily_remove_item_from_inventory(src, force = TRUE) //src is being deleted anyway + new/obj/item/trash/candle(loc) + if(ismob(loc)) + var/mob/holder = loc + holder.drop_item_ground(src, force = TRUE) //src is being deleted anyway qdel(src) - update_icon() if(isturf(loc)) //start a fire if possible var/turf/T = loc T.hotspot_expose(700, 5) +/obj/item/candle/proc/unlight() + if(lit) + lit = FALSE + update_icon(UPDATE_ICON_STATE) + set_light(0) + + /obj/item/candle/attack_self(mob/user) if(lit) user.visible_message("[user] snuffs out [src].") - lit = 0 - update_icon() - set_light(0) + unlight() + + +/obj/item/candle/get_spooked() + if(lit) + start_flickering() + playsound(src, 'sound/effects/candle_flicker.ogg', 15, TRUE) + return TRUE + return FALSE + /obj/item/candle/eternal desc = "A candle. This one seems to have an odd quality about the wax." - infinite = 1 + infinite = TRUE + + +/obj/item/candle/eternal/wizard + desc = "A candle. It smells like magic, so that would explain why it burns brighter." + start_lit = TRUE /obj/item/candle/extinguish_light(force = FALSE) @@ -97,3 +154,9 @@ return infinite = FALSE wax = 1 // next process will burn it out + + +#undef TALL_CANDLE +#undef MID_CANDLE +#undef SHORT_CANDLE + diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 95abc042be1..c8cc639f123 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -271,8 +271,7 @@ switch(choice) if("Toggle Cap") to_chat(user, "You [capped ? "Remove" : "Replace"] the cap of the [src]") - capped = capped ? 0 : 1 - icon_state = "spraycan[capped ? "_cap" : ""]" + capped = !capped update_icon() if("Change Drawing") ..() @@ -304,8 +303,13 @@ playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) ..() -/obj/item/toy/crayon/spraycan/update_icon() - overlays.Cut() - var/image/I = image('icons/obj/crayons.dmi',icon_state = "[capped ? "spraycan_cap_colors" : "spraycan_colors"]") + +/obj/item/toy/crayon/spraycan/update_icon_state() + icon_state = "spraycan[capped ? "_cap" : ""]" + + +/obj/item/toy/crayon/spraycan/update_overlays() + . = ..() + var/image/I = image('icons/obj/crayons.dmi', icon_state = "[capped ? "spraycan_cap_colors" : "spraycan_colors"]") I.color = colour - overlays += I + . += I diff --git a/code/game/objects/items/decorations.dm b/code/game/objects/items/decorations.dm index 20727a73635..bb53edb459c 100644 --- a/code/game/objects/items/decorations.dm +++ b/code/game/objects/items/decorations.dm @@ -226,7 +226,7 @@ icon = 'icons/obj/decorations.dmi' icon_state = "" density = 1 - anchored = 0 + anchored = FALSE max_integrity = 100 /obj/structure/decorative_structures/fireplace @@ -234,7 +234,7 @@ desc = "Looks warm and comfy." icon = 'icons/obj/fireplace.dmi' icon_state = "fireplace" - anchored = 1 + anchored = TRUE density = 0 pixel_x = -16 @@ -246,7 +246,7 @@ /obj/structure/decorative_structures/garland density = 0 - anchored = 1 + anchored = TRUE max_integrity = 100 icon_state = "xmaslights" @@ -419,7 +419,7 @@ name = "Bloody crystal" icon_state = "cult_crystal" max_integrity = 120 - anchored = 1 + anchored = TRUE /obj/structure/decorative_structures/cult_crystal/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index 4cb4a70f3ef..9042d5eda79 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -8,7 +8,8 @@ origin_tech = "magnets=1;biotech=1" var/list/datum/autopsy_data_scanner/wdata = list() var/list/chemtraces = list() - var/target_name = null + var/target_UID = null + var/target_name = null // target.name can change after scanning, so better save it here. var/timeofdeath = null /obj/item/autopsy_scanner/Destroy() @@ -86,7 +87,7 @@ if(timeofdeath) scan_data += "Time of death: [station_time_timestamp("hh:mm:ss", timeofdeath)]
" else - scan_data += "Time of death: Unknown / Still alive
" + scan_data += "Time of death: No data
" if(wdata.len) var/n = 1 @@ -136,7 +137,7 @@ for(var/chemID in chemtraces) scan_data += chemID scan_data += "
" - user.visible_message("[src] rattles and prints out a sheet of paper.") + user.visible_message(span_notice("[src] rattles and prints out a sheet of paper.")) playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) flick("autopsy_scanner_anim", src) @@ -145,7 +146,7 @@ var/obj/item/paper/P = new(drop_location()) P.name = "Autopsy Data ([target_name])" P.info = "[scan_data]" - P.overlays += "paper_words" + P.update_icon() user.put_in_hands(P, ignore_anim = FALSE) @@ -156,20 +157,21 @@ if(!can_operate(M)) return - if(target_name != M.name) + if(target_UID != M.UID()) + to_chat(user, span_notice("A new patient has been registered.[target_UID ? " Purging data for previous patient." : ""]")) + target_UID = M.UID() target_name = M.name wdata.Cut() chemtraces.Cut() timeofdeath = null - to_chat(user, "A new patient has been registered. Purging data for previous patient.") timeofdeath = M.timeofdeath var/obj/item/organ/external/S = M.get_organ(user.zone_selected) if(!S) - to_chat(user, "You can't scan this body part.") + to_chat(user, span_warning("You can't scan this body part!")) return - M.visible_message("[user] scans the wounds on [M]'s [S] with [src]") + M.visible_message(span_notice("[user] scans the wounds on [M]'s [S] with [src].")) add_data(S) - return 1 + return TRUE diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 71c180ccdcb..edb3a437360 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -21,15 +21,27 @@ var/can_overcharge = TRUE //set this to FALSE if you don't want your flash to be overcharge capable var/use_sound = 'sound/weapons/flash.ogg' + +/obj/item/flash/update_icon_state() + icon_state = "[initial(icon_state)][broken ? "burnt" : ""]" + + +/obj/item/flash/update_overlays() + . = ..() + if(overcharged) + . += "overcharge" + + /obj/item/flash/proc/clown_check(mob/user) if(user && (CLUMSY in user.mutations) && prob(50)) flash_carbon(user, user, 30 SECONDS, 0) return FALSE return TRUE + /obj/item/flash/attackby(obj/item/W, mob/user, params) if(can_overcharge) - if(istype(W, /obj/item/screwdriver)) + if(W.tool_behaviour == TOOL_SCREWDRIVER) if(battery_panel) to_chat(user, "You close the battery compartment on the [src].") battery_panel = FALSE @@ -41,17 +53,18 @@ to_chat(user, "You jam the cell into battery compartment on the [src].") qdel(W) overcharged = TRUE - overlays += "overcharge" + update_icon(UPDATE_OVERLAYS) + /obj/item/flash/random/New() ..() if(prob(25)) broken = TRUE - icon_state = "[initial(icon_state)]burnt" + update_icon(UPDATE_ICON_STATE) /obj/item/flash/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something. broken = TRUE - icon_state = "[initial(icon_state)]burnt" + update_icon(UPDATE_ICON_STATE) visible_message("The [src.name] burns out!") diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index bdab186f156..65a5885b425 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -13,38 +13,39 @@ var/brightness_on = 4 //luminosity when on var/togglesound = 'sound/weapons/empty.ogg' + /obj/item/flashlight/Initialize() . = ..() + update_brightness() + + +/obj/item/flashlight/update_icon_state() if(on) icon_state = "[initial(icon_state)]-on" - set_light(brightness_on) else - icon_state = initial(icon_state) - set_light(0) + icon_state = "[initial(icon_state)]" + -/obj/item/flashlight/proc/update_brightness(var/mob/user = null) +/obj/item/flashlight/proc/update_brightness() if(on) - icon_state = "[initial(icon_state)]-on" set_light(brightness_on) else - icon_state = initial(icon_state) set_light(0) + update_icon() + /obj/item/flashlight/attack_self(mob/user) if(!isturf(user.loc)) - to_chat(user, "You cannot turn the light on while in this [user.loc].")//To prevent some lighting anomalities. - - return 0 + to_chat(user, "You cannot turn the light on while in this [user.loc].") //To prevent some lighting anomalities. + return FALSE on = !on playsound(user, togglesound, 100, 1) - update_brightness(user) - for(var/X in actions) - var/datum/action/A = X - A.UpdateButtonIcon() - return 1 + update_brightness() + update_equipped_item() + return TRUE -/obj/item/flashlight/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/flashlight/attack(mob/living/M, mob/living/user) add_fingerprint(user) if(on && user.zone_selected == BODY_ZONE_PRECISE_EYES) @@ -174,10 +175,29 @@ var/fuel_lower = 800 var/fuel_upp = 1000 -/obj/item/flashlight/flare/New() + +/obj/item/flashlight/flare/Initialize() fuel = rand(fuel_lower, fuel_upp) + . = ..() + + +/obj/item/flashlight/flare/Destroy() + STOP_PROCESSING(SSobj, src) + return ..() + + +/obj/item/flashlight/flare/update_icon_state() + if(on) + item_state = "[initial(item_state)]-on" + else + item_state = "[initial(item_state)]" + + if(!fuel) + icon_state = "[initial(icon_state)]-empty" + return ..() + /obj/item/flashlight/flare/process() var/turf/pos = get_turf(src) if(pos && produce_heat) @@ -185,33 +205,17 @@ fuel = max(fuel - 1, 0) if(!fuel || !on) turn_off() - if(!fuel) - src.icon_state = "[initial(icon_state)]-empty" STOP_PROCESSING(SSobj, src) -/obj/item/flashlight/flare/Destroy() - STOP_PROCESSING(SSobj, src) - return ..() /obj/item/flashlight/flare/proc/turn_off() - on = 0 - src.force = initial(src.force) - src.damtype = initial(src.damtype) - if(ismob(loc)) - var/mob/U = loc - update_brightness(U) - else - update_brightness(null) + on = FALSE + force = initial(force) + damtype = initial(damtype) + update_brightness() -/obj/item/flashlight/flare/update_brightness(var/mob/user = null) - ..() - if(on) - item_state = "[initial(item_state)]-on" - else - item_state = "[initial(item_state)]" /obj/item/flashlight/flare/attack_self(mob/user) - // Usual checks if(!fuel) to_chat(user, "[src] is out of fuel.") @@ -224,10 +228,12 @@ // All good, turn it on. if(.) user.visible_message("[user] activates [src].", "You activate [src].") - src.force = on_damage - src.damtype = "fire" + if(produce_heat) + force = on_damage + damtype = BURN START_PROCESSING(SSobj, src) + // GLOWSTICKS /obj/item/flashlight/flare/glowstick @@ -242,27 +248,26 @@ produce_heat = 0 fuel_lower = 1600 fuel_upp = 2000 + blocks_emissive = FALSE + /obj/item/flashlight/flare/glowstick/Initialize() light_color = color ..() -/obj/item/flashlight/flare/glowstick/update_icon() - item_state = "glowstick" - cut_overlays() + +/obj/item/flashlight/flare/glowstick/update_icon_state() if(!fuel) icon_state = "glowstick-empty" - cut_overlays() - update_brightness(0) - else if(on) + + +/obj/item/flashlight/flare/glowstick/update_overlays() + . = ..() + if(on) var/mutable_appearance/glowstick_overlay = mutable_appearance(icon, "glowstick-glow") glowstick_overlay.color = color - add_overlay(glowstick_overlay) - item_state = "glowstick-on" - update_brightness(brightness_on) - else - icon_state = "glowstick" - cut_overlays() + . += glowstick_overlay + /obj/item/flashlight/flare/glowstick/red name = "red glowstick" @@ -335,12 +340,10 @@ materials = list() on = TRUE //Bio-luminesence has one setting, on. -/obj/item/flashlight/slime/New() - ..() - set_light(brightness_on) - spawn(1) //Might be sloppy, but seems to be necessary to prevent further runtimes and make these work as intended... don't judge me! - update_brightness() - icon_state = initial(icon_state) + +/obj/item/flashlight/slime/update_icon_state() + return + /obj/item/flashlight/slime/attack_self(mob/user) return //Bio-luminescence does not toggle. @@ -360,10 +363,11 @@ var/charge_tick = 0 -/obj/item/flashlight/emp/New() - ..() +/obj/item/flashlight/emp/Initialize() + . = ..() START_PROCESSING(SSobj, src) + /obj/item/flashlight/emp/Destroy() STOP_PROCESSING(SSobj, src) return ..() @@ -376,13 +380,15 @@ emp_cur_charges = min(emp_cur_charges+1, emp_max_charges) return TRUE -/obj/item/flashlight/emp/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/flashlight/emp/attack(mob/living/M, mob/living/user) if(on && user.zone_selected == BODY_ZONE_PRECISE_EYES) // call original attack proc only if aiming at the eyes ..() return -/obj/item/flashlight/emp/afterattack(atom/A as mob|obj, mob/user, proximity) - if(!proximity) return + +/obj/item/flashlight/emp/afterattack(atom/A, mob/user, proximity) + if(!proximity) + return if(emp_cur_charges > 0) emp_cur_charges -= 1 if(ismob(A)) @@ -392,7 +398,7 @@ A.emp_act(1) else to_chat(user, "\The [src] needs time to recharge!") - return + /obj/item/flashlight/spotlight //invisible lighting source name = "disco light" diff --git a/code/game/objects/items/devices/handheld_defib.dm b/code/game/objects/items/devices/handheld_defib.dm index 0f604428fca..dbf0e4c7b6d 100644 --- a/code/game/objects/items/devices/handheld_defib.dm +++ b/code/game/objects/items/devices/handheld_defib.dm @@ -12,6 +12,15 @@ var/cooldown = FALSE var/charge_time = 100 var/emagged = FALSE + var/shocking = FALSE + + +/obj/item/handheld_defibrillator/update_icon_state() + if(shocking) + icon_state = "[icon_base]-shock" + return + icon_state = "[icon_base][cooldown ? "-off" : "-on"]" + /obj/item/handheld_defibrillator/emag_act(mob/user) if(!emagged) @@ -83,19 +92,22 @@ else to_chat(user, span_danger("[H] has a hardsuit!")) cooldown = TRUE - icon_state = "[icon_base]-shock" - addtimer(CALLBACK(src, PROC_REF(short_charge)), 10) + shocking = TRUE + update_icon(UPDATE_ICON_STATE) + addtimer(CALLBACK(src, PROC_REF(short_charge)), 1 SECONDS) addtimer(CALLBACK(src, PROC_REF(recharge)), charge_time) else to_chat(user, span_notice("[src]'s on board medical scanner indicates that no shock is required.")) /obj/item/handheld_defibrillator/proc/short_charge() - icon_state = "[icon_base]-off" + shocking = FALSE + update_icon(UPDATE_ICON_STATE) + /obj/item/handheld_defibrillator/proc/recharge() cooldown = FALSE - icon_state = "[icon_base]-on" + update_icon(UPDATE_ICON_STATE) playsound(loc, "sound/weapons/flash.ogg", 75, 1) /obj/item/handheld_defibrillator/syndie diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index f06b2e28add..0d4eb278382 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -16,6 +16,7 @@ var/recharging = 0 var/recharge_locked = 0 var/obj/item/stock_parts/micro_laser/diode //used for upgrading! + var/is_pointing = FALSE /obj/item/laser_pointer/red @@ -42,6 +43,9 @@ diode = new /obj/item/stock_parts/micro_laser/ultra +/obj/item/laser_pointer/update_icon_state() + icon_state = "pointer[is_pointing ? "_[pointer_icon_state]" : ""]" + /obj/item/laser_pointer/attack(mob/living/M, mob/user) laser_act(M, user) @@ -55,7 +59,7 @@ else to_chat(user, "[src] already has a cell.") - else if(istype(W, /obj/item/screwdriver)) + else if(W.tool_behaviour == TOOL_SCREWDRIVER) if(diode) to_chat(user, "You remove the [diode.name] from the [src].") diode.loc = get_turf(src.loc) @@ -64,12 +68,12 @@ ..() return -/obj/item/laser_pointer/afterattack(var/atom/target, var/mob/living/user, flag, params) +/obj/item/laser_pointer/afterattack(atom/target, mob/living/user, flag, params) if(flag) //we're placing the object on a table or in backpack return laser_act(target, user, params) -/obj/item/laser_pointer/proc/laser_act(var/atom/target, var/mob/living/user, var/params) +/obj/item/laser_pointer/proc/laser_act(atom/target, mob/living/user, params) if( !(user in (viewers(7,target))) ) return if(!diode) @@ -135,11 +139,9 @@ outmsg = "You missed the lens of [C] with [src]." //laser pointer image - icon_state = "pointer_[pointer_icon_state]" - var/list/showto = list() - for(var/mob/M in viewers(7,targloc)) - if(M.client) - showto.Add(M.client) + is_pointing = TRUE + update_icon(UPDATE_ICON_STATE) + addtimer(CALLBACK(src, PROC_REF(stop_pointing)), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT) var/image/I = image('icons/obj/weapons/projectiles.dmi',targloc,pointer_icon_state,10) var/list/click_params = params2list(params) if(click_params) @@ -165,8 +167,13 @@ to_chat(user, "You've overused the battery of [src], now it needs time to recharge!") recharge_locked = 1 - flick_overlay(I, showto, 10) - icon_state = "pointer" + flick_overlay_view(I, 1 SECONDS) + + +/obj/item/laser_pointer/proc/stop_pointing() + is_pointing = FALSE + update_icon(UPDATE_ICON_STATE) + /obj/item/laser_pointer/process() if(prob(20 - recharge_locked*5)) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index dc75d59db96..a2c3066ccc7 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -115,7 +115,7 @@ qdel(L) return - if(istype(I, /obj/item/storage)) + if(isstorage(I)) var/obj/item/storage/S = I var/found_lightbulbs = FALSE var/replaced_something = TRUE @@ -154,16 +154,29 @@ /obj/item/lightreplacer/emag_act(mob/user) if(!emagged) + emagged = TRUE add_attack_logs(user, src, "emagged") - Emag() + playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + update_appearance(UPDATE_NAME|UPDATE_ICON_STATE) + + +/obj/item/lightreplacer/update_name(updates = ALL) + . = ..() + if(emagged) + name = "shortcircuited [initial(name)]" + else + name = initial(name) + + +/obj/item/lightreplacer/update_icon_state() + icon_state = "lightreplacer[emagged]" + /obj/item/lightreplacer/attack_self(mob/user) for(var/obj/machinery/light/target in user.loc) ReplaceLight(target, user) to_chat(user, status_string()) -/obj/item/lightreplacer/update_icon() - icon_state = "lightreplacer[emagged]" /obj/item/lightreplacer/proc/status_string() return "It has [uses] light\s remaining (plus [bulb_shards] fragment\s)." @@ -229,14 +242,6 @@ to_chat(U, "There is a working [target.fitting] already inserted!") return -/obj/item/lightreplacer/proc/Emag() - emagged = !emagged - playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - if(emagged) - name = "shortcircuited [initial(name)]" - else - name = initial(name) - update_icon() /obj/item/lightreplacer/proc/CanUse(mob/living/user) add_fingerprint(user) diff --git a/code/game/objects/items/devices/memorizer.dm b/code/game/objects/items/devices/memorizer.dm index a58b541cb8f..b894e9c7967 100644 --- a/code/game/objects/items/devices/memorizer.dm +++ b/code/game/objects/items/devices/memorizer.dm @@ -18,6 +18,17 @@ var/can_overcharge = FALSE //set this to FALSE if you don't want your flash to be overcharge capable var/use_sound = 'sound/weapons/flash.ogg' + +/obj/item/memorizer/update_icon_state() + icon_state = "memorizer[broken ? "burnt" : ""]" + + +/obj/item/memorizer/update_overlays() + . = ..() + if(overcharged) + . += "overcharge" + + /obj/item/memorizer/proc/clown_check(mob/user) if(user && (CLUMSY in user.mutations) && prob(50)) memorize_carbon(user, user, 15, FALSE) @@ -27,7 +38,7 @@ /obj/item/memorizer/attackby(obj/item/W, mob/user, params) if(!can_overcharge) return - if(istype(W, /obj/item/screwdriver)) + if(W.tool_behaviour == TOOL_SCREWDRIVER) battery_panel = !battery_panel if(battery_panel) to_chat(user, "You open the battery compartment on the [src].") @@ -39,12 +50,13 @@ to_chat(user, "You jam the cell into battery compartment on the [src].") qdel(W) overcharged = TRUE - overlays += "overcharge" + update_icon(UPDATE_OVERLAYS) + /obj/item/memorizer/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something. broken = TRUE - icon_state = "[initial(icon_state)]burnt" - visible_message("The [src.name] burns out!") + update_icon(UPDATE_ICON_STATE) + visible_message("The [name] burns out!") /obj/item/memorizer/proc/flash_recharge(var/mob/user) @@ -163,7 +175,7 @@ custom_objective.owner = fucking_target.mind fucking_target.mind.objectives += custom_objective fucking_target.mind.lost_memory = TRUE - var/list/messages = list(fucking_target.mind.prepare_announce_objectives()) + var/list/messages = list(fucking_target.mind.prepare_announce_objectives()) to_chat(fucking_target, chat_box_red(chat_box_red(messages.Join("
")))) last_used = world.time if(fucking_target.weakeyes) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index ca05f5d7173..69cc00a81b3 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -523,7 +523,7 @@ /obj/item/paper/pai_upgrade name = "Инструкция по применению" - icon_state = "paper" + icon_state = "paper_words" info = {"
В набор СпИИ входит:
@@ -548,7 +548,7 @@ 5.Термальное зрение для пИИ
"} -/obj/item/paper/pai_upgrade/update_icon() +/obj/item/paper/pai_upgrade/update_icon_state() return /obj/item/storage/box/syndie_kit/pai diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index b49b1012c89..481b8a83772 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -5,22 +5,53 @@ icon_state = "pizzabox1" throw_range = 1 var/timer = 10 //Adjustable timer - var/timer_set = 0 - var/primed = 0 - var/disarmed = 0 + var/timer_set = FALSE + var/primed = FALSE + var/disarmed = FALSE var/wires = list("orange", "green", "blue", "yellow", "aqua", "purple") var/correct_wire var/armer //Used for admin purposes + +/obj/item/pizza_bomb/update_icon_state() + if(disarmed) + icon_state = "pizzabox_bomb_[correct_wire]" + return + if(primed || !timer_set) + icon_state = "pizzabox_bomb" + return + icon_state = "pizzabox1" + + +/obj/item/pizza_bomb/update_name(updates) + . = ..() + if(timer_set && !disarmed) + name = "pizza box" + else + name = "pizza bomb" + + +/obj/item/pizza_bomb/update_desc(updates) + . = ..() + if(disarmed) + desc = "A devious contraption, made of a small explosive payload hooked up to pressure-sensitive wires. It's disarmed." + return + if(primed) + desc = "OH GOD THAT'S NOT A PIZZA" + return + if(timer_set) + desc = "A box suited for pizzas." + else + desc = "It seems inactive." + + /obj/item/pizza_bomb/attack_self(mob/user) if(disarmed) to_chat(user, "\The [src] is disarmed.") return + if(!timer_set) - name = "pizza bomb" - desc = "It seems inactive." - icon_state = "pizzabox_bomb" - timer_set = 1 + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) timer = (input(user, "Set a timer, from one second to ten seconds.", "Timer", "[timer]") as num) * 10 if(!in_range(src, usr) || issilicon(usr) || !usr.canmove || usr.restrained()) timer_set = 0 @@ -29,25 +60,23 @@ icon_state = "pizzabox1" return timer = clamp(timer, 10, 100) - icon_state = "pizzabox1" + timer_set = TRUE + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) to_chat(user, "You set the timer to [timer / 10] before activating the payload and closing \the [src].") message_admins("[key_name_admin(usr)] has set a timer on a pizza bomb to [timer/10] seconds at [ADMIN_COORDJMP(loc)].") add_game_logs("has set the timer on a pizza bomb to [timer/10] seconds [COORD(loc)].", usr) armer = usr - name = "pizza box" - desc = "A box suited for pizzas." return + if(!primed) - name = "pizza bomb" - desc = "OH GOD THAT'S NOT A PIZZA" - icon_state = "pizzabox_bomb" audible_message("[bicon(src)] *beep* *beep*") to_chat(user, "That's no pizza! That's a bomb!") message_admins("[key_name_admin(usr)] has triggered a pizza bomb armed by [armer] at [ADMIN_COORDJMP(loc)].") add_game_logs("has triggered a pizza bomb armed by [armer] [COORD(loc)].", usr) - primed = 1 - sleep(timer) - return go_boom() + primed = TRUE + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) + addtimer(CALLBACK(src, PROC_REF(go_boom)), timer) + /obj/item/pizza_bomb/proc/go_boom() if(disarmed) @@ -58,8 +87,9 @@ explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb qdel(src) -/obj/item/pizza_bomb/attackby(var/obj/item/I, var/mob/user, params) - if(istype(I, /obj/item/wirecutters) && primed) + +/obj/item/pizza_bomb/attackby(obj/item/I, mob/user, params) + if(I.tool_behaviour == TOOL_WIRECUTTER && primed) to_chat(user, "Oh God, what wire do you cut?!") var/chosen_wire = input(user, "OH GOD OH GOD", "WHAT WIRE?!") in wires if(!in_range(src, usr) || issilicon(usr) || !usr.canmove || usr.restrained()) @@ -68,19 +98,17 @@ user.visible_message("[user] cuts the [chosen_wire] wire!", "You cut the [chosen_wire] wire!") sleep(5) if(chosen_wire == correct_wire) - src.audible_message("[bicon(src)] \The [src] suddenly stops beeping and seems lifeless.") + audible_message("[bicon(src)] \The [src] suddenly stops beeping and seems lifeless.") to_chat(user, "You did it!") - icon_state = "pizzabox_bomb_[correct_wire]" - name = "pizza bomb" - desc = "A devious contraption, made of a small explosive payload hooked up to pressure-sensitive wires. It's disarmed." - disarmed = 1 - primed = 0 + disarmed = TRUE + primed = FALSE + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) return else to_chat(user, "WRONG WIRE!") go_boom() return - if(istype(I, /obj/item/wirecutters) && disarmed) + if(I.tool_behaviour == TOOL_WIRECUTTER && disarmed) if(!in_range(user, src)) to_chat(user, "You can't see the box well enough to cut the wires out.") return diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 60260b00bbb..6d471e726bd 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -30,7 +30,7 @@ attached = null return ..() -/obj/item/powersink/update_icon() +/obj/item/powersink/update_icon_state() icon_state = "powersink[mode == OPERATING]" /obj/item/powersink/proc/set_mode(value) @@ -60,7 +60,7 @@ density = TRUE mode = value - update_icon() + update_icon(UPDATE_ICON_STATE) set_light(0) /obj/item/powersink/screwdriver_act(mob/user, obj/item/I) @@ -135,8 +135,8 @@ if(A.operating && A.cell) A.cell.charge = max(0, A.cell.charge - 50) power_drained += 50 - if(A.charging == 2) // If the cell was full - A.charging = 1 // It's no longer full + if(A.charging == APC_FULLY_CHARGED) // If the cell was full + A.charging = APC_IS_CHARGING // It's no longer full if(drained >= drain_rate) break diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index d1ec25ddb21..9aabaf85c89 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -103,7 +103,7 @@ /obj/item/radio/beacon/engine desc = "A label on it reads: Warning: This device is used for transportation of high-density objects used for high-yield power generation. Stay away!." - anchored = 1 //Let's not move these around. Some folk might get the idea to use these for assassinations + anchored = TRUE //Let's not move these around. Some folk might get the idea to use these for assassinations var/list/enginetype = list() /obj/item/radio/beacon/engine/Initialize(mapload) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 0b593561771..a140942f86f 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -9,16 +9,17 @@ w_class = WEIGHT_CLASS_HUGE materials = list(MAT_METAL=10000, MAT_GLASS=2500) var/code = 2 + var/intensivity = TRUE -/obj/item/radio/electropack/attack_hand(mob/user as mob) +/obj/item/radio/electropack/attack_hand(mob/user) if(src == user.back) - to_chat(user, "You need help taking this off!") - return 0 + to_chat(user, span_notice("You need help taking this off!")) + return FALSE . = ..() /obj/item/radio/electropack/Destroy() - if(istype(src.loc, /obj/item/assembly/shock_kit)) - var/obj/item/assembly/shock_kit/S = src.loc + if(istype(loc, /obj/item/assembly/shock_kit)) + var/obj/item/assembly/shock_kit/S = loc if(S.part1 == src) S.part1 = null else if(S.part2 == src) @@ -26,17 +27,17 @@ master = null return ..() -/obj/item/radio/electropack/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/radio/electropack/attackby(obj/item/W, mob/user, params) ..() if(istype(W, /obj/item/clothing/head/helmet)) if(!b_stat) - to_chat(user, "[src] is not ready to be attached!") + to_chat(user, span_notice("[src] is not ready to be attached!")) return var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit(drop_location()) A.icon = 'icons/obj/assemblies.dmi' if(!user.drop_transfer_item_to_loc(W, A)) - to_chat(user, "\the [W] is stuck to your hand, you cannot attach it to \the [src]!") + to_chat(user, span_notice("\the [W] is stuck to your hand, you cannot attach it to \the [src]!")) return W.master = A A.part1 = W @@ -47,26 +48,21 @@ user.put_in_hands(A, ignore_anim = FALSE) A.add_fingerprint(user) - if(src.flags & NODROP) + if(flags & NODROP) A.flags |= NODROP - /obj/item/radio/electropack/receive_signal(datum/signal/signal) if(!signal || signal.encryption != code) return if(isliving(loc) && on) var/mob/living/M = loc - var/turf/T = M.loc - if(istype(T, /turf)) - if(!M.moved_recently && M.last_move) - M.moved_recently = 1 - step(M, M.last_move) - sleep(50) - if(M) - M.moved_recently = 0 - to_chat(M, "You feel a sharp shock!") - do_sparks(3, 1, M) + if(isturf(M.loc) && M.last_move && intensivity) + step(M, M.last_move) + intensivity = FALSE + addtimer(CALLBACK(src, PROC_REF(intensify)), 5 SECONDS) + to_chat(M, span_userdanger("You feel a sharp shock!")) + do_sparks(3, TRUE, M) M.Weaken(10 SECONDS) @@ -74,6 +70,8 @@ master.receive_signal() return +/obj/item/radio/electropack/proc/intensify() + intensivity = TRUE /obj/item/radio/electropack/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 58c73fcbb45..bf5cf828ba5 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -60,11 +60,11 @@ /obj/item/radio/headset/handle_message_mode(mob/living/M, list/message_pieces, channel) if(channel == "special") if(translate_binary) - var/datum/language/binary = GLOB.all_languages["Robot Talk"] + var/datum/language/binary = GLOB.all_languages[LANGUAGE_BINARY] binary.broadcast(M, strip_prefixes(multilingual_to_message(message_pieces))) return RADIO_CONNECTION_NON_SUBSPACE if(translate_hive) - var/datum/language/hivemind = GLOB.all_languages["Hivemind"] + var/datum/language/hivemind = GLOB.all_languages[LANGUAGE_HIVE_XENOS] hivemind.broadcast(M, strip_prefixes(multilingual_to_message(message_pieces))) return RADIO_CONNECTION_NON_SUBSPACE return RADIO_CONNECTION_FAIL diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 5ffd2ae7b7d..5f5ea340c48 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -2,14 +2,16 @@ name = "station intercom (General)" desc = "Talk through this." icon_state = "intercom" - anchored = 1 + anchored = TRUE w_class = WEIGHT_CLASS_BULKY canhear_range = 2 flags = CONDUCT - var/circuitry_installed = 1 + blocks_emissive = FALSE + var/circuitry_installed = TRUE var/buildstage = 0 dog_fashion = null + /obj/item/radio/intercom/custom name = "station intercom (Custom)" broadcasting = 0 @@ -53,8 +55,8 @@ if(direction) setDir(direction) set_pixel_offsets_from_dir(28, -28, 28, -28) - b_stat=1 - on = 0 + b_stat = TRUE + on = FALSE GLOB.global_intercoms.Add(src) update_icon() @@ -66,7 +68,7 @@ ..() internal_channels = list( num2text(PUB_FREQ) = list(), - num2text(SEC_I_FREQ) = list(ACCESS_SECURITY) + num2text(SEC_I_FREQ) = list(ACCESS_SECURITY), ) /obj/item/radio/intercom/syndicate @@ -173,12 +175,12 @@ return if(!I.use_tool(src, user, 10, volume = I.tool_volume) || buildstage != 2) return - update_icon() - on = 1 - b_stat = 0 + update_icon(UPDATE_ICON_STATE) + on = TRUE + b_stat = FALSE buildstage = 3 to_chat(user, "You secure the electronics!") - update_icon() + update_icon(UPDATE_ICON_STATE) update_operating_status() for(var/i, i<= 5, i++) wires.on_cut(i, 1) @@ -191,8 +193,8 @@ return WIRECUTTER_SNIP_MESSAGE new /obj/item/stack/cable_coil(get_turf(src),5) - on = 0 - b_stat = 1 + on = FALSE + b_stat = TRUE buildstage = 1 update_icon() update_operating_status(FALSE) @@ -209,12 +211,18 @@ new /obj/item/mounted/frame/intercom(get_turf(src)) qdel(src) -/obj/item/radio/intercom/update_icon() +/obj/item/radio/intercom/update_icon_state() if(!circuitry_installed) icon_state="intercom-frame" return icon_state = "intercom[!on?"-p":""][b_stat ? "-open":""]" +/obj/item/radio/intercom/update_overlays() + . = ..() + underlays.Cut() + if(on && buildstage == 3) + underlays += emissive_appearance(icon, "intercom_lightmask") + /obj/item/radio/intercom/proc/update_operating_status(on = TRUE) var/area/current_area = get_area(src) if(!current_area) @@ -236,8 +244,10 @@ var/area/current_area = get_area(src) if(!current_area) on = FALSE + set_light(0) else on = current_area.powered(EQUIP) // set "on" to the equipment power status of our area. + set_light(1, LIGHTING_MINIMUM_POWER) update_icon() /obj/item/intercom_electronics diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 49de0c3c080..928bb79a3a1 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -11,21 +11,22 @@ REAGENT SCANNER desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." icon = 'icons/obj/device.dmi' icon_state = "t-ray0" - var/on = 0 + base_icon_state = "t-ray" + var/on = FALSE slot_flags = SLOT_BELT - w_class = 2 w_class = WEIGHT_CLASS_SMALL item_state = "electronic" materials = list(MAT_METAL=150) origin_tech = "magnets=1;engineering=1" var/scan_range = 1 - var/pulse_duration = 10 + var/pulse_duration = 1 SECONDS /obj/item/t_scanner/extended_range name = "T-ray сканер расширенной дальности" desc = "Излучатель и сканер терагерцевого излучения, используемый для обнаружения скрытых объектов и объектов под полом, таких как кабели и трубы. \ \nДанная модель обладает расширенным радиусом действия." icon_state = "t-ray-range0" + base_icon_state = "t-ray-range" scan_range = 3 origin_tech = "magnets=3;engineering=3" materials = list(MAT_METAL=300) @@ -35,7 +36,8 @@ REAGENT SCANNER desc = "Излучатель и сканер терагерцевого излучения, используемый для обнаружения скрытых объектов и объектов под полом, таких как кабели и трубы. \ \nДанная модель способна генерировать более продолжительные импульсы." icon_state = "t-ray-pulse0" - pulse_duration = 50 + base_icon_state = "t-ray-pulse" + pulse_duration = 5 SECONDS origin_tech = "magnets=5;engineering=3" materials = list(MAT_METAL=300) @@ -44,8 +46,9 @@ REAGENT SCANNER desc = "Излучатель и сканер терагерцевого излучения, используемый для обнаружения скрытых объектов и объектов под полом, таких как кабели и трубы. \ \nДанная модель способна генерировать более продолжительные импульсы и обладает расширенным радиусом действия." icon_state = "t-ray-advanced0" + base_icon_state = "t-ray-advanced" scan_range = 3 - pulse_duration = 50 + pulse_duration = 5 SECONDS origin_tech = "magnets=7;engineering=3" materials = list(MAT_METAL=300) @@ -54,8 +57,9 @@ REAGENT SCANNER desc = "Излучатель и сканер терагерцевого излучения, используемый для обнаружения скрытых объектов и объектов под полом, таких как кабели и трубы. \ \nВысокотехнологичная модель, способная генерировать очень продолжительные импульсы в пределах большого радиуса." icon_state = "t-ray-science0" + base_icon_state = "t-ray-science" scan_range = 5 - pulse_duration = 100 + pulse_duration = 10 SECONDS origin_tech = "magnets=8;engineering=5" materials = list(MAT_METAL=500) @@ -65,8 +69,9 @@ REAGENT SCANNER \nЭкспериментальный образец, обладающий расширенным радиусом действия и более продолжительным импульсом. \ \nСудя по его виду, эта вещь была собрана безумными учеными в ходе спонтанных экспериментов." icon_state = "t-ray-experimental0" + base_icon_state = "t-ray-experimental" scan_range = 3 - pulse_duration = 80 + pulse_duration = 8 SECONDS origin_tech = null materials = list() resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF @@ -76,14 +81,19 @@ REAGENT SCANNER STOP_PROCESSING(SSobj, src) return ..() -/obj/item/t_scanner/attack_self(mob/user) +/obj/item/t_scanner/update_icon_state() + icon_state = "[base_icon_state][on]" +/obj/item/t_scanner/proc/toggle_mode() on = !on - icon_state = copytext(icon_state, 1, length(icon_state))+"[on]" - + update_icon(UPDATE_ICON_STATE) if(on) START_PROCESSING(SSobj, src) + else + STOP_PROCESSING(SSobj, src) +/obj/item/t_scanner/attack_self(mob/user) + toggle_mode() /obj/item/t_scanner/process() if(!on) @@ -92,48 +102,41 @@ REAGENT SCANNER scan() /obj/item/t_scanner/proc/scan() + t_ray_scan(loc, pulse_duration, scan_range) - for(var/turf/scan_turf in range(scan_range, src.loc) ) - - if(!scan_turf.intact) +/proc/t_ray_scan(mob/viewer, flick_time, distance) + if(!ismob(viewer) || !viewer.client) + return + var/list/t_ray_images = list() + for(var/atom/movable/in_turf_atom in orange(distance, viewer)) + if(!isobj(in_turf_atom) && !isliving(in_turf_atom)) continue - for(var/obj/in_turf_object in scan_turf.contents) - + if(isobj(in_turf_atom)) + var/obj/in_turf_object = in_turf_atom if(in_turf_object.level != 1) continue - var/temp_invisibility = in_turf_object.invisibility - var/temp_alpha = in_turf_object.alpha - if(temp_invisibility == INVISIBILITY_ABSTRACT || temp_invisibility == INVISIBILITY_ANOMALY) - in_turf_object.invisibility = 0 - in_turf_object.alpha = 128 - in_turf_object.drain_act_protected = TRUE - if(in_turf_object.layer < TURF_LAYER) - in_turf_object.layer += TRAY_SCAN_LAYER_OFFSET - spawn(pulse_duration) - in_turf_object.plane = GAME_PLANE - if(in_turf_object) - var/turf/objects_turf = in_turf_object.loc - if(objects_turf && objects_turf.intact) - in_turf_object.invisibility = temp_invisibility - in_turf_object.alpha = temp_alpha - in_turf_object.drain_act_protected = FALSE - for(var/mob/living/in_turf_mob in scan_turf.contents) - var/oldalpha = in_turf_mob.alpha - if(in_turf_mob.alpha < 255 && istype(in_turf_mob)) - in_turf_mob.alpha = 255 - spawn(10) - if(in_turf_mob) - in_turf_mob.alpha = oldalpha - - var/mob/living/in_turf_mob = locate() in scan_turf - - if(in_turf_mob && in_turf_mob.invisibility == INVISIBILITY_LEVEL_TWO) - in_turf_mob.invisibility = 0 - spawn(2) - if(in_turf_mob) - in_turf_mob.invisibility = INVISIBILITY_LEVEL_TWO + if(in_turf_object.invisibility != INVISIBILITY_MAXIMUM && in_turf_object.invisibility != INVISIBILITY_ANOMALY) + continue + + if(isliving(in_turf_atom)) + var/mob/living/in_turf_living = in_turf_atom + if(!(in_turf_living.alpha < 255 || in_turf_living.invisibility == INVISIBILITY_LEVEL_TWO)) + continue + + var/image/I = new(loc = get_turf(in_turf_atom)) + var/mutable_appearance/MA = new(in_turf_atom) + MA.alpha = isliving(in_turf_atom) ? 255 : 128 + MA.dir = in_turf_atom.dir + if(MA.layer < TURF_LAYER) + MA.layer += TRAY_SCAN_LAYER_OFFSET + MA.plane = GAME_PLANE + I.appearance = MA + t_ray_images += I + + if(length(t_ray_images)) + flick_overlay(t_ray_images, list(viewer.client), flick_time) /obj/item/t_scanner/security name = "Противо-маскировочное ТГц устройство" @@ -143,13 +146,14 @@ REAGENT SCANNER righthand_file = 'icons/mob/inhands/items_righthand.dmi' item_state = "sb_t-ray" icon_state = "sb_t-ray0" + base_icon_state = "sb_t-ray" scan_range = 2 - pulse_duration = 30 var/was_alerted = FALSE // Protection against spam alerts from this scanner var/burnt = FALSE // Did emp break us? var/datum/effect_system/spark_spread/spark_system //The spark system, used for generating... sparks? origin_tech = "combat=3;magnets=5;biotech=5" + /obj/item/t_scanner/security/Initialize() . = ..() //Sets up a spark system @@ -157,43 +161,67 @@ REAGENT SCANNER spark_system.set_up(5, 0, src) spark_system.attach(src) + +/obj/item/t_scanner/security/update_icon_state() + if(burnt) + icon_state = "[base_icon_state]_burnt" + return + icon_state = "[base_icon_state][on]" + + +/obj/item/t_scanner/security/update_desc(updates = ALL) + . = ..() + if(!burnt) + desc = initial(desc) + return + desc = "Излучатель терагерцевого типа используемый для сканирования области на наличие замаскированных биоорганизмов. Устройство сгорело, теперь можно обнаружить разве что крошки от пончика оставшиеся на нём..." + + /obj/item/t_scanner/security/attack_self(mob/user) if(!burnt) on = !on - icon_state = copytext(icon_state, 1, length(icon_state))+"[on]" + update_icon(UPDATE_ICON_STATE) if(on) - START_PROCESSING(SSobj, src) + START_PROCESSING(SSprocessing, src) + else + STOP_PROCESSING(SSprocessing, src) + /obj/item/t_scanner/security/emp_act(severity) . = ..() if(prob(25) && !burnt) burnt = TRUE - on = FALSE; - icon_state = copytext(icon_state, 1, length(icon_state))+"_burnt" - desc = "Излучатель терагерцевого типа используемый для сканирования области на наличие замаскированных биоорганизмов. Устройство сгорело, теперь можно обнаружить разве что крошки от пончика оставшиеся на нём..." + on = FALSE + update_appearance(UPDATE_ICON_STATE|UPDATE_DESC) playsound(loc, "sparks", 50, TRUE, 5) spark_system.start() -/obj/item/t_scanner/security/scan() +/obj/item/t_scanner/security/scan() + var/mob/viewer = loc + if(!ismob(viewer) || !viewer.client) + return new /obj/effect/temp_visual/scan(get_turf(src)) - var/list/mobs_in_range = viewers(scan_range, get_turf(src)) - for(var/mob/living/in_turf_mob in mobs_in_range) - var/oldalpha = in_turf_mob.alpha - if(in_turf_mob.alpha < 255 && istype(in_turf_mob)) - in_turf_mob.alpha = 255 - alert_searchers(in_turf_mob) - spawn(pulse_duration) - if(in_turf_mob) - in_turf_mob.alpha = oldalpha - if(in_turf_mob && in_turf_mob.invisibility == INVISIBILITY_LEVEL_TWO) - in_turf_mob.invisibility = 0 - alert_searchers(in_turf_mob) - spawn(pulse_duration) - if(in_turf_mob) - in_turf_mob.invisibility = INVISIBILITY_LEVEL_TWO + var/list/t_ray_images = list() + for(var/mob/living/in_turf_living in viewers(scan_range, get_turf(src))) + if(!(in_turf_living.alpha < 255 || in_turf_living.invisibility == INVISIBILITY_LEVEL_TWO)) + continue + + var/image/I = new(loc = get_turf(in_turf_living)) + var/mutable_appearance/MA = new(in_turf_living) + MA.alpha = 255 + MA.dir = in_turf_living.dir + if(MA.layer < TURF_LAYER) + MA.layer += TRAY_SCAN_LAYER_OFFSET + MA.plane = GAME_PLANE + I.appearance = MA + t_ray_images += I + alert_searchers(in_turf_living) + + if(length(t_ray_images)) + flick_overlay(t_ray_images, list(viewer.client), pulse_duration) /obj/item/t_scanner/security/proc/alert_searchers(mob/living/found_mob) var/list/alerted = viewers(7, found_mob) @@ -601,6 +629,13 @@ REAGENT SCANNER if(0) to_chat(usr, "Сканер больше не показывает повреждения конечностей.") + +/obj/item/healthanalyzer/update_overlays() + . = ..() + if(advanced) + . += "advanced" + + /obj/item/healthanalyzer/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/healthupgrade)) if(advanced) @@ -608,9 +643,9 @@ REAGENT SCANNER else if(user.drop_transfer_item_to_loc(I, src)) to_chat(user, "Вы установили модуль обновления на [src].") - add_overlay("advanced") playsound(loc, I.usesound, 50, 1) advanced = TRUE + update_icon(UPDATE_OVERLAYS) qdel(I) return return ..() @@ -620,7 +655,7 @@ REAGENT SCANNER /obj/item/healthanalyzer/advanced/Initialize(mapload) . = ..() - add_overlay("advanced") + update_icon(UPDATE_OVERLAYS) /obj/item/healthupgrade @@ -787,6 +822,7 @@ REAGENT SCANNER var/obj/item/stock_parts/cell/cell var/cell_type = /obj/item/stock_parts/cell/upgraded var/ready = TRUE // Ready to scan + var/printing = FALSE var/time_to_use = 0 // How much time remaining before next scan is available. var/usecharge = 750 var/scan_time = 10 SECONDS //how long does it take to scan @@ -817,17 +853,24 @@ REAGENT SCANNER playsound(src, 'sound/machines/defib_saftyon.ogg', 50, 0) update_icon() -/obj/item/bodyanalyzer/update_icon(printing = FALSE) - overlays.Cut() - var/percent = cell.percent() + +/obj/item/bodyanalyzer/update_icon_state() + if(!cell) + icon_state = "bodyanalyzer_0" + return if(ready) icon_state = "bodyanalyzer_1" else icon_state = "bodyanalyzer_2" + +/obj/item/bodyanalyzer/update_overlays() + . = ..() + var/percent = cell.percent() var/overlayid = round(percent / 10) - overlayid = "bodyanalyzer_charge[overlayid]" - overlays += icon(icon, overlayid) + . += "bodyanalyzer_charge[overlayid]" + if(printing) + . += "bodyanalyzer_printing" /obj/item/bodyanalyzer/attack(mob/living/M, mob/living/carbon/human/user) @@ -845,6 +888,7 @@ REAGENT SCANNER to_chat(user, "The scanner beeps angrily at you! It's out of charge!") playsound(user.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) + /obj/item/bodyanalyzer/borg/attack(mob/living/M, mob/living/silicon/robot/user) if(user.incapacitated() || !user.Adjacent(M)) return @@ -858,6 +902,7 @@ REAGENT SCANNER else to_chat(user, "You need to recharge before you can use [src]") + /obj/item/bodyanalyzer/proc/mobScan(mob/living/M, mob/user) if(ishuman(M)) var/report = generate_printing_text(M, user) @@ -867,8 +912,6 @@ REAGENT SCANNER printout.info = report printout.name = "Scan report - [M.name]" playsound(user.loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) - flick("bodyanalyzer_anim", src) - sleep(3 SECONDS) user.put_in_hands(printout, ignore_anim = FALSE) time_to_use = world.time + scan_cd if(isrobot(user)) @@ -877,14 +920,16 @@ REAGENT SCANNER else cell.use(usecharge) ready = FALSE - update_icon(TRUE) + printing = TRUE + update_icon() addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/bodyanalyzer, setReady)), scan_cd) - addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 20) - + addtimer(VARSET_CALLBACK(src, printing, FALSE), 1.4 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), UPDATE_OVERLAYS), 1.5 SECONDS) else if(iscorgi(M) && M.stat == DEAD) to_chat(user, "You wonder if [M.p_they()] was a good dog. [src] tells you they were the best...") // :'( playsound(loc, 'sound/machines/ping.ogg', 50, 0) ready = FALSE + update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/bodyanalyzer, setReady)), scan_cd) time_to_use = world.time + scan_cd else diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm index d0a65408d5b..4a81ccd38d1 100644 --- a/code/game/objects/items/devices/sensor_device.dm +++ b/code/game/objects/items/devices/sensor_device.dm @@ -17,23 +17,20 @@ QDEL_NULL(crew_monitor) return ..() -/obj/item/sensor_device/attack_self(mob/user as mob) +/obj/item/sensor_device/attack_self(mob/user) ui_interact(user) -/obj/item/sensor_device/MouseDrop(atom/over) +/obj/item/sensor_device/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) . = ..() if(!.) return FALSE var/mob/user = usr - if(istype(over, /obj/screen)) - return FALSE - if(user.incapacitated() || !ishuman(user)) return FALSE - if(over == user) + if(over_object == user) attack_self(user) return TRUE diff --git a/code/game/objects/items/devices/signmaker.dm b/code/game/objects/items/devices/signmaker.dm index 64da2cfc406..6d163a7105e 100644 --- a/code/game/objects/items/devices/signmaker.dm +++ b/code/game/objects/items/devices/signmaker.dm @@ -29,22 +29,25 @@ return qdel(sign) sign = null - update_icon() + update_icon(UPDATE_ICON_STATE) + /obj/item/signmaker/proc/icon_flick() set waitfor = FALSE - icon_state = "signmaker_clown_on" pointer_busy = TRUE - sleep(10) + update_icon(UPDATE_ICON_STATE) + sleep(1 SECONDS) pointer_busy = FALSE - icon_state = "signmaker_clown_off" + update_icon(UPDATE_ICON_STATE) + -/obj/item/signmaker/update_icon() - if(sign) - icon_state = "signmaker_clown_on" - else +/obj/item/signmaker/update_icon_state() + if(pointer_busy) icon_state = "signmaker_clown_off" + return + icon_state = "signmaker_clown_[sign ? "on" : "off"]]" + /obj/item/signmaker/emag_act(mob/user) add_attack_logs(user, src, "emagged") diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 98c77e2f95a..218f4d6e7b3 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -36,7 +36,7 @@ ..() if(starts_with_tape) mytape = new /obj/item/tape/random(src) - update_icon() + update_icon(UPDATE_ICON_STATE) soundloop = new(list(src)) @@ -60,7 +60,7 @@ . += span_notice("[mytape] has [mytape.remaining_capacity] seconds remaining.") // to avoid having 0 minutes else . += span_notice("[mytape] has [seconds_to_time(mytape.remaining_capacity)] remaining.") - . += span_notice("Alt-Click to access the tape.") + . += span_info("Alt-Click to access the tape.") /obj/item/taperecorder/proc/update_sound() @@ -70,7 +70,7 @@ soundloop.start() -/obj/item/taperecorder/update_icon() +/obj/item/taperecorder/update_icon_state() if(!mytape) icon_state = "taperecorder_empty" else if(recording) @@ -82,7 +82,7 @@ /obj/item/taperecorder/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) - mytape.ruin() //Fires destroy the tape + mytape?.ruin() //Fires destroy the tape return ..() @@ -91,7 +91,7 @@ mytape = I to_chat(user, span_notice("You insert [I] into [src].")) playsound(src, 'sound/items/taperecorder/taperecorder_close.ogg', 50, FALSE) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/taperecorder/attack_hand(mob/user) @@ -150,7 +150,7 @@ mytape.forceMove_turf() user.put_in_hands(mytape, ignore_anim = FALSE) mytape = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/taperecorder/proc/record() @@ -167,7 +167,7 @@ recording = TRUE recorder_say("Запись началась.") update_sound() - update_icon() + update_icon(UPDATE_ICON_STATE) mytape.timestamp += mytape.used_capacity var/datum/tape_piece/piece = new() piece.time = mytape.used_capacity @@ -209,7 +209,7 @@ if(!playback_override) recorder_say("Проигрывание остановлено.") playing = FALSE - update_icon() + update_icon(UPDATE_ICON_STATE) update_sound() @@ -229,7 +229,7 @@ return playing = TRUE - update_icon() + update_icon(UPDATE_ICON_STATE) update_sound() recorder_say("Проигрывание началось.") playsound(src, 'sound/items/taperecorder/taperecorder_play.ogg', 50, FALSE) @@ -317,18 +317,18 @@ var/obj/item/paper/transcript = new /obj/item/paper(drop_location()) - var/t1 = "Transcript:
" + var/list/paper_info = list("Transcript:
") for(var/i = 1, length(mytape.storedinfo) >= i, i++) var/datum/tape_piece/piece = mytape.storedinfo[i] - t1 += "\[[time2text(piece.time * 10,"mm:ss")]\] " + paper_info += "\[[time2text(piece.time * 10,"mm:ss")]\] " if(piece.speaker_name) - t1 += "[piece.speaker_name] " + paper_info += "[piece.speaker_name] " if(piece.message_verb) - t1 += "[piece.message_verb], \"[piece.message]\"
" + paper_info += "[piece.message_verb], \"[replace_characters(piece.message, list("+"))]\"
" else - t1 += "[piece.message]
" + paper_info += "[replace_characters(piece.message, list("+"))]
" - transcript.info = t1 + transcript.info = paper_info.Join("") transcript.name = "paper- 'Transcript'" cooldown = world.time + 3 SECONDS @@ -377,6 +377,12 @@ . += span_notice("It has [seconds_to_time(remaining_capacity)] remaining.") +/obj/item/tape/update_overlays() + . = ..() + if(ruined) + . += "ribbonoverlay" + + /obj/item/tape/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) ..() ruin() @@ -414,14 +420,14 @@ to_chat(user, span_notice("You pull the tape out of [src].")) if(!ruined) - overlays += "ribbonoverlay" ruined = TRUE + update_icon(UPDATE_OVERLAYS) /obj/item/tape/proc/fix() if(ruined) - overlays -= "ribbonoverlay" ruined = FALSE + update_icon(UPDATE_OVERLAYS) /obj/item/tape/verb/wipe() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 43f06e5b5dd..c0d5b223e9d 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -29,15 +29,17 @@ effective or pretty fucking useless. var/charges = 3 + /obj/item/batterer/examine(mob/user) . = ..() - . += "[src] has [charges] charges left." + . += span_notice("[src] has [charges] charges left.") + /obj/item/batterer/attack_self(mob/living/carbon/user, flag = 0, emp = 0) if(!user) return if(charges == 0) - to_chat(user, "The mind batterer is out of charge!") + to_chat(user, span_danger("The mind batterer is out of charge!")) return @@ -46,17 +48,18 @@ effective or pretty fucking useless. M.Weaken(rand(2,6) SECONDS) M.adjustStaminaLoss(rand(35, 60)) add_attack_logs(user, M, "Stunned with [src]") - to_chat(M, "You feel a tremendous, paralyzing wave flood your mind.") + to_chat(M, span_danger("You feel a tremendous, paralyzing wave flood your mind.")) else - to_chat(M, "You feel a sudden, electric jolt travel through your head.") + to_chat(M, span_danger("You feel a sudden, electric jolt travel through your head.")) M.Slowed(10 SECONDS) M.Confused(6 SECONDS) playsound(loc, 'sound/misc/interference.ogg', 50, 1) charges-- - to_chat(user, "You trigger [src]. It has [charges] charges left.") + to_chat(user,span_notice("You trigger [src]. It has [charges] charges left.")) addtimer(CALLBACK(src, PROC_REF(recharge)), 3 MINUTES) + /obj/item/batterer/proc/recharge() charges++ @@ -92,31 +95,43 @@ effective or pretty fucking useless. var/wavelength = 10 // time it takes for the radiation to kick in, in seconds var/used = 0 // is it cooling down? -/obj/item/rad_laser/attack(mob/living/M, mob/living/user) - if(!used) - add_attack_logs(user, M, "Irradiated by [src]") - user.visible_message("[user] analyzes [M]'s vitals.") - var/cooldown = round(max(100,(((intensity*8)-(wavelength/2))+(intensity*2))*10)) - used = 1 - icon_state = "health1" - handle_cooldown(cooldown) // splits off to handle the cooldown while handling wavelength - spawn((wavelength+(intensity*4))*10) - if(M) - if(intensity >= 5) - M.Paralyse(intensity * 40/3 SECONDS) - M.apply_effect(intensity * 10, IRRADIATE) - else - to_chat(user, "The radioactive microlaser is still recharging.") -/obj/item/rad_laser/proc/handle_cooldown(cooldown) - spawn(cooldown) - used = 0 - icon_state = "health2" +/obj/item/rad_laser/update_icon_state() + icon_state = used ? "health1" : "health2" + + +/obj/item/rad_laser/attack(mob/living/target, mob/living/user) + if(used) + to_chat(user, span_warning("The radioactive microlaser is still recharging.")) + return + + add_attack_logs(user, target, "Irradiated by [src]") + user.visible_message(span_notice("[user] analyzes [target]'s vitals.")) + var/cooldown = round(max(100,(((intensity*8)-(wavelength/2))+(intensity*2))*10)) + used = TRUE + update_icon(UPDATE_ICON_STATE) + addtimer(CALLBACK(src, PROC_REF(reset_cooldown)), cooldown) + addtimer(CALLBACK(src, PROC_REF(delayed_effect), target), (wavelength + (intensity * 4)) SECONDS) + + +/obj/item/rad_laser/proc/reset_cooldown() + used = FALSE + update_icon(UPDATE_ICON_STATE) + + +/obj/item/rad_laser/proc/delayed_effect(mob/living/target) + if(QDELETED(target)) + return + if(intensity >= 5) + target.Paralyse((intensity * 40 / 3) SECONDS) + target.apply_effect(intensity * 10, IRRADIATE) + /obj/item/rad_laser/attack_self(mob/user) ..() interact(user) + /obj/item/rad_laser/interact(mob/user) user.set_machine(src) @@ -131,6 +146,7 @@ effective or pretty fucking useless. popup.set_content(dat) popup.open() + /obj/item/rad_laser/Topic(href, href_list) if(..()) return 1 @@ -149,7 +165,8 @@ effective or pretty fucking useless. attack_self(usr) add_fingerprint(usr) - return + + /obj/item/jammer name = "radio jammer" @@ -159,12 +176,14 @@ effective or pretty fucking useless. var/active = FALSE var/range = 12 + /obj/item/jammer/Destroy() GLOB.active_jammers -= src return ..() + /obj/item/jammer/attack_self(mob/user) - to_chat(user,"You [active ? "deactivate" : "activate"] the [src].") + to_chat(user, span_notice("You [active ? "deactivate" : "activate"] the [src].")) active = !active if(active) GLOB.active_jammers |= src @@ -175,7 +194,8 @@ effective or pretty fucking useless. name = "Syndicate teleporter" desc = "A strange syndicate version of a cult veil shifter. Warranty voided if exposed to EMP." icon = 'icons/obj/device.dmi' - icon_state = "syndi-tele" + icon_state = "syndi-tele-4" + base_icon_state = "syndi-tele" throwforce = 5 w_class = WEIGHT_CLASS_SMALL throw_speed = 4 @@ -190,87 +210,122 @@ effective or pretty fucking useless. var/saving_throw_distance = 3 var/flawless = FALSE -/obj/item/teleporter/Initialize(mapload, ...) - . = ..() - START_PROCESSING(SSobj, src) /obj/item/teleporter/Destroy() - STOP_PROCESSING(SSobj, src) + if(isprocessing) + STOP_PROCESSING(SSobj, src) return ..() + /obj/item/teleporter/examine(mob/user) . = ..() - . += "[src] has [charges] out of [max_charges] charges left." + . += span_notice("[src] has [charges] out of [max_charges] charges left.") + + +/obj/item/teleporter/update_icon_state() + icon_state = "[base_icon_state]-[charges]" + /obj/item/teleporter/attack_self(mob/user) attempt_teleport(user, FALSE) + /obj/item/teleporter/process() - if(prob(10) && charges < max_charges) + if(charges >= max_charges) + return PROCESS_KILL + + if(prob(10)) charges++ + update_icon(UPDATE_ICON_STATE) + /obj/item/teleporter/emp_act(severity) - if(prob(50 / severity)) - if(istype(loc, /mob/living/carbon/human)) - var/mob/living/carbon/human/user = loc - to_chat(user, "The [src] buzzes and activates!") - attempt_teleport(user, TRUE) - else - visible_message(" The [src] activates and blinks out of existence!") - do_sparks(2, 1, src) - qdel(src) + if(!prob(50 / severity)) + return + + if(ishuman(loc)) + var/mob/living/carbon/human/user = loc + to_chat(user, span_danger("The [src] buzzes and activates!")) + attempt_teleport(user, TRUE) + return + + // Well, it either is on a floor / locker, and won't teleport someone, + // OR it's in someones bag. As such, we need to check the turf to see if people are there. + var/teleported_something = FALSE + var/turf/teleport_turf = get_turf(src) + for(var/mob/living/user in teleport_turf) + teleported_something = TRUE + attempt_teleport(user, TRUE) + + if(teleported_something) + teleport_turf.visible_message(span_danger("[src] activates sporadically, teleporting everyone around it!")) + return + + visible_message(span_warning("The [src] activates and blinks out of existence!")) + do_sparks(2, TRUE, src) + qdel(src) + -/obj/item/teleporter/proc/attempt_teleport(mob/user, EMP_D = FALSE) +/obj/item/teleporter/proc/attempt_teleport(mob/living/user, EMP_D = FALSE) + for(var/obj/item/grab/G in user) + qdel(G) dir_correction(user) - if(!charges) - to_chat(user, "The [src] is recharging still.") + if(!charges && !EMP_D) //If it's empd, you are moving no matter what. + to_chat(user, span_warning("[src] is still recharging.")) return - var/mob/living/carbon/C = user - var/turf/mobloc = get_turf(C) - var/list/turfs = new/list() + var/turf/mobloc = get_turf(user) + var/list/turfs = list() var/found_turf = FALSE var/list/bagholding = user.search_contents_for(/obj/item/storage/backpack/holding) - for(var/turf/T in range(user, tp_range)) - if(!is_teleport_allowed(T.z)) + for(var/turf/check in range(user, tp_range)) + if(!is_teleport_allowed(check.z)) break if(!(length(bagholding) && !flawless)) //Chaos if you have a bag of holding - if(get_dir(C, T) != C.dir) + if(get_dir(user, check) != user.dir) continue - if(T in range(user, inner_tp_range)) + if(check in range(user, inner_tp_range)) continue - if(T.x > world.maxx-tp_range || T.x < tp_range) + if(check.x > world.maxx-tp_range || check.x < tp_range) continue //putting them at the edge is dumb - if(T.y > world.maxy-tp_range || T.y < tp_range) + if(check.y > world.maxy-tp_range || check.y < tp_range) continue - turfs += T + turfs += check found_turf = TRUE - if(found_turf) - if(user.loc != mobloc) // No locker / mech / sleeper teleporting, that breaks stuff - to_chat(C, "The [src] will not work here!") + if(!found_turf) + to_chat(user, span_danger("[src] will not work here!")) + return + + if(user.loc != mobloc) // No locker / mech / sleeper teleporting, that breaks stuff + to_chat(user, span_danger("[src] will not work here!")) + + if(charges > 0) //While we want EMP triggered teleports to drain charge, we also do not want it to go negative charge, as such we need this check here charges-- - var/turf/destination = pick(turfs) - if(tile_check(destination) || flawless) // Why is there so many bloody floor types - var/turf/fragging_location = destination - telefrag(fragging_location, user) - C.forceMove(destination) - playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc) - playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(destination) - else if (EMP_D == FALSE && !(bagholding.len && !flawless)) // This is where the fun begins - var/direction = get_dir(user, destination) - panic_teleport(user, destination, direction) - else // Emp activated? Bag of holding? No saving throw for you - get_fragged(user, destination) - else - to_chat(C, "The [src] will not work here!") + update_icon(UPDATE_ICON_STATE) + if(!isprocessing) + START_PROCESSING(SSobj, src) + + var/turf/destination = pick(turfs) + if(tile_check(destination) || flawless) // Why is there so many bloody floor types + var/turf/fragging_location = destination + telefrag(fragging_location, user) + user.forceMove(destination) + playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc) + playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(destination) + else if(EMP_D == FALSE && !(length(bagholding) && !flawless)) // This is where the fun begins + var/direction = get_dir(user, destination) + panic_teleport(user, destination, direction) + else // Emp activated? Bag of holding? No saving throw for you + get_fragged(user, destination) + + +/obj/item/teleporter/proc/tile_check(turf/check_turf) + return isfloorturf(check_turf) || isspaceturf(check_turf) -/obj/item/teleporter/proc/tile_check(turf/T) - if(istype(T, /turf/simulated/floor) || istype(T, /turf/space) || istype(T, /turf/simulated/floor/shuttle) || istype(T, /turf/simulated/floor/shuttle/objective_check) || istype(T, /turf/simulated/floor/shuttle/plating)) - return TRUE /obj/item/teleporter/proc/dir_correction(mob/user) //Direction movement, screws with teleport distance and saving throw, and thus must be removed first var/temp_direction = user.dir @@ -280,7 +335,8 @@ effective or pretty fucking useless. if(NORTHWEST, SOUTHWEST) user.dir = WEST -/obj/item/teleporter/proc/panic_teleport(mob/user, turf/destination, direction = NORTH) + +/obj/item/teleporter/proc/panic_teleport(mob/living/user, turf/destination, direction = NORTH) var/saving_throw switch(direction) if(NORTH, SOUTH) @@ -296,33 +352,33 @@ effective or pretty fucking useless. else saving_throw = NORTH // just in case - var/mob/living/carbon/C = user - var/turf/mobloc = get_turf(C) + var/turf/mobloc = get_turf(user) var/list/turfs = list() var/found_turf = FALSE - for(var/turf/T in range(destination, saving_throw_distance)) - if(get_dir(destination, T) != saving_throw) + for(var/turf/check in range(destination, saving_throw_distance)) + if(get_dir(destination, check) != saving_throw) continue - if(T.x > world.maxx-saving_throw_distance || T.x < saving_throw_distance) + if(check.x > world.maxx-saving_throw_distance || check.x < saving_throw_distance) continue //putting them at the edge is dumb - if(T.y > world.maxy-saving_throw_distance || T.y < saving_throw_distance) + if(check.y > world.maxy-saving_throw_distance || check.y < saving_throw_distance) continue - if(!tile_check(T)) + if(!tile_check(check)) continue // We are only looking for safe tiles on the saving throw, since we are nice - turfs += T + turfs += check found_turf = TRUE - if(found_turf) - var/turf/new_destination = pick(turfs) - var/turf/fragging_location = new_destination - telefrag(fragging_location, user) - C.forceMove(new_destination) - playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc) - new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(new_destination) - playsound(new_destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - else //We tried to save. We failed. Death time. - get_fragged(user, destination) + if(!found_turf) + get_fragged(user, destination) //We tried to save. We failed. Death time. + return + + var/turf/new_destination = pick(turfs) + var/turf/fragging_location = new_destination + telefrag(fragging_location, user) + user.forceMove(new_destination) + playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc) + new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(new_destination) + playsound(new_destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) /obj/item/teleporter/proc/get_fragged(mob/user, turf/destination) @@ -334,19 +390,19 @@ effective or pretty fucking useless. playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) playsound(destination, "sound/magic/disintegrate.ogg", 50, TRUE) destination.ex_act(rand(1,2)) - for(var/obj/item/W in user) - if(istype(W, /obj/item/organ)|| istype(W, /obj/item/implant)) - continue - if(!user.drop_item_ground(W)) - qdel(W) - to_chat(user, "You teleport into the wall, the teleporter tries to save you, but--") + for(var/obj/item/thing as anything in user.get_equipped_items(TRUE, TRUE)) + if(!user.drop_item_ground(thing)) + qdel(thing) + to_chat(user, span_dangerbigger("You teleport into the wall, the teleporter tries to save you, but--")) user.gib() + /obj/item/teleporter/proc/telefrag(turf/fragging_location, mob/user) - for(var/mob/living/M in fragging_location)//Hit everything in the turf - M.apply_damage(20, BRUTE) - M.Weaken(6 SECONDS) - to_chat(M, "
Do not expose the teleporter to electromagnetic pulses or attempt to use with a bag of holding, unwanted malfunctions may occur. "} + + /obj/item/storage/box/syndie_kit/teleporter name = "syndicate teleporter kit" + /obj/item/storage/box/syndie_kit/teleporter/populate_contents() new /obj/item/teleporter(src) new /obj/item/paper/teleporter(src) new /obj/item/clothing/glasses/chameleon/meson(src) + + /obj/effect/temp_visual/teleport_abductor/syndi_teleporter duration = 5 + /obj/item/teleporter/admin desc = "A strange syndicate version of a cult veil shifter. \n This one seems EMP proof, and with much better saftey protocols." charges = 8 max_charges = 8 flawless = TRUE + diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 57fa49d5bf4..ad810bee5e0 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -110,7 +110,8 @@ if(tank_one) split_gases() valve_open = FALSE - tank_one.forceMove(get_turf(src)) + tank_one.forceMove_turf() + usr?.put_in_hands(tank_one, ignore_anim = FALSE) tank_one = null update_icon() if((!tank_two || tank_two.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL)) @@ -119,7 +120,8 @@ if(tank_two) split_gases() valve_open = FALSE - tank_two.forceMove(get_turf(src)) + tank_two.forceMove_turf() + usr?.put_in_hands(tank_two, ignore_anim = FALSE) tank_two = null update_icon() if((!tank_one || tank_one.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL)) @@ -131,7 +133,8 @@ attached_device.attack_self(usr) if("remove_device") if(attached_device) - attached_device.forceMove(get_turf(src)) + attached_device.forceMove_turf() + usr?.put_in_hands(attached_device, ignore_anim = FALSE) attached_device.holder = null attached_device = null qdel(GetComponent(/datum/component/proximity_monitor)) @@ -145,28 +148,32 @@ /obj/item/transfer_valve/proc/process_activation(obj/item/D, normal = TRUE, special = TRUE, mob/user) if(toggle) - toggle = 0 + toggle = FALSE toggle_valve(user) - spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever - toggle = 1 + addtimer(VARSET_CALLBACK(src, toggle, TRUE), 5 SECONDS) // To stop a signal being spammed from a proxy sensor constantly going off or whatever -/obj/item/transfer_valve/update_icon() - overlays.Cut() - underlays = null +/obj/item/transfer_valve/update_icon_state() if(!tank_one && !tank_two && !attached_device) icon_state = "valve_1" - return - icon_state = "valve" + else + icon_state = "valve" + +/obj/item/transfer_valve/update_overlays() + . = ..() + underlays.Cut() + if(!tank_one && !tank_two && !attached_device) + return if(tank_one) - overlays += "[tank_one.icon_state]" + . += "[tank_one.icon_state]" if(tank_two) var/icon/J = new(icon, icon_state = "[tank_two.icon_state]") J.Shift(WEST, 13) underlays += J if(attached_device) - overlays += "device" + . += "device" + /obj/item/transfer_valve/proc/merge_gases() tank_two.air_contents.volume += tank_one.air_contents.volume @@ -190,7 +197,7 @@ /obj/item/transfer_valve/proc/toggle_valve(mob/user) if(!valve_open && tank_one && tank_two) - valve_open = 1 + valve_open = TRUE var/turf/bombturf = get_turf(src) @@ -202,13 +209,17 @@ if(user) add_attack_logs(user, src, "Bomb valve opened with [attached_device ? attached_device : "no device"], attached by [key_name_log(attacher)]. Last touched by: [key_name_log(mob)]", ATKLOG_FEW) merge_gases() - spawn(20) // In case one tank bursts - for(var/i in 1 to 5) - update_icon() - sleep(10) - update_icon() + addtimer(CALLBACK(src, PROC_REF(toggle_process)), 2 SECONDS) // In case one tank bursts else if(valve_open && tank_one && tank_two) split_gases() - valve_open = 0 + valve_open = FALSE update_icon() + + +/obj/item/transfer_valve/proc/toggle_process() + for(var/i in 1 to 5) + update_icon() + sleep(1 SECONDS) + update_icon() + diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 32341ad3b27..7d369dbb619 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -246,7 +246,8 @@ GLOBAL_LIST_EMPTY(world_uplinks) "age" = html_encode(L.fields["age"]), "species" = html_encode(L.fields["species"]), "rank" = html_encode(L.fields["rank"]), - "fingerprint" = html_encode(L.fields["fingerprint"]) + "fingerprint" = html_encode(L.fields["fingerprint"]), + "exploit_record" = html_encode(L.fields["exploit_record"]), )) data["exploitable"] = exploitable diff --git a/code/game/objects/items/devices/window_painter.dm b/code/game/objects/items/devices/window_painter.dm index a44f0d13a09..8aa104f4cd8 100644 --- a/code/game/objects/items/devices/window_painter.dm +++ b/code/game/objects/items/devices/window_painter.dm @@ -11,9 +11,10 @@ /obj/structure/window/full/basic, /obj/machinery/door/window) -/obj/item/pipe_painter/window_painter/New() + +/obj/item/pipe_painter/window_painter/Initialize(mapload) . = ..() - update_icon() + update_icon(UPDATE_OVERLAYS) mode = "paint" @@ -25,11 +26,12 @@ if("Choose Color") mode = "paint" colour = input(user,"Choose Color") as color - update_icon() + update_icon(UPDATE_OVERLAYS) if("Color Presets") mode = "paint" colour = input("Which color do you want to use?", name, colour) in GLOB.pipe_colors - update_icon() + update_icon(UPDATE_OVERLAYS) + /obj/item/pipe_painter/window_painter/afterattack(atom/A, mob/user as mob) if(!is_type_in_list(A, paintable_windows) || !in_range(user, A)) @@ -43,10 +45,10 @@ colour = W.color mode = "paint" to_chat(user, span_notice("You copy color of this window.")) - update_icon() + update_icon(UPDATE_OVERLAYS) + + +/obj/item/pipe_painter/window_painter/update_overlays() + . = ..() + . += mutable_appearance(icon, icon_state = "window_painter_colour", color = colour) -/obj/item/pipe_painter/window_painter/update_icon() - overlays.Cut() - var/image/colour_image = image('icons/obj/device.dmi', "window_painter_colour") - colour_image.color = colour - overlays += colour_image diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index acbd3fc6722..6e1d9a05e4d 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -9,6 +9,7 @@ w_class = WEIGHT_CLASS_BULKY max_integrity = 40 resistance_flags = FLAMMABLE + custom_fire_overlay = "fire" var/rolled = FALSE /obj/item/flag/attackby(obj/item/W, mob/user, params) @@ -20,36 +21,34 @@ /obj/item/flag/attack_self(mob/user) rolled = !rolled user.visible_message("[user] [rolled ? "rolls up" : "unfurls"] [src].", "You [rolled ? "roll up" : "unfurl"] [src].", "You hear fabric rustling.") - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/flag/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = FALSE) ..() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/flag/extinguish() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/item/flag/update_icon() - overlays.Cut() + +/obj/item/flag/update_icon_state() updateFlagIcon() item_state = icon_state if(rolled) icon_state = "[icon_state]_rolled" + custom_fire_overlay = "fire_rolled" + else + custom_fire_overlay = initial(custom_fire_overlay) if(resistance_flags & ON_FIRE) item_state = "[item_state]_fire" - if((resistance_flags & ON_FIRE) && rolled) - overlays += image('icons/obj/flag.dmi', src , "fire_rolled") - else if((resistance_flags & ON_FIRE) && !rolled) - overlays += image('icons/obj/flag.dmi', src , "fire") - if(ismob(loc)) - var/mob/M = loc - M.update_inv_r_hand() - M.update_inv_l_hand() + update_equipped_item() + /obj/item/flag/proc/updateFlagIcon() icon_state = initial(icon_state) + /obj/item/flag/nt name = "Nanotrasen flag" desc = "A flag proudly boasting the logo of NT." @@ -219,9 +218,16 @@ var/obj/item/grenade/boobytrap = null var/mob/trapper = null -/obj/item/flag/chameleon/New() + +/obj/item/flag/chameleon/Initialize(mapload) updated_icon_state = icon_state - ..() + . = ..() + + +/obj/item/flag/chameleon/Destroy() + QDEL_NULL(boobytrap) + return ..() + /obj/item/flag/chameleon/attack_self(mob/user) if(used) diff --git a/code/game/objects/items/hourglass.dm b/code/game/objects/items/hourglass.dm index 0dc486cc5c2..410b6efd85c 100644 --- a/code/game/objects/items/hourglass.dm +++ b/code/game/objects/items/hourglass.dm @@ -29,9 +29,10 @@ to_chat(user,span_notice("You stop the [src].")) //Sand magically flows back because that's more convinient to use. stop() -/obj/item/hourglass/update_icon() + +/obj/item/hourglass/update_icon_state() icon_state = "hourglass_[timing_id ? "active" : "idle"]" - return ..() + /obj/item/hourglass/proc/start() finish_time = world.time + time @@ -52,7 +53,7 @@ countdown.stop() finish_time = null animate(src) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/hourglass/proc/finish() visible_message(span_notice("[src] stops.")) diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm index a4e60ce16e0..ebe0f80f87a 100644 --- a/code/game/objects/items/misc.dm +++ b/code/game/objects/items/misc.dm @@ -15,7 +15,7 @@ name = "beach ball" item_state = "beachball" density = 0 - anchored = 0 + anchored = FALSE w_class = WEIGHT_CLASS_TINY force = 0.0 throwforce = 0.0 diff --git a/code/game/objects/items/mixing_bowl.dm b/code/game/objects/items/mixing_bowl.dm index 8eed9480fb6..c29b18236f0 100644 --- a/code/game/objects/items/mixing_bowl.dm +++ b/code/game/objects/items/mixing_bowl.dm @@ -155,12 +155,12 @@ if(prob(chance)) dirty = TRUE flags = null - icon_state = dirty_icon + update_icon(UPDATE_ICON_STATE) /obj/item/mixing_bowl/proc/clean() dirty = FALSE flags = OPENCONTAINER - icon_state = clean_icon + update_icon(UPDATE_ICON_STATE) /obj/item/mixing_bowl/wash(mob/user, atom/source) if(..()) @@ -187,3 +187,8 @@ ffuu.reagents.add_reagent("carbon", amount) ffuu.reagents.add_reagent("????", amount/10) make_dirty(75) + + +/obj/item/mixing_bowl/update_icon_state() + icon_state = dirty ? dirty_icon : clean_icon + diff --git a/code/game/objects/items/mountable_frames/frames.dm b/code/game/objects/items/mountable_frames/frames.dm index 179684139fc..66b185f4148 100644 --- a/code/game/objects/items/mountable_frames/frames.dm +++ b/code/game/objects/items/mountable_frames/frames.dm @@ -9,7 +9,7 @@ /obj/item/mounted/frame/attackby(obj/item/W, mob/user) ..() - if(istype(W, /obj/item/wrench) && sheets_refunded) + if(W.tool_behaviour == TOOL_WRENCH && sheets_refunded) new /obj/item/stack/sheet/metal(get_turf(src), sheets_refunded) qdel(src) diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm index 3b9caa6fed6..5fa73f398c7 100644 --- a/code/game/objects/items/random_items.dm +++ b/code/game/objects/items/random_items.dm @@ -31,7 +31,16 @@ /obj/item/stack/sheet/animalhide/random/New() ..() - var/htype = pick(/obj/item/stack/sheet/animalhide/cat,/obj/item/stack/sheet/animalhide/corgi,/obj/item/stack/sheet/animalhide/human,/obj/item/stack/sheet/animalhide/lizard,/obj/item/stack/sheet/animalhide/monkey) + var/htype = pick(/obj/item/stack/sheet/animalhide/cat, \ + /obj/item/stack/sheet/animalhide/corgi, \ + /obj/item/stack/sheet/animalhide/human, \ + /obj/item/stack/sheet/animalhide/lizard, \ + /obj/item/stack/sheet/animalhide/monkey, \ + /obj/item/stack/sheet/animalhide/wolpin, \ + /obj/item/stack/sheet/animalhide/stok, \ + /obj/item/stack/sheet/animalhide/neara, \ + /obj/item/stack/sheet/animalhide/farwa \ + ) new htype(loc, amount) qdel(src) @@ -200,7 +209,7 @@ /obj/structure/closet/crate/bin/flowers name = "flower barrel" desc = "A bin full of fresh flowers for the bereaved." - anchored = 0 + anchored = FALSE New() while(contents.len < 10) var/flowertype = pick(/obj/item/grown/sunflower,/obj/item/grown/novaflower,/obj/item/reagent_containers/food/snacks/grown/poppy, @@ -212,7 +221,7 @@ /obj/structure/closet/crate/bin/plants name = "plant barrel" desc = "Caution: Contents may contain vitamins and minerals. It is recommended that you deep fry them before eating." - anchored = 0 + anchored = FALSE New() while(contents.len < 10) var/ptype = pick(/obj/item/reagent_containers/food/snacks/grown/apple,/obj/item/reagent_containers/food/snacks/grown/banana, @@ -262,7 +271,7 @@ desc = "What could it be?" /obj/structure/largecrate/evil/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) + if(W.tool_behaviour == TOOL_CROWBAR) var/list/menace = pick( /mob/living/simple_animal/hostile/carp,/mob/living/simple_animal/hostile/faithless,/mob/living/simple_animal/hostile/pirate, /mob/living/simple_animal/hostile/creature,/mob/living/simple_animal/hostile/pirate/ranged, /mob/living/simple_animal/hostile/hivebot,/mob/living/simple_animal/hostile/viscerator,/mob/living/simple_animal/hostile/pirate) @@ -294,7 +303,7 @@ desc = "What happens if you open it?" /obj/structure/largecrate/schrodinger/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) + if(W.tool_behaviour == TOOL_CROWBAR) add_fingerprint(user) sleep(2) var/mob/living/simple_animal/pet/cat/Cat = new(loc) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index caf8c3b9b69..2bf19296d14 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -204,7 +204,7 @@ else to_chat(user, "You need to attach a flash to it first!") - if(istype(W, /obj/item/multitool)) + if(W.tool_behaviour == TOOL_MULTITOOL) if(check_completion()) Interact(user) else @@ -366,7 +366,7 @@ if(living_user.lying || living_user.stat || living_user.IsStunned() || !Adjacent(living_user)) return var/obj/item/item_in_hand = living_user.get_active_hand() - if(!istype(item_in_hand, /obj/item/multitool)) + if(item_in_hand.tool_behaviour != TOOL_MULTITOOL) to_chat(living_user, "You need a multitool!") return diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 002f9898c18..ded789270b3 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -46,12 +46,10 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ . = ..() recipes = GLOB.rod_recipes -/obj/item/stack/rods/update_icon() +/obj/item/stack/rods/update_icon_state() var/amount = get_amount() - if((amount <= 5) && (amount > 0)) - icon_state = "rods-[amount]" - else - icon_state = "rods" + icon_state = "rods-[clamp(amount, 1, 5)]" + /obj/item/stack/rods/welder_act(mob/user, obj/item/I) if(get_amount() < 2) @@ -79,8 +77,8 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ is_cyborg = 1 cyborg_construction_stack = /obj/item/stack/rods -/obj/item/stack/rods/cyborg/update_icon() - return +/obj/item/stack/rods/cyborg/update_icon_state() + return // icon_state should always be a full stack of rods. /obj/item/stack/fireproof_rods name = "fireproof rods" @@ -103,13 +101,12 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ toolspeed = 1 usesound = 'sound/items/deconstruct.ogg' + /obj/item/stack/fireproof_rods/twentyfive amount = 25 -/obj/item/stack/fireproof_rods/update_icon() + +/obj/item/stack/fireproof_rods/update_icon_state() var/amount = get_amount() - if((amount <= 5) && (amount > 0)) - icon_state = "f_rods-[amount]" - else - icon_state = "f_rods" + icon_state = "f_rods-[clamp(amount, 1, 5)]" diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index a7401ef97ee..6dde09bc9d8 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -42,6 +42,30 @@ GLOBAL_LIST_INIT(human_recipes, list( \ singular_name = "monkey hide piece" icon_state = "sheet-monkey" +/obj/item/stack/sheet/animalhide/wolpin + name = "wolpin hide" + desc = "The by-product of wolpin farming." + singular_name = "wolpin hide piece" + icon_state = "sheet-wolpin" + +/obj/item/stack/sheet/animalhide/stok + name = "stok hide" + desc = "The by-product of stok farming." + singular_name = "stok hide piece" + icon_state = "sheet-lizzard" + +/obj/item/stack/sheet/animalhide/neara + name = "neara hide" + desc = "The by-product of neara farming." + singular_name = "neara hide piece" + icon_state = "sheet-neara" + +/obj/item/stack/sheet/animalhide/farwa + name = "farwa hide" + desc = "The by-product of farwa farming." + singular_name = "farwa hide piece" + icon_state = "sheet-farwa" + /obj/item/stack/sheet/animalhide/lizard name = "lizard skin" desc = "Sssssss..." @@ -168,17 +192,18 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ /obj/item/clothing/head/hooded/explorer, /obj/item/clothing/head/helmet/space/plasmaman/mining, )) + /obj/item/stack/sheet/animalhide/goliath_hide/afterattack(atom/target, mob/user, proximity_flag) if(!proximity_flag) return - if(is_type_in_typecache(target, goliath_platable_armor_typecache) || is_type_in_typecache(target, goliath_platable_armor_with_icon_typecache)) + var/platable_armor_with_icon = is_type_in_typecache(target, goliath_platable_armor_with_icon_typecache) + if(is_type_in_typecache(target, goliath_platable_armor_typecache) || platable_armor_with_icon) var/obj/item/clothing/C = target var/datum/armor/current_armor = C.armor - - if(current_armor.getRating("melee") < 60) - C.armor = current_armor.setRating(melee_value = min(current_armor.getRating("melee") + 10, 60)) - if(is_type_in_typecache(target, goliath_platable_armor_with_icon_typecache)) - switch(C.armor.getRating("melee")) + if(current_armor.getRating(MELEE) < 60) + C.armor = current_armor.setRating(melee_value = min(current_armor.getRating(MELEE) + 10, 60)) + if(platable_armor_with_icon) + switch(C.armor.getRating(MELEE)) if(40, 50) C.icon_state = "[initial(C.icon_state)]_reinf" C.item_color = "[initial(C.item_color)]_reinf" @@ -200,11 +225,11 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ var/obj/mecha/working/ripley/D = target if(D.hides < 3) D.hides++ - D.armor = D.armor.setRating(melee_value = min(D.armor.getRating("melee") + 10, 70)) - D.armor = D.armor.setRating(bullet_value = min(D.armor.getRating("bullet") + 5, 50)) - D.armor = D.armor.setRating(laser_value = min(D.armor.getRating("laser") + 5, 50)) + D.armor = D.armor.setRating(melee_value = min(D.armor.getRating(MELEE) + 10, 70)) + D.armor = D.armor.setRating(bullet_value = min(D.armor.getRating(BULLET) + 5, 50)) + D.armor = D.armor.setRating(laser_value = min(D.armor.getRating(LASER) + 5, 50)) to_chat(user, "You strengthen [target], improving its resistance against melee attacks.") - D.update_icon() + D.update_appearance(UPDATE_DESC|UPDATE_OVERLAYS) use(1) else to_chat(user, "You can't improve [D] any further!") @@ -230,7 +255,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ D.armor = D.armor.setRating(bullet_value = min(D.armor.getRating("bullet") + 5, 50)) D.armor = D.armor.setRating(laser_value = min(D.armor.getRating("laser") + 5, 50)) to_chat(user, "Вы нашли куда суется [name] и пихнули её на экзокостюм, усиливая защиту против атак.") - D.update_icon() + D.update_appearance(UPDATE_DESC|UPDATE_OVERLAYS) use(1) else to_chat(user, "Вы больше не можете найти куда [name] пристраивается!") diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 0c035c6161b..e735f797078 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -275,6 +275,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list( new /datum/stack_recipe("Bio bag", /obj/item/storage/bag/bio, 4), new /datum/stack_recipe("Book bag", /obj/item/storage/bag/books, 4), new /datum/stack_recipe("Chemistry bag", /obj/item/storage/bag/chemistry, 4), + new /datum/stack_recipe("Construction bag", /obj/item/storage/bag/construction, 4), new /datum/stack_recipe("Fish bag", /obj/item/storage/bag/fish, 4), new /datum/stack_recipe("Mining satchel", /obj/item/storage/bag/ore, 4), new /datum/stack_recipe("Plant bag", /obj/item/storage/bag/plants, 4), diff --git a/code/game/objects/items/stacks/stack_recipe.dm b/code/game/objects/items/stacks/stack_recipe.dm index 3a5f5ba019a..47061ddc8c1 100644 --- a/code/game/objects/items/stacks/stack_recipe.dm +++ b/code/game/objects/items/stacks/stack_recipe.dm @@ -37,25 +37,7 @@ /datum/stack_recipe/cable_restraints/post_build(obj/item/stack/S, obj/result) var/obj/item/restraints/handcuffs/cable/cable_restraints = result if(istype(cable_restraints)) - var/color = "white" - - switch(S.color) - if(WIRE_COLOR_BLUE) - color = "blue" - if(WIRE_COLOR_CYAN) - color = "cyan" - if(WIRE_COLOR_GREEN) - color = "green" - if(WIRE_COLOR_ORANGE) - color = "orange" - if(WIRE_COLOR_PINK) - color = "pink" - if(WIRE_COLOR_RED) - color = "red" - if(WIRE_COLOR_YELLOW) - color = "yellow" - - cable_restraints.icon_state = "cuff_[color]" + cable_restraints.cable_color(S.color) ..() diff --git a/code/game/objects/items/theft_items.dm b/code/game/objects/items/theft_items.dm index 898ceb055b5..3c0f7d84752 100644 --- a/code/game/objects/items/theft_items.dm +++ b/code/game/objects/items/theft_items.dm @@ -82,6 +82,17 @@ else // Not cracked or dented. . += "Fine print on the box reads \"Cybersun Industries secure container, guaranteed thermite proof, assistant proof, and explosive resistant.\"" + +/obj/item/nuke_core_container/update_icon_state() + if(sealed) + icon_state = "core_container_sealed" + return + if(core) + icon_state = cracked ? "core_container_cracked_loaded" : "core_container_loaded" + else + icon_state = cracked ? "core_container_cracked_empty" : "core_container_empty" + + /obj/item/nuke_core_container/attack_hand(mob/user) if(cracked && core) unload(user) @@ -93,7 +104,7 @@ return new_core.forceMove(src) core = new_core - icon_state = "core_container_loaded" + update_icon(UPDATE_ICON_STATE) to_chat(user, "Container is sealing...") addtimer(CALLBACK(src, PROC_REF(seal)), 10 SECONDS) @@ -101,14 +112,14 @@ core.add_fingerprint(user) user.put_in_active_hand(core) core = null - icon_state = "core_container_cracked_empty" + update_icon(UPDATE_ICON_STATE) /obj/item/nuke_core_container/proc/seal() if(!QDELETED(core)) STOP_PROCESSING(SSobj, core) ADD_TRAIT(core, TRAIT_BLOCK_RADIATION, src) - icon_state = "core_container_sealed" sealed = TRUE + update_icon(UPDATE_ICON_STATE) playsound(src, 'sound/items/deconstruct.ogg', 60, TRUE) if(ismob(loc)) to_chat(loc, "[src] is permanently sealed, [core]'s radiation is contained.") @@ -116,7 +127,6 @@ /obj/item/nuke_core_container/attackby(obj/item/nuke_core/plutonium/core, mob/user) if(!istype(core) || cracked) return ..() - if(!user.drop_item_ground(core)) to_chat(user, "[core] is stuck to your hand!") return @@ -128,11 +138,8 @@ if(core) START_PROCESSING(SSobj, core) REMOVE_TRAIT(core, TRAIT_BLOCK_RADIATION, src) - icon_state = "core_container_cracked_loaded" - else - icon_state = "core_container_cracked_empty" - icon_state = "core_container_cracked_empty" cracked = TRUE + update_icon(UPDATE_ICON_STATE) /obj/item/paper/guides/antag/nuke_instructions info = "Как вскрыть ядерную боеголовку Нанотрейзен и вытащить из нее плутониевое ядро:
\ @@ -182,8 +189,8 @@ return FALSE forceMove(tongs) tongs.sliver = src - tongs.icon_state = "supermatter_tongs_loaded" - tongs.item_state = "supermatter_tongs_loaded" + tongs.update_icon(UPDATE_ICON_STATE) + to_chat(user, "You carefully pick up [src] with [tongs].") else if(istype(I, /obj/item/scalpel/supermatter) || istype(I, /obj/item/nuke_core_container/supermatter)) // we don't want it to dust return @@ -243,15 +250,30 @@ QDEL_NULL(sliver) return ..() + +/obj/item/nuke_core_container/supermatter/update_name(updates = ALL) + . = ..() + name = cracked ? "broken supermatter bin" : initial(name) + + +/obj/item/nuke_core_container/supermatter/update_icon_state() + if(sealed) + icon_state = "supermatter_container_sealed" + return + if(sliver) + icon_state = cracked ? "core_container_cracked_loaded" : "core_container_loaded" + else + icon_state = "core_container_cracked_empty" + + /obj/item/nuke_core_container/supermatter/load(obj/item/retractor/supermatter/I, mob/user) if(!istype(I) || !I.sliver || sliver) return I.sliver.forceMove(src) sliver = I.sliver I.sliver = null - I.icon_state = "supermatter_tongs" - I.item_state = "supermatter_tongs" - icon_state = "supermatter_container_loaded" + I.update_icon(UPDATE_ICON_STATE) + update_icon(UPDATE_ICON_STATE) to_chat(user, "Container is sealing...") addtimer(CALLBACK(src, PROC_REF(seal)), 10 SECONDS) @@ -259,9 +281,9 @@ if(!QDELETED(sliver)) STOP_PROCESSING(SSobj, sliver) ADD_TRAIT(sliver, TRAIT_BLOCK_RADIATION, src) - icon_state = "supermatter_container_sealed" playsound(src, 'sound/items/deconstruct.ogg', 60, TRUE) sealed = TRUE + update_icon(UPDATE_ICON_STATE) if(ismob(loc)) to_chat(loc, "[src] is permanently sealed, [sliver] is safely contained.") @@ -271,9 +293,8 @@ sliver.forceMove(I) I.sliver = sliver sliver = null - I.icon_state = "supermatter_tongs_loaded" - I.item_state = "supermatter_tongs_loaded" - icon_state = "core_container_cracked_empty" + I.update_icon(UPDATE_ICON_STATE) + update_icon(UPDATE_ICON_STATE) to_chat(user, "You carefully pick up [I.sliver] with [I].") /obj/item/nuke_core_container/supermatter/attackby(obj/item/retractor/supermatter/tongs, mob/user) @@ -300,9 +321,8 @@ message_admins("[sliver] has consumed [key_name_admin(user)] [ADMIN_JMP(src)].") investigate_log("has consumed [key_name(user)].", "supermatter") user.gib() - icon_state = "core_container_cracked_empty" - qdel(sliver) - sliver = null + QDEL_NULL(sliver) + update_icon(UPDATE_ICON_STATE) else return ..() @@ -312,11 +332,8 @@ if(sliver) START_PROCESSING(SSobj, sliver) REMOVE_TRAIT(sliver, TRAIT_BLOCK_RADIATION, src) - icon_state = "supermatter_container_cracked_loaded" - else - icon_state = "core_container_cracked_empty" - name = "broken supermatter bin" cracked = TRUE + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) /obj/item/scalpel/supermatter name = "supermatter scalpel" @@ -348,6 +365,12 @@ QDEL_NULL(sliver) return ..() + +/obj/item/retractor/supermatter/update_icon_state() + icon_state = "supermatter_tongs[sliver ? "_loaded" : ""]" + item_state = "supermatter_tongs[sliver ? "_loaded" : ""]" + + /obj/item/retractor/supermatter/afterattack(atom/O, mob/user, proximity) . = ..() if(!sliver) @@ -360,8 +383,7 @@ sliver.forceMove(loc) visible_message("[sliver] falls out of [src] as it hits the ground.") sliver = null - icon_state = "supermatter_tongs" - item_state = "supermatter_tongs" + update_icon(UPDATE_ICON_STATE) return ..() /obj/item/retractor/supermatter/proc/Consume(atom/movable/AM, mob/living/user) @@ -393,5 +415,5 @@ L.apply_effect(60, IRRADIATE) playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE) QDEL_NULL(sliver) - icon_state = "supermatter_tongs" - item_state = "supermatter_tongs" + update_icon(UPDATE_ICON_STATE) + diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm index c02177c1463..db562b1d1b9 100644 --- a/code/game/objects/items/tools/multitool.dm +++ b/code/game/objects/items/tools/multitool.dm @@ -74,12 +74,17 @@ STOP_PROCESSING(SSobj, src) return ..() + +/obj/item/multitool/ai_detect/update_icon_state() + icon_state = "[initial(icon_state)][detect_state]" + + /obj/item/multitool/ai_detect/process() if(track_cooldown > world.time) return detect_state = PROXIMITY_NONE multitool_detect() - icon_state = "[initial(icon_state)][detect_state]" + update_icon(UPDATE_ICON_STATE) track_cooldown = world.time + track_delay /obj/item/multitool/ai_detect/proc/multitool_detect() @@ -91,16 +96,19 @@ if(!detect_state && GLOB.cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z)) var/datum/camerachunk/chunk = GLOB.cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z) - if(chunk) - if(chunk.seenby.len) - for(var/mob/camera/aiEye/A in chunk.seenby) - var/turf/detect_turf = get_turf(A) - if(get_dist(our_turf, detect_turf) < rangealert) - detect_state = PROXIMITY_ON_SCREEN - break - if(get_dist(our_turf, detect_turf) < rangewarning) - detect_state = PROXIMITY_NEAR - break + if(!chunk) + return + for(var/mob/camera/aiEye/A in chunk.seenby) + //Checks if the A is to be detected or not + if(!A.ai_detector_visible) + continue + var/turf/detect_turf = get_turf(A) + if(get_dist(our_turf, detect_turf) < rangealert) + detect_state = PROXIMITY_ON_SCREEN + break + if(get_dist(our_turf, detect_turf) < rangewarning) + detect_state = PROXIMITY_NEAR + break /obj/item/multitool/ai_detect/admin desc = "Used for pulsing wires to test which to cut. Not recommended by doctors. Has a strange tag that says 'Grief in Safety'" //What else should I say for a meme item? diff --git a/code/game/objects/items/tools/tool_behaviour.dm b/code/game/objects/items/tools/tool_behaviour.dm index b68de693855..c0afaafb462 100644 --- a/code/game/objects/items/tools/tool_behaviour.dm +++ b/code/game/objects/items/tools/tool_behaviour.dm @@ -43,7 +43,7 @@ return tool_use_check(user, amount) // A check called by tool_start_check once, and by use_tool on every tick of delay. -/obj/item/proc/tool_use_check(mob/living/user, amount) +/obj/item/proc/tool_use_check(mob/living/user, amount, silent = FALSE) return !amount /obj/item/proc/play_tool_sound(atom/target, volume = tool_volume) diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm index 2e75f52fbdf..7fcc4f70406 100644 --- a/code/game/objects/items/tools/welder.dm +++ b/code/game/objects/items/tools/welder.dm @@ -115,14 +115,16 @@ M.update_inv_l_hand() // If welding tool ran out of fuel during a construction task, construction fails. -/obj/item/weldingtool/tool_use_check(mob/living/user, amount) +/obj/item/weldingtool/tool_use_check(mob/living/user, amount, silent = FALSE) if(!tool_enabled) - to_chat(user, "[src] has to be on to complete this task!") + if(!silent) + to_chat(user, "[src] has to be on to complete this task!") return FALSE if(GET_FUEL >= amount * requires_fuel) return TRUE else - to_chat(user, "You need more welding fuel to complete this task!") + if(!silent) + to_chat(user, "You need more welding fuel to complete this task!") return FALSE // When welding is about to start, run a normal tool_use_check, then flash a mob if it succeeds. @@ -174,15 +176,8 @@ else to_chat(user, "There's not enough fuel in [A] to refuel [src]!") -/obj/item/weldingtool/proc/update_torch() - overlays.Cut() - if(tool_enabled) - overlays += "[initial(icon_state)]-on" - item_state = "[initial(item_state)]1" - else - item_state = "[initial(item_state)]" -/obj/item/weldingtool/update_icon() +/obj/item/weldingtool/update_icon_state() if(low_fuel_changes_icon) var/ratio = GET_FUEL / maximum_fuel ratio = CEILING(ratio*4, 1) * 25 @@ -190,8 +185,16 @@ icon_state = initial(icon_state) else icon_state = "[initial(icon_state)][ratio]" - update_torch() - ..() + if(tool_enabled) + item_state = "[initial(item_state)]1" + else + item_state = "[initial(item_state)]" + + +/obj/item/weldingtool/update_overlays() + . = ..() + if(tool_enabled) + . += "[initial(icon_state)]-on" /obj/item/weldingtool/largetank diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index b9b13cbc6cc..77db10a3288 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -53,13 +53,16 @@ icon_state = "waterballoon-e" item_state = "waterballoon-e" + /obj/item/toy/balloon/New() ..() create_reagents(10) + /obj/item/toy/balloon/attack(mob/living/carbon/human/M as mob, mob/user as mob) return + /obj/item/toy/balloon/afterattack(atom/A, mob/user, proximity) if(!proximity) return @@ -73,17 +76,18 @@ A.reagents.trans_to(src, 10) to_chat(user, "You fill the balloon with the contents of [A].") desc = "A translucent balloon with some form of liquid sloshing around in it." - update_icon() + update_icon(UPDATE_ICON_STATE) + /obj/item/toy/balloon/wash(mob/user, atom/source) if(reagents.total_volume < 10) reagents.add_reagent("water", min(10-reagents.total_volume, 10)) to_chat(user, "You fill the balloon from the [source].") desc = "A translucent balloon with some form of liquid sloshing around in it." - update_icon() - return + update_icon(UPDATE_ICON_STATE) + -/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob, params) +/obj/item/toy/balloon/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks/drinkingglass)) if(O.reagents) if(O.reagents.total_volume < 1) @@ -97,8 +101,8 @@ desc = "A translucent balloon with some form of liquid sloshing around in it." to_chat(user, "You fill the balloon with the contents of [O].") O.reagents.trans_to(src, 10) - update_icon() - return + update_icon(UPDATE_ICON_STATE) + /obj/item/toy/balloon/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) if(reagents.total_volume >= 1) @@ -110,16 +114,17 @@ spawn(5) if(src) qdel(src) - return -/obj/item/toy/balloon/update_icon() - if(src.reagents.total_volume >= 1) + +/obj/item/toy/balloon/update_icon_state() + if(reagents.total_volume >= 1) icon_state = "waterballoon" item_state = "waterballoon" else icon_state = "waterballoon-e" item_state = "waterballoon-e" + /obj/item/toy/syndicateballoon name = "syndicate balloon" desc = "There is a tag on the back that reads \"FUK NT!11!\"." @@ -420,12 +425,6 @@ desc = "Mini-Mecha action figure! Collect them all! 11/11. This one is the mysterious Phazon combat mecha! Nobody's safe!" icon_state = "phazonprize" - - -/* -|| A Deck of Cards for playing various games of chance || -*/ - /obj/item/toy/nuke name = "\improper Nuclear Fission Explosive toy" desc = "A plastic model of a Nuclear Fission Explosive." @@ -433,22 +432,41 @@ icon_state = "nuketoyidle" w_class = WEIGHT_CLASS_SMALL var/cooldown = 0 + var/animation_stage = 0 + + +/obj/item/toy/nuke/update_icon_state() + switch(animation_stage) + if(1) + icon_state = "nuketoy" + if(2) + icon_state = "nuketoycool" + else + icon_state = initial(icon_state) + /obj/item/toy/nuke/attack_self(mob/user) if(cooldown < world.time) - cooldown = world.time + 1800 //3 minutes + cooldown = world.time + 3 MINUTES user.visible_message("[user] presses a button on [src]", "You activate [src], it plays a loud noise!", "You hear the click of a button.") - spawn(5) //gia said so - icon_state = "nuketoy" - playsound(src, 'sound/machines/alarm.ogg', 100, 0, 0) - sleep(135) - icon_state = "nuketoycool" - sleep(cooldown - world.time) - icon_state = "nuketoyidle" + INVOKE_ASYNC(src, PROC_REF(async_animation)) else var/timeleft = (cooldown - world.time) to_chat(user, "Nothing happens, and '[round(timeleft/10)]' appears on a small display.") + +/obj/item/toy/nuke/proc/async_animation() + animation_stage++ + update_icon(UPDATE_ICON_STATE) + playsound(src, 'sound/machines/alarm.ogg', 100, FALSE, 0) + sleep(13 SECONDS) + animation_stage++ + update_icon(UPDATE_ICON_STATE) + sleep(cooldown - world.time) + animation_stage = 0 + update_icon(UPDATE_ICON_STATE) + + /obj/item/toy/therapy name = "therapy doll" desc = "A toy for therapeutic and recreational purposes." @@ -949,25 +967,39 @@ icon_state = "ninja_plushie_green" item_state = "ninja_plushie_green" var/cooldown = 0 + var/plushie_color + + +/obj/item/toy/plushie/ninja/update_icon_state() + switch(plushie_color) + if("green") + icon_state = "ninja_plushie_green" + item_state = "ninja_plushie_green" + if("blue") + icon_state = "ninja_plushie_blue" + item_state = "ninja_plushie_blue" + if("red") + icon_state = "ninja_plushie_red" + item_state = "ninja_plushie_red" + else + icon_state = initial(icon_state) + item_state = initial(item_state) + /obj/item/toy/plushie/ninja/attack_self(mob/user as mob) . = ..() if(cooldown < world.time) cooldown = (world.time + 30) //3 second cooldown var/plushie_color = pick("green","blue","red") - switch (plushie_color) + update_icon(UPDATE_ICON_STATE) + switch(plushie_color) if("green") - icon_state = "ninja_plushie_green" - item_state = "ninja_plushie_green" user.visible_message(span_notice("[bicon(src)] The [name] says \"I am not afraid of the darkness! I am the darkness!\"")) if("blue") - icon_state = "ninja_plushie_blue" - item_state = "ninja_plushie_blue" user.visible_message(span_notice("[bicon(src)] The [name] says \"Your simple light won't stop me!\"")) if("red") - icon_state = "ninja_plushie_red" - item_state = "ninja_plushie_red" user.visible_message(span_notice("[bicon(src)] The [name] says \"You can run, but you can't hide!\"")) + plushie_color = null //New toys from another builds /obj/item/toy/plushie/nianplushie/beeplushie @@ -1038,9 +1070,6 @@ /obj/item/toy/plushie/blahaj/twohanded/Initialize(mapload) . = ..() - apply_twohanded_component() - -/obj/item/toy/plushie/blahaj/twohanded/proc/apply_twohanded_component() AddComponent(/datum/component/two_handed, require_twohands = TRUE) /obj/item/toy/plushie/blahaj/twohanded/attack_self(mob/user) @@ -1175,13 +1204,13 @@ desc = "Watch out for angry voxes!" -/obj/item/toy/plushie/pig/MouseDrop(atom/over) +/obj/item/toy/plushie/pig/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) . = ..() if(!.) return FALSE var/mob/user = usr - if(over != user || user.incapacitated() || !ishuman(user)) + if(over_object != user || user.incapacitated() || !ishuman(user)) return FALSE if(user.put_in_hands(src, ignore_anim = FALSE)) @@ -1541,22 +1570,33 @@ w_class = WEIGHT_CLASS_SMALL bubble_icon = "alien" var/cooldown = 0 + var/animating = FALSE + + +/obj/item/toy/toy_xeno/update_icon_state() + icon_state = animating ? "[initial(icon_state)]_used" : initial(icon_state) + /obj/item/toy/toy_xeno/attack_self(mob/user) if(cooldown <= world.time) cooldown = (world.time + 50) //5 second cooldown user.visible_message("[user] pulls back the string on [src].") - icon_state = "[initial(icon_state)]_used" - sleep(5) - atom_say("Hiss!") - var/list/possible_sounds = list('sound/voice/hiss1.ogg', 'sound/voice/hiss2.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss4.ogg') - playsound(get_turf(src), pick(possible_sounds), 50, 1) - spawn(45) - if(src) - icon_state = "[initial(icon_state)]" + INVOKE_ASYNC(src, PROC_REF(async_animation)) else to_chat(user, "The string on [src] hasn't rewound all the way!") - return + + +/obj/item/toy/toy_xeno/proc/async_animation() + animating = TRUE + update_icon(UPDATE_ICON_STATE) + sleep(0.5 SECONDS) + atom_say("Hiss!") + var/list/possible_sounds = list('sound/voice/hiss1.ogg', 'sound/voice/hiss2.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss4.ogg') + playsound(get_turf(src), pick(possible_sounds), 50, TRUE) + sleep(4.5 SECONDS) + animating = FALSE + update_icon(UPDATE_ICON_STATE) + /obj/item/toy/russian_revolver name = "russian revolver" @@ -1669,11 +1709,8 @@ wieldsound = 'sound/weapons/chainsawstart.ogg' attack_verb = list("sawed", "cut", "hacked", "carved", "cleaved", "butchered", "felled", "timbered") -/obj/item/twohanded/toy/chainsaw/update_icon() - if(wielded) - icon_state = "chainsaw[wielded]" - else - icon_state = "chainsaw0" +/obj/item/twohanded/toy/chainsaw/update_icon_state() + icon_state = "chainsaw[HAS_TRAIT(src, TRAIT_WIELDED)]" /* * Cat Toy @@ -1994,7 +2031,7 @@ var/on = 0 var/activation_sound = 'sound/items/buttonclick.ogg' -/obj/item/toy/desk/update_icon() +/obj/item/toy/desk/update_icon_state() if(on) icon_state = "[initial(icon_state)]-on" else @@ -2004,8 +2041,8 @@ on = !on if(activation_sound) playsound(src.loc, activation_sound, 75, 1) - update_icon() - return 1 + update_icon(UPDATE_ICON_STATE) + return TRUE /obj/item/toy/desk/verb/rotate() set name = "Rotate" @@ -2046,7 +2083,7 @@ /obj/item/toy/desk/newtoncradle/attack_self(mob/user) on = !on - update_icon() + update_icon(UPDATE_ICON_STATE) if(on) soundloop.start() else @@ -2064,7 +2101,7 @@ /obj/item/toy/desk/fan/attack_self(mob/user) on = !on - update_icon() + update_icon(UPDATE_ICON_STATE) if(on) soundloop.start() else diff --git a/code/game/objects/items/weapons/RCL.dm b/code/game/objects/items/weapons/RCL.dm index 48d606cabc7..08cdb091a93 100644 --- a/code/game/objects/items/weapons/RCL.dm +++ b/code/game/objects/items/weapons/RCL.dm @@ -34,7 +34,7 @@ loaded.amount = amount else return - update_icon() + update_icon(UPDATE_ICON_STATE) to_chat(user, "You add the cables to the [src]. It now contains [loaded.amount].") else ..() @@ -58,7 +58,7 @@ loaded.forceMove(user.loc) user.put_in_hands(loaded) loaded = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/twohanded/rcl/examine(mob/user) . = ..() @@ -71,7 +71,8 @@ active = 0 return ..() -/obj/item/twohanded/rcl/update_icon() + +/obj/item/twohanded/rcl/update_icon_state() if(!loaded) icon_state = "rcl-0" item_state = "rcl-0" @@ -89,10 +90,10 @@ else icon_state = "rcl-0" item_state = "rcl-0" - ..() + /obj/item/twohanded/rcl/proc/is_empty(mob/user, loud = 1) - update_icon() + update_icon(UPDATE_ICON_STATE) if(!loaded || !loaded.amount) if(loud) to_chat(user, "The last of the cables unreel from [src].") @@ -151,4 +152,4 @@ loaded = new() loaded.max_amount = max_amount loaded.amount = max_amount - update_icon() + update_icon(UPDATE_ICON_STATE) diff --git a/code/game/objects/items/weapons/RLF.dm b/code/game/objects/items/weapons/RLF.dm index ff64326c076..8155d560e77 100644 --- a/code/game/objects/items/weapons/RLF.dm +++ b/code/game/objects/items/weapons/RLF.dm @@ -10,7 +10,7 @@ RLF icon_state = "rlf" opacity = 0 density = 0 - anchored = 0.0 + anchored = FALSE armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index f28abbee5e6..747976d1fe6 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -11,7 +11,7 @@ RSF icon_state = "rsf" opacity = 0 density = 0 - anchored = 0.0 + anchored = FALSE var/matter = 0 var/mode = 1 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) @@ -31,7 +31,7 @@ RSF list("Deck of cards", 50, /obj/item/deck/cards), list("Prize ticket", 250, /obj/item/stack/tickets/five) ) - update_desc() + update_appearance(UPDATE_DESC) /obj/item/rsf/rff name = "\improper Rapid-Food-Fabricator" @@ -50,7 +50,7 @@ RSF list("Chimichanga", 3000, /obj/item/reagent_containers/food/snacks/chimichanga), list("Ikura sushi", 3000, /obj/item/reagent_containers/food/snacks/sushi_Ikura) ) - update_desc() + update_appearance(UPDATE_DESC) /obj/item/rsf/attackby(obj/item/W as obj, mob/user as mob, params) ..() @@ -72,9 +72,9 @@ RSF else mode++ to_chat(user, "Changed dispensing mode to '" + configured_items[mode][1] + "'") - update_desc() + update_appearance(UPDATE_DESC) -/obj/item/rsf/update_desc() +/obj/item/rsf/update_desc(updates = ALL) . = ..() desc = initial(desc) + " Currently set to dispense '[configured_items[mode][1]]'." diff --git a/code/game/objects/items/weapons/anomaly_extract.dm b/code/game/objects/items/weapons/anomaly_extract.dm index db8ce528f67..3ef0cf4d80d 100644 --- a/code/game/objects/items/weapons/anomaly_extract.dm +++ b/code/game/objects/items/weapons/anomaly_extract.dm @@ -1,3 +1,5 @@ +#define COOLDOWN_TO_SLIMEPERSON (10 SECONDS) +#define COOLDOWN_TO_SLIME_MOB (40 SECONDS) /obj/item/anomaly_extract name = "Strange syringe" desc = "Syringe with a blunt needle." @@ -41,7 +43,7 @@ sound = 'sound/effects/mob_effects/slime_squish.ogg' human_req = FALSE clothes_req = FALSE - base_cooldown = 1 MINUTES + base_cooldown = COOLDOWN_TO_SLIMEPERSON var/is_transformed = FALSE var/mob/living/carbon/human/original_body @@ -84,9 +86,9 @@ /obj/effect/proc_holder/spell/slime_degradation/before_cast(list/targets, mob/user) . = ..() if(is_transformed) - cooldown_handler.recharge_duration = 10 MINUTES + cooldown_handler.recharge_duration = COOLDOWN_TO_SLIME_MOB else - cooldown_handler.recharge_duration = 1 MINUTES + cooldown_handler.recharge_duration = COOLDOWN_TO_SLIMEPERSON /obj/effect/proc_holder/spell/slime_degradation/cast(list/targets, mob/living/carbon/human/user = usr) @@ -142,7 +144,7 @@ var/self_message = death_provoked ? span_userdanger("You can't take the strain of sustaining [user]'s shape in this condition, it begins to fall apart!") : span_notice("You start to transform back into human.") user.visible_message(span_warning("[user] shape becomes fuzzy before it takes human form!"), self_message, span_notice("You hear something squishing...")) if(death_provoked) - cooldown_handler.recharge_duration = 10 MINUTES + cooldown_handler.recharge_duration = COOLDOWN_TO_SLIME_MOB cooldown_handler.start_recharge() playsound(get_turf(usr), sound, 50, TRUE) user.density = FALSE @@ -237,3 +239,6 @@ M.mind.RemoveSpell(/obj/effect/proc_holder/spell/slime_degradation) M.mind.RemoveSpell(/obj/effect/proc_holder/spell/slime_selfheat) . = ..() + +#undef COOLDOWN_TO_SLIMEPERSON +#undef COOLDOWN_TO_SLIME_MOB diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm index 02482326efa..0e3ab7cd767 100644 --- a/code/game/objects/items/weapons/cash.dm +++ b/code/game/objects/items/weapons/cash.dm @@ -22,8 +22,7 @@ max_amount = CASHMAX merge_type = /obj/item/stack/spacecash -/obj/item/stack/spacecash/update_icon() - ..() +/obj/item/stack/spacecash/update_icon_state() name = "[amount == CASHMAX ? "[CASHMAX]" : amount] Credit[amount > 1 ? "s" : ""]" switch(amount) if(CASH1 to CASH2 - 1) @@ -114,8 +113,7 @@ ..() update_icon() -/obj/item/stack/spacecash/ussp/update_icon() - ..() +/obj/item/stack/spacecash/ussp/update_icon_state() name = "[amount == CASHMAX ? "[CASHMAX]" : amount] Ruble[amount > 1 ? "s" : ""]" switch(amount) if(CASH1 to CASH2 - 1) diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 2635469cbb5..02259af200c 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -63,8 +63,8 @@ TED = new(src.loc) qdel(src) -/obj/item/gun/energy/chrono_gun/update_icon() - return +/obj/item/gun/energy/chrono_gun/update_overlays() + return list() /obj/item/gun/energy/chrono_gun/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override, bonus_spread = 0) if(field) @@ -123,7 +123,7 @@ icon_state = "chronobolt" range = CHRONO_BEAM_RANGE color = null - nodamage = 1 + nodamage = TRUE var/obj/item/gun/energy/chrono_gun/gun = null /obj/item/projectile/energy/chrono_beam/fire() @@ -177,7 +177,7 @@ cached_icon.Insert(mob_icon, "frame[i]") mob_underlay = mutable_appearance(cached_icon, "frame1") - update_icon() + update_icon(UPDATE_ICON_STATE) desc = initial(desc) + "
It appears to contain [target.name]." START_PROCESSING(SSobj, src) @@ -191,7 +191,7 @@ /obj/structure/chrono_field/has_prints() return FALSE -/obj/structure/chrono_field/update_icon() +/obj/structure/chrono_field/update_icon_state() var/ttk_frame = 1 - (tickstokill / initial(tickstokill)) ttk_frame = clamp(CEILING(ttk_frame * CHRONO_FRAME_COUNT, 1), 1, CHRONO_FRAME_COUNT) if(ttk_frame != RPpos) @@ -220,7 +220,7 @@ captured.Paralyse(8 SECONDS) if(captured.loc != src) captured.forceMove(src) - update_icon() + update_icon(UPDATE_ICON_STATE) if(gun) if(gun.field_check(src)) tickstokill-- diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index f30408adbf3..be4efb96aa6 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -151,12 +151,6 @@ LIGHTERS ARE IN LIGHTERS.DM light("[user] lights [user.p_their()] [name] with [N]. Someone please give [user.p_their()] zippo..") - //can't think of any other way to update the overlays :< - user.update_inv_wear_mask() - user.update_inv_l_hand() - user.update_inv_r_hand() - - /obj/item/clothing/mask/cigarette/afterattack(obj/item/reagent_containers/glass/glass, mob/user, proximity) ..() if(!proximity) @@ -172,46 +166,59 @@ LIGHTERS ARE IN LIGHTERS.DM to_chat(user, "[src] is full.") +/obj/item/clothing/mask/cigarette/update_icon_state() + icon_state = lit ? icon_on : icon_off + item_state = lit ? icon_on : initial(item_state) + update_equipped_item() + + +/obj/item/clothing/mask/cigarette/update_name(updates = ALL) + . = ..() + name = lit ? "lit [initial(name)]" : initial(name) + + /obj/item/clothing/mask/cigarette/proc/light(flavor_text = null) - if(!lit) - lit = TRUE - name = "lit [name]" - attack_verb = list("burnt", "singed") - hitsound = 'sound/items/welder.ogg' - damtype = "fire" - force = 4 - if(reagents.get_reagent_amount("plasma")) // the plasma explodes when exposed to fire - var/datum/effect_system/reagents_explosion/e = new() - e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0) - e.start() - if(ismob(loc)) - var/mob/M = loc - M.temporarily_remove_item_from_inventory(src, force = TRUE) - qdel(src) - return - if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently - var/datum/effect_system/reagents_explosion/e = new() - e.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0) - e.start() - if(ismob(loc)) - var/mob/M = loc - M.temporarily_remove_item_from_inventory(src, force = TRUE) - qdel(src) - return - reagents.set_reacting(TRUE) - reagents.handle_reactions() - icon_state = icon_on - item_state = icon_on - if(flavor_text) - var/turf/T = get_turf(src) - T.visible_message(flavor_text) - if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - if(H.wear_mask == src) // Don't update if it's just in their hand - H.wear_mask_update(src) - set_light(2, 0.25, "#E38F46") - START_PROCESSING(SSobj, src) - playsound(src, 'sound/items/lighter/light.ogg', 25, TRUE) + if(lit) + return + + lit = TRUE + attack_verb = list("burnt", "singed") + hitsound = 'sound/items/welder.ogg' + damtype = FIRE + force = 4 + + if(check_reagents_explosion()) + return + + reagents.set_reacting(TRUE) + reagents.handle_reactions() + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) + if(flavor_text) + var/turf/T = get_turf(src) + T.visible_message(flavor_text) + set_light(2, 0.25, "#E38F46") + START_PROCESSING(SSobj, src) + playsound(src, 'sound/items/lighter/light.ogg', 25, TRUE) + + +/obj/item/clothing/mask/cigarette/proc/check_reagents_explosion() + var/reagent = "" + var/reagent_divisor = 2.5 + if(reagents.get_reagent_amount("plasma")) + reagent = "plasma" + else if(reagents.get_reagent_amount("fuel")) + reagent = "fuel" + reagent_divisor = 5 + if(!reagent) + return FALSE + + var/datum/effect_system/reagents_explosion/explosion = new + explosion.set_up(round(reagents.get_reagent_amount(reagent) / reagent_divisor, 1), get_turf(src), 0, 0) + if(ismob(loc)) + var/mob/user = loc + user.temporarily_remove_item_from_inventory(src, force = TRUE) + qdel(src) + return TRUE /obj/item/clothing/mask/cigarette/process() @@ -403,16 +410,11 @@ LIGHTERS ARE IN LIGHTERS.DM /obj/item/clothing/mask/cigarette/pipe/light(flavor_text = null) if(!lit) lit = TRUE - damtype = "fire" - icon_state = icon_on - item_state = icon_on + damtype = FIRE + update_icon(UPDATE_ICON_STATE) if(flavor_text) var/turf/T = get_turf(src) T.visible_message(flavor_text) - if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - if(H.wear_mask == src) // Don't update if it's just in their hand - H.wear_mask_update(src) START_PROCESSING(SSobj, src) /obj/item/clothing/mask/cigarette/pipe/process() @@ -420,13 +422,11 @@ LIGHTERS ARE IN LIGHTERS.DM smoketime-- if(smoketime < 1) new /obj/effect/decal/cleanable/ash(location) + lit = FALSE + update_icon(UPDATE_ICON_STATE) if(ismob(loc)) var/mob/living/M = loc to_chat(M, "Your [name] goes out, and you empty the ash.") - lit = FALSE - icon_state = icon_off - item_state = icon_off - M.update_inv_wear_mask() STOP_PROCESSING(SSobj, src) return smoke() @@ -435,8 +435,7 @@ LIGHTERS ARE IN LIGHTERS.DM if(lit) user.visible_message("[user] puts out [src].") lit = FALSE - icon_state = icon_off - item_state = icon_off + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return if(smoketime <= 0) diff --git a/code/game/objects/items/weapons/conversion_kit.dm b/code/game/objects/items/weapons/conversion_kit.dm index 4eb09ff6f6e..98d4fe87dd3 100644 --- a/code/game/objects/items/weapons/conversion_kit.dm +++ b/code/game/objects/items/weapons/conversion_kit.dm @@ -2,20 +2,19 @@ /obj/item/conversion_kit name = "\improper Revolver Conversion Kit" desc = "A professional conversion kit used to convert any knock off revolver into the real deal capable of shooting lethal .357 rounds without the possibility of catastrophic failure." - icon_state = "kit" + icon_state = "kit_0" flags = CONDUCT w_class = WEIGHT_CLASS_SMALL origin_tech = "combat=2" - var/open = 0 + var/open = FALSE -/obj/item/conversion_kit/New() - ..() - update_icon() -/obj/item/conversion_kit/update_icon() - icon_state = "[initial(icon_state)]_[open]" +/obj/item/conversion_kit/update_icon_state() + icon_state = "kit_[open]" + /obj/item/conversion_kit/attack_self(mob/user) open = !open to_chat(user, "You [open ? "open" : "close"] the conversion kit.") - update_icon() + update_icon(UPDATE_ICON_STATE) + diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 68407db2445..03e5bee0d3f 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -58,17 +58,23 @@ colour = pick(lipstick_colors) name = "[colour] lipstick" + +/obj/item/lipstick/update_icon_state() + . = ..() + icon_state = "lipstick[open ? "_uncap" : ""]" + + +/obj/item/lipstick/update_overlays() + . = ..() + if(open) + . += mutable_appearance(icon, icon_state = "lipstick_uncap_color", color = lipstick_colors[colour]) + + /obj/item/lipstick/attack_self(mob/user) - cut_overlays() to_chat(user, "You twist \the [src] [open ? "closed" : "open"].") open = !open - if(open) - var/mutable_appearance/colored = mutable_appearance('icons/obj/items.dmi', "lipstick_uncap_color") - colored.color = lipstick_colors[colour] - icon_state = "lipstick_uncap" - add_overlay(colored) - else - icon_state = "lipstick" + update_icon() + /obj/item/lipstick/attack(mob/M, mob/user) if(!open || !istype(M)) diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 0a01992d56f..1c9135d5b50 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -16,43 +16,62 @@ "Vox" = 'icons/mob/clothing/species/vox/back.dmi' ) - var/paddles_on_defib = TRUE //if the paddles are on the defib (TRUE) - var/safety = TRUE //if you can zap people with the defibs on harm mode - var/powered = FALSE //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise + /// If the paddles are currently attached to the unit. + var/paddles_on_defib = TRUE + /// if there's a cell in the defib with enough power for a revive; blocks paddles from reviving otherwise + var/powered = FALSE + /// Ref to attached paddles var/obj/item/twohanded/shockpaddles/paddles + /// Ref to internal power cell. var/obj/item/stock_parts/cell/high/cell = null - var/combat = FALSE //can we revive through space suits? - + /// If false, using harm intent will let you zap people. Note that any updates to this after init will only impact icons. + var/safety = TRUE + /// If true, this can be used through hardsuits, and can cause heart attacks in harm intent. + var/combat = FALSE + // If safety is false and combat is true, the chance that this will cause a heart attack. + var/heart_attack_probability = 30 + /// If this is vulnerable to EMPs. + var/hardened = FALSE + /// If this can be emagged. + var/emag_proof = FALSE /// Type of paddles that should be attached to this defib. var/obj/item/twohanded/shockpaddles/paddle_type = /obj/item/twohanded/shockpaddles -/obj/item/defibrillator/get_cell() - return cell -/obj/item/defibrillator/New() //starts without a cell for rnd - ..() +/obj/item/defibrillator/Initialize(mapload) // Base version starts without a cell for rnd + . = ..() paddles = new paddle_type(src) - update_icon() - return + update_icon(UPDATE_OVERLAYS) -/obj/item/defibrillator/loaded/New() //starts with hicap - ..() + +/obj/item/defibrillator/Destroy() + if(!paddles_on_defib) + var/holder = get(paddles.loc, /mob/living/carbon/human) + retrieve_paddles(holder) + QDEL_NULL(paddles) + QDEL_NULL(cell) + return ..() + + +/obj/item/defibrillator/loaded/Initialize(mapload) // Loaded version starts with high-capacity cell. + . = ..() cell = new(src) - update_icon() - return + update_icon(UPDATE_OVERLAYS) + -/obj/item/defibrillator/update_icon() +/obj/item/defibrillator/get_cell() + return cell + + +/obj/item/defibrillator/update_icon(updates = ALL) update_power() - update_overlays() - update_charge() + ..() - for(var/X in actions) - var/datum/action/A = X - A.UpdateButtonIcon() /obj/item/defibrillator/examine(mob/user) . = ..() - . += "Ctrl-click to remove the paddles from the defibrillator." + . += span_info("Ctrl-Click to remove the paddles from the defibrillator.") + /obj/item/defibrillator/proc/update_power() if(cell) @@ -63,190 +82,176 @@ else powered = FALSE + /obj/item/defibrillator/update_overlays() - overlays.Cut() + . = ..() if(paddles_on_defib) - overlays += "[icon_state]-paddles" + . += "[icon_state]-paddles" if(powered) - overlays += "[icon_state]-powered" - if(!cell) - overlays += "[icon_state]-nocell" + . += "[icon_state]-powered" if(!safety) - overlays += "[icon_state]-emagged" - -/obj/item/defibrillator/proc/update_charge() - if(powered && cell) //so it doesn't show charge if it's unpowered + . += "[icon_state]-emagged" + if(powered && cell) var/ratio = cell.charge / cell.maxcharge ratio = CEILING(ratio*4, 1) * 25 - overlays += "[icon_state]-charge[ratio]" + . += "[icon_state]-charge[ratio]" + if(!cell) + . += "[icon_state]-nocell" + /obj/item/defibrillator/CheckParts(list/parts_list) ..() cell = locate(/obj/item/stock_parts/cell) in contents - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/ui_action_click(mob/user) if(!ishuman(user) || !Adjacent(user)) return - toggle_paddles() + toggle_paddles(user) /obj/item/defibrillator/CtrlClick(mob/user) if(!ishuman(user) || !Adjacent(user)) return - toggle_paddles() + toggle_paddles(user) /obj/item/defibrillator/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stock_parts/cell)) var/obj/item/stock_parts/cell/C = W if(cell) - to_chat(user, "[src] already has a cell.") + to_chat(user, span_notice("[src] already has a cell.")) else if(C.maxcharge < paddles.revivecost) - to_chat(user, "[src] requires a higher capacity cell.") + to_chat(user, span_notice("[src] requires a higher capacity cell.")) return if(!user.drop_transfer_item_to_loc(W, src)) return cell = W - to_chat(user, "You install a cell in [src].") - - else if(istype(W, /obj/item/screwdriver)) - if(cell) - cell.update_icon() - cell.loc = get_turf(loc) - cell = null - to_chat(user, "You remove the cell from the [src].") + update_icon(UPDATE_OVERLAYS) + to_chat(user, span_notice("You install a cell in [src].")) else if(W == paddles) - toggle_paddles() - - update_icon() - return + toggle_paddles(user) -/obj/item/defibrillator/emag_act(mob/user) - if(safety) - add_attack_logs(user, src, "emagged") - safety = FALSE - if(user) - to_chat(user, "You silently disable [src]'s safety protocols with the card.") else - add_attack_logs(user, src, "un-emagged") - safety = TRUE - if(user) - to_chat(user, "You silently enable [src]'s safety protocols with the card.") - update_icon() + return ..() + + +/obj/item/defibrillator/screwdriver_act(mob/living/user, obj/item/I) + if(!cell) + to_chat(user, span_notice("[src] doesn't have a cell.")) + return + + // we want an infinite power cell to stay inside (used in advanced compact defib) + if(istype(cell, /obj/item/stock_parts/cell/infinite)) + to_chat(user, span_notice("[src] somehow resists your attempt to remove a cell.")) + return + + cell.update_icon() + cell.forceMove_turf() + cell = null + I.play_tool_sound(src) + to_chat(user, span_notice("You remove the cell from [src].")) + update_icon(UPDATE_OVERLAYS) + return TRUE /obj/item/defibrillator/emp_act(severity) if(cell) deductcharge(1000 / severity) - if(safety) - safety = FALSE - visible_message("[src] beeps: Safety protocols disabled!") - playsound(get_turf(src), 'sound/machines/defib_saftyoff.ogg', 50, 0) - else - safety = TRUE - visible_message("[src] beeps: Safety protocols enabled!") - playsound(get_turf(src), 'sound/machines/defib_saftyon.ogg', 50, 0) - update_icon() + safety = !safety + update_icon(UPDATE_OVERLAYS) + ..() + +/obj/item/defibrillator/emag_act(mob/user) + add_attack_logs(user, src, "[safety ? "" : "un-"]emagged") + safety = !safety ..() + update_icon(UPDATE_OVERLAYS) -/obj/item/defibrillator/verb/toggle_paddles() +/obj/item/defibrillator/verb/toggle_paddles_verb() set name = "Toggle Paddles" set category = "Object" + set src in oview(1) + toggle_paddles(usr) + + +/obj/item/defibrillator/proc/toggle_paddles(mob/living/carbon/human/user = usr) if(!paddles) - to_chat(usr, span_warning("[src] has no paddles!")) + to_chat(user, span_warning("[src] has no paddles!")) return if(paddles_on_defib) - //Detach the paddles into the user's hands + dispence_paddles(user) + else + retrieve_paddles(user) + + for(var/datum/action/action as anything in actions) + action.UpdateButtonIcon() - var/mob/living/carbon/human/user = usr - var/obj/item/organ/external/temp2 = user.bodyparts_by_name[BODY_ZONE_PRECISE_R_HAND] - var/obj/item/organ/external/temp = user.bodyparts_by_name[BODY_ZONE_PRECISE_L_HAND] - if(user.incapacitated()) - return +/obj/item/defibrillator/proc/dispence_paddles(mob/living/carbon/human/user) + if(!paddles || !paddles_on_defib || !ishuman(user) || user.incapacitated()) + return - if(!temp || !temp.is_usable() && !temp2 || !temp2.is_usable()) - to_chat(user, span_warning("You can't use your hand to take out the paddles!")) - return + //Detach the paddles into the user's hands + var/obj/item/organ/external/hand_left = user.get_organ(BODY_ZONE_PRECISE_L_HAND) + var/obj/item/organ/external/hand_right = user.get_organ(BODY_ZONE_PRECISE_R_HAND) - if((user.r_hand != null && user.l_hand != null)) - to_chat(user, span_warning("You need a free hand to hold the paddles!")) - return + if((!hand_left || !hand_left.is_usable()) && (!hand_right || !hand_right.is_usable())) + to_chat(user, span_warning("You can't use your hands to take out the paddles!")) + return - //We need to do this like that since defib paddles have their own behavior on dropped() - if(!is_on_user(user)) - paddles.forceMove_turf() + paddles.loc = get_turf(src) // we need this to play animation properly + if(!user.put_in_hands(paddles, ignore_anim = FALSE)) + paddles.loc = src + to_chat(user, span_warning("You need a free hand to hold the paddles!")) + return - if(!user.put_in_hands(paddles, ignore_anim = FALSE)) - paddles.forceMove(src) - to_chat(user, span_warning("You need a free hand to hold the paddles!")) - return + paddles_on_defib = FALSE + paddles.update_icon(UPDATE_ICON_STATE) + update_icon(UPDATE_OVERLAYS) - paddles_on_defib = FALSE - else //remove in any case because some automatic shit - remove_paddles(usr) - update_icon() +/obj/item/defibrillator/proc/retrieve_paddles(mob/user) + if(!paddles || paddles_on_defib) + return + if(user?.is_in_hands(paddles)) + user.drop_item_ground(paddles) + paddles.do_pickup_animation(src) + paddles.forceMove(src) + paddles_on_defib = TRUE + update_icon(UPDATE_OVERLAYS) + paddles.update_icon(UPDATE_ICON_STATE) /obj/item/defibrillator/equipped(mob/user, slot) - ..() + . = ..() if(slot != slot_back) - remove_paddles(user) - update_icon() + retrieve_paddles(user) -/obj/item/defibrillator/item_action_slot_check(slot, mob/user) - if(slot == slot_back) - return TRUE - -/obj/item/defibrillator/proc/remove_paddles(mob/user) // from your hands - if(user.is_in_hands(paddles)) - return user.drop_item_ground(paddles) - return TRUE +/obj/item/defibrillator/item_action_slot_check(slot, mob/user) + return slot == slot_back -/obj/item/defibrillator/Destroy() - if(!paddles_on_defib) - var/M = get(paddles, /mob) - remove_paddles(M) - QDEL_NULL(paddles) - QDEL_NULL(cell) - return ..() -/obj/item/defibrillator/proc/deductcharge(var/chrgdeductamt) +/obj/item/defibrillator/proc/deductcharge(chrgdeductamt) if(cell) if(cell.charge < (paddles.revivecost+chrgdeductamt)) powered = FALSE - update_icon() + update_icon(UPDATE_OVERLAYS) if(cell.use(chrgdeductamt)) - update_icon() + update_icon(UPDATE_OVERLAYS) return TRUE else - update_icon() + update_icon(UPDATE_OVERLAYS) return FALSE -/obj/item/defibrillator/proc/cooldowncheck(var/mob/user) - paddles.update_icon() - spawn(50) - if(cell) - if(cell.charge >= paddles.revivecost) - user.visible_message("[src] beeps: Unit ready.") - playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50, 0) - else - user.visible_message("[src] beeps: Charge depleted.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - paddles.cooldown = FALSE - paddles.update_icon() - update_icon() - /obj/item/defibrillator/compact name = "compact defibrillator" desc = "A belt-equipped defibrillator that can be rapidly deployed." @@ -260,11 +265,10 @@ if(slot == slot_belt) return TRUE -/obj/item/defibrillator/compact/loaded/New() - ..() +/obj/item/defibrillator/compact/loaded/Initialize(mapload) + . = ..() cell = new(src) - update_icon() - return + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/compact/combat name = "combat defibrillator" @@ -274,12 +278,12 @@ paddle_type = /obj/item/twohanded/shockpaddles/syndicate combat = TRUE safety = FALSE + heart_attack_probability = 100 -/obj/item/defibrillator/compact/combat/loaded/New() - ..() +/obj/item/defibrillator/compact/combat/loaded/Initialize(mapload) + . = ..() cell = new(src) - update_icon() - return + update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/compact/advanced name = "advanced compact defibrillator" @@ -290,17 +294,21 @@ combat = TRUE safety = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF //Objective item, better not have it destroyed. + heart_attack_probability = 10 + var/next_emp_message //to prevent spam from the emagging message on the advanced defibrillator + /obj/item/defibrillator/compact/advanced/attackby(obj/item/W, mob/user, params) if(W == paddles) - toggle_paddles() - update_icon() + toggle_paddles(user) -/obj/item/defibrillator/compact/advanced/loaded/New() - ..() + +/obj/item/defibrillator/compact/advanced/loaded/Initialize(mapload) + . = ..() cell = new /obj/item/stock_parts/cell/infinite(src) - update_icon() + update_icon(UPDATE_OVERLAYS) + /obj/item/defibrillator/compact/advanced/emp_act(severity) if(world.time > next_emp_message) @@ -321,11 +329,12 @@ resistance_flags = INDESTRUCTIBLE toolspeed = 1 flags = ABSTRACT - + /// Amount of power used on a shock. var/revivecost = 1000 - var/cooldown = FALSE - var/busy = FALSE + /// Active defib this is connected to. var/obj/item/defibrillator/defib + /// Whether or not the paddles are on cooldown. Used for tracking icon states. + var/on_cooldown = FALSE /obj/item/twohanded/shockpaddles/advanced name = "advanced defibrillator paddles" @@ -339,272 +348,131 @@ icon_state = "syndiepaddles" item_state = "syndiepaddles" + /obj/item/twohanded/shockpaddles/New(mainunit) - ..() - if(check_defib_exists(mainunit, src)) - defib = mainunit - loc = defib - busy = FALSE - update_icon() - return + . = ..() + add_defib_component(mainunit) -/obj/item/twohanded/shockpaddles/proc/spend_charge() +/obj/item/twohanded/shockpaddles/proc/add_defib_component(mainunit) + if(check_defib_exists(mainunit)) + update_icon(UPDATE_ICON_STATE) + AddComponent(/datum/component/defib, actual_unit = defib, combat = defib.combat, safe_by_default = defib.safety, heart_attack_chance = defib.heart_attack_probability, emp_proof = defib.hardened, emag_proof = defib.emag_proof) + else + AddComponent(/datum/component/defib) + RegisterSignal(src, COMSIG_DEFIB_READY, PROC_REF(on_cooldown_expire)) + RegisterSignal(src, COMSIG_DEFIB_SHOCK_APPLIED, PROC_REF(after_shock)) + RegisterSignal(src, COMSIG_DEFIB_PADDLES_APPLIED, PROC_REF(on_application)) + +/obj/item/twohanded/shockpaddles/Destroy() + defib = null + return ..() + +/// Check to see if we should abort this before we've even gotten started +/obj/item/twohanded/shockpaddles/proc/on_application(obj/item/paddles, mob/living/user, mob/living/carbon/human/target, should_cause_harm) + SIGNAL_HANDLER // COMSIG_DEFIB_PADDLES_APPLIED + + if(!HAS_TRAIT(src, TRAIT_WIELDED)) + to_chat(user, "You need to wield the paddles in both hands before you can use them on someone!") + return COMPONENT_BLOCK_DEFIB_MISC + + if(!defib.powered) + return COMPONENT_BLOCK_DEFIB_DEAD + + +/obj/item/twohanded/shockpaddles/proc/on_cooldown_expire(obj/item/paddles) + SIGNAL_HANDLER // COMSIG_DEFIB_READY + on_cooldown = FALSE + if(defib.cell) + if(defib.cell.charge >= revivecost) + defib.visible_message(span_notice("[defib] beeps: Unit ready.")) + playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50) + else + defib.visible_message(span_notice("[defib] beeps: Charge depleted.")) + playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) + update_icon(UPDATE_ICON_STATE) + defib.update_icon(UPDATE_ICON_STATE) + + +/obj/item/twohanded/shockpaddles/proc/after_shock() + SIGNAL_HANDLER // COMSIG_DEFIB_SHOCK_APPLIED + on_cooldown = TRUE defib.deductcharge(revivecost) + update_icon(UPDATE_ICON_STATE) -/obj/item/twohanded/shockpaddles/proc/trigger_cooldown(mob/user) - cooldown = TRUE - defib.cooldowncheck(user) +/obj/item/twohanded/shockpaddles/update_icon_state() + var/is_wielded = HAS_TRAIT(src, TRAIT_WIELDED) + icon_state = "[initial(icon_state)][is_wielded][on_cooldown ? "_cooldown" : ""]" + item_state = "[initial(icon_state)][is_wielded]" -/obj/item/twohanded/shockpaddles/update_icon() - icon_state = "[initial(icon_state)][wielded]" - item_state = "[initial(icon_state)][wielded]" - if(cooldown) - icon_state = "[initial(icon_state)][wielded]_cooldown" /obj/item/twohanded/shockpaddles/suicide_act(mob/user) - user.visible_message("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message(span_suicide("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide.")) defib.deductcharge(revivecost) playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) return OXYLOSS + /obj/item/twohanded/shockpaddles/dropped(mob/user, silent = FALSE) - update_icon() + . = ..() if(defib) - to_chat(user, span_notice("The paddles snap back into the main unit.")) - if(!defib.is_on_user(user)) - do_pickup_animation(defib) - forceMove(defib) - defib.paddles_on_defib = TRUE - defib.update_icon() - else - return ..() + defib.toggle_paddles(user) + if(!silent) + to_chat(user, span_notice("The paddles snap back into the main unit.")) /obj/item/twohanded/shockpaddles/equip_to_best_slot(mob/user, force = FALSE) - user.drop_item_ground(src) + user.drop_item_ground(src) /obj/item/twohanded/shockpaddles/on_mob_move(dir, mob/user) if(defib && !in_range(defib, src)) user.drop_item_ground(src, force = TRUE) -/obj/item/twohanded/shockpaddles/proc/check_defib_exists(mainunit, var/mob/living/carbon/human/M, var/obj/O) - if(!mainunit || !istype(mainunit, /obj/item/defibrillator)) //To avoid weird issues from admin spawns - M.temporarily_remove_item_from_inventory(O, TRUE) - qdel(O) - return FALSE - else - return TRUE - -/obj/item/twohanded/shockpaddles/attack(mob/M, mob/user) - var/tobehealed - var/threshold = -HEALTH_THRESHOLD_DEAD - var/mob/living/carbon/human/H = M - - var/is_combat_borg = FALSE - if(isrobot(user)) - var/mob/living/silicon/robot/R = user - is_combat_borg = istype(R.module, /obj/item/robot_module/syndicate_medical) || istype(R.module, /obj/item/robot_module/ninja) - - var/ignores_hardsuits = defib?.combat || is_combat_borg - - if(busy) - return - if(!isrobot(user) && !defib.powered) - user.visible_message("[defib] beeps: Unit is unpowered.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - return - if(!isrobot(user) && !wielded) - to_chat(user, "You need to wield the paddles in both hands before you can use them on someone!") - return - if(cooldown) - to_chat(user, "[defib || src] is recharging.") - return - if(!ishuman(M)) - if(isrobot(user)) - to_chat(user, "This unit is only designed to work on humanoid lifeforms.") - else - to_chat(user, "The instructions on [defib] don't mention how to revive that...") - return - else - var/can_harm - if(isrobot(user)) - var/mob/living/silicon/robot/R = user - can_harm = R.emagged || is_combat_borg - else - can_harm = !defib.safety - - if(user.a_intent == INTENT_HARM && can_harm) - busy = TRUE - H.visible_message("[user] has touched [H.name] with [src]!", \ - "[user] has touched [H.name] with [src]!") - H.adjustStaminaLoss(50) - H.Weaken(4 SECONDS) - playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) - H.emote("gasp") - if(!H.undergoing_cardiac_arrest() && (prob(10) || defib?.combat)) // Your heart explodes. - H.set_heartattack(TRUE) - H.shock_internal_organs(100) - add_attack_logs(user, M, "Stunned with [src]") - busy = FALSE - spend_charge(user) - trigger_cooldown(user) - return - user.visible_message("[user] begins to place [src] on [M.name]'s chest.", "You begin to place [src] on [M.name]'s chest.") - busy = TRUE - if(do_after(user, 30 * toolspeed * gettoolspeedmod(user), target = M)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process - user.visible_message("[user] places [src] on [M.name]'s chest.", "You place [src] on [M.name]'s chest.") - playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0) - var/mob/dead/observer/ghost = H.get_ghost(TRUE) - if(ghost && !ghost.client) - // In case the ghost's not getting deleted for some reason - H.key = ghost.key - log_runtime(EXCEPTION("Ghost of name [ghost.name] is bound to [H.real_name], but lacks a client. Deleting ghost."), src) - - QDEL_NULL(ghost) - var/tplus = world.time - H.timeofdeath - var/tlimit = DEFIB_TIME_LIMIT - var/tloss = DEFIB_TIME_LOSS - if(do_after(user, 20 * toolspeed * gettoolspeedmod(user), target = M)) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total - for(var/obj/item/carried_item in H.contents) - if(istype(carried_item, /obj/item/clothing/suit/space)) - if(!ignores_hardsuits) - user.visible_message("[defib || src] buzzes: Patient's chest is obscured. Operation aborted.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - busy = FALSE - return - if(H.undergoing_cardiac_arrest()) - if(!H.get_int_organ(/obj/item/organ/internal/heart) && !H.get_int_organ(/obj/item/organ/internal/brain/slime)) //prevents defibing someone still alive suffering from a heart attack attack if they lack a heart - user.visible_message("[defib || src] buzzes: Resuscitation failed - Failed to pick up any heart electrical activity.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - busy = FALSE - return - else - var/obj/item/organ/internal/heart/heart = H.get_int_organ(/obj/item/organ/internal/heart) - if(heart.is_dead()) - user.visible_message("[defib || src] buzzes: Resuscitation failed - Heart necrosis detected.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - busy = FALSE - return - H.set_heartattack(FALSE) - H.shock_internal_organs(100) - user.visible_message("[defib || src] pings: Cardiac arrhythmia corrected.") - M.visible_message("[M]'s body convulses a bit.") - playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) - playsound(get_turf(src), "bodyfall", 50, 1) - playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0) - busy = FALSE - spend_charge(user) - trigger_cooldown(user) - return - if(H.stat == DEAD) - var/health = H.health - M.visible_message("[M]'s body convulses a bit.") - playsound(get_turf(src), "bodyfall", 50, 1) - playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) - var/total_cloneloss = H.cloneloss - var/total_bruteloss = 0 - var/total_burnloss = 0 - for(var/obj/item/organ/external/O as anything in H.bodyparts) - total_bruteloss += O.brute_dam - total_burnloss += O.burn_dam - if(total_cloneloss <= 180 && total_bruteloss <= 180 && total_burnloss <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations) && (H.mind && H.mind.is_revivable()) && (H.get_int_organ(/obj/item/organ/internal/heart) || H.get_int_organ(/obj/item/organ/internal/brain/slime))) - tobehealed = min(health + threshold, 0) // It's HILARIOUS without this min statement, let me tell you - tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived - H.adjustOxyLoss(tobehealed) - H.adjustToxLoss(tobehealed) - user.visible_message("[defib || src] pings: Resuscitation successful.") - playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0) - H.update_revive(TRUE, TRUE) - H.KnockOut() - H.Paralyse(10 SECONDS) - H.emote("gasp") - if(tplus > tloss) - H.setBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100)))) - - if(ishuman(H.pulledby)) // for some reason, pulledby isnt a list despite it being possible to be pulled by multiple people - excess_shock(user, H, H.pulledby) - for(var/obj/item/grab/G in H.grabbed_by) - if(ishuman(G.assailant)) - excess_shock(user, H, G.assailant) - - H.shock_internal_organs(100) - H.med_hud_set_health() - H.med_hud_set_status() - add_attack_logs(user, M, "Revived with [src]") - else - if(tplus > tlimit|| !H.get_int_organ(/obj/item/organ/internal/heart)) - user.visible_message("[defib || src] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation.") - else if(total_cloneloss > 180 || total_bruteloss > 180 || total_burnloss > 180) - user.visible_message("[defib || src] buzzes: Resuscitation failed - Severe tissue damage detected.") - else if(ghost) - if(!ghost.can_reenter_corpse) // DNR or AntagHUD - user.visible_message("[defib || src] buzzes: Resucitation failed: No electrical brain activity detected.") - else - user.visible_message("[defib || src] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.") - to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)") - window_flash(ghost.client) - ghost << sound('sound/effects/genetics.ogg') - else - user.visible_message("[defib || src] buzzes: Resuscitation failed.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - - spend_charge(user) - trigger_cooldown(user) - else - user.visible_message("[defib || src] buzzes: Patient is not in a valid state. Operation aborted.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - busy = FALSE -/* - * user = the person using the defib - * origin = person being revived - * affecting = person being shocked with excess energy from the defib -*/ -/obj/item/twohanded/shockpaddles/proc/excess_shock(mob/user, mob/living/carbon/human/origin, mob/living/carbon/human/affecting) - if(user == affecting) - return - if(electrocute_mob(affecting, defib.cell, origin)) // shock anyone touching them >:) - var/obj/item/organ/internal/heart/HE = affecting.get_organ_slot(INTERNAL_ORGAN_HEART) - if(HE.parent_organ_zone == BODY_ZONE_CHEST && affecting.has_both_hands()) // making sure the shock will go through their heart (drask hearts are in their head), and that they have both arms so the shock can cross their heart inside their chest - affecting.visible_message("[affecting]'s entire body shakes as a shock travels up their arm!", \ - "You feel a powerful shock travel up your [affecting.hand ? affecting.get_organ(BODY_ZONE_L_ARM) : affecting.get_organ(BODY_ZONE_R_ARM)] and back down your [affecting.hand ? affecting.get_organ(BODY_ZONE_L_ARM) : affecting.get_organ(BODY_ZONE_R_ARM)]!") - affecting.set_heartattack(TRUE) +/obj/item/twohanded/shockpaddles/proc/check_defib_exists(obj/item/defibrillator/mainunit) + if(!mainunit || !istype(mainunit)) //To avoid weird issues from admin spawns + qdel(src) + return FALSE + loc = mainunit + defib = mainunit + return TRUE /obj/item/twohanded/shockpaddles/borg desc = "A pair of mounted paddles with flat metal surfaces that are used to deliver powerful electric shocks." icon_state = "defibpaddles0" item_state = "defibpaddles0" - -/obj/item/twohanded/shockpaddles/borg/check_defib_exists() - // No-op. + var/safety = TRUE + var/heart_attack_probability = 10 /obj/item/twohanded/shockpaddles/borg/dropped(mob/user, silent = FALSE) SHOULD_CALL_PARENT(FALSE) // No-op. -/obj/item/twohanded/shockpaddles/borg/spend_charge(mob/user) - var/mob/living/silicon/robot/R = user - R.cell.use(revivecost) - /obj/item/twohanded/shockpaddles/borg/attack_self() // Standard two-handed weapon behavior is disabled. + return -/obj/item/twohanded/shockpaddles/borg/trigger_cooldown(mob/user) - cooldown = TRUE - update_icon() - var/mob/living/silicon/robot/R = user - spawn(50) - if(R.cell.charge >= revivecost) - user.visible_message("[src] beeps: Unit ready.") - playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50, 0) - else - user.visible_message("[src] beeps: Charge depleted.") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) - cooldown = FALSE - update_icon() +/obj/item/twohanded/shockpaddles/borg/add_defib_component(mainunit) + var/is_combat_borg = istype(loc, /obj/item/robot_module/syndicate_medical) || istype(loc, /obj/item/robot_module/ninja) + + AddComponent(/datum/component/defib, robotic = TRUE, combat = is_combat_borg, safe_by_default = safety, emp_proof = TRUE, heart_attack_chance = heart_attack_probability) + + RegisterSignal(src, COMSIG_DEFIB_READY, PROC_REF(on_cooldown_expire)) + RegisterSignal(src, COMSIG_DEFIB_SHOCK_APPLIED, PROC_REF(after_shock)) + +/obj/item/twohanded/shockpaddles/borg/after_shock(obj/item/defib, mob/user) + on_cooldown = TRUE + if(isrobot(user)) + var/mob/living/silicon/robot/R = user + R.cell.use(revivecost) + update_icon(UPDATE_ICON_STATE) + +/obj/item/twohanded/shockpaddles/borg/on_cooldown_expire(obj/item/paddles) + visible_message(span_notice("[src] beeps: Defibrillation unit ready.")) + playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50, 0) + on_cooldown = FALSE + update_icon(UPDATE_ICON_STATE) + +/obj/item/twohanded/shockpaddles/borg/update_icon_state() + icon_state = "[initial(icon_state)][on_cooldown ? "_cooldown" : ""]" -/obj/item/twohanded/shockpaddles/borg/update_icon() - icon_state = "[initial(icon_state)]" - if(cooldown) - icon_state = "[initial(icon_state)]_cooldown" diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 8e6df9cde26..e7b90a0942c 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -6,25 +6,42 @@ can_hold = list(/obj/item/dice) allow_wrap = FALSE + /obj/item/storage/pill_bottle/dice/populate_contents() + var/special_die = pick("1", "2", "fudge", "00", "100") + if(special_die == "1") + new /obj/item/dice/d1(src) + if(special_die == "2") + new /obj/item/dice/d2(src) new /obj/item/dice/d4(src) new /obj/item/dice/d6(src) + if(special_die == "fudge") + new /obj/item/dice/fudge(src) new /obj/item/dice/d8(src) new /obj/item/dice/d10(src) + if(special_die == "00") + new /obj/item/dice/d00(src) new /obj/item/dice/d12(src) new /obj/item/dice/d20(src) - var/special_die = pick("1","2","fudge","00","100") - switch(special_die) - if("1") - new /obj/item/dice/d1(src) - if("2") - new /obj/item/dice/d2(src) - if("fudge") - new /obj/item/dice/fudge(src) - if("00") - new /obj/item/dice/d00(src) - if("100") - new /obj/item/dice/d100(src) + if(special_die == "100") + new /obj/item/dice/d100(src) + + +/obj/item/storage/box/dice + name = "Коробка игральных костей" + desc = "ЕЩЁ ОДНИ!? ДА БЛЯДЬ!" + icon_state = "box" + + +/obj/item/storage/box/dice/populate_contents() + new /obj/item/dice/d2(src) + new /obj/item/dice/d4(src) + new /obj/item/dice/d8(src) + new /obj/item/dice/d10(src) + new /obj/item/dice/d00(src) + new /obj/item/dice/d12(src) + new /obj/item/dice/d20(src) + /obj/item/storage/pill_bottle/dice/suicide_act(mob/user) user.visible_message("[user] Игра[pluralize_ru(user.gender,"ет","ют")] со смертью! Похоже, он[genderize_ru(user.gender,"","а","о","и")] пыта[pluralize_ru(user.gender,"ется","ются")] покончить жизнь самоубийством!") @@ -44,11 +61,18 @@ var/rigged = DICE_NOT_RIGGED var/rigged_value + /obj/item/dice/Initialize(mapload) . = ..() if(!result) result = roll(sides) - update_icon() + update_icon(UPDATE_OVERLAYS) + + +/obj/item/dice/update_overlays() + . = ..() + . += "[icon_state][result]" + /obj/item/dice/suicide_act(mob/user) user.visible_message("[user] играет со смертью! Похоже [user.p_theyre()] пытается покончить жизнь самоубийством!") @@ -122,8 +146,10 @@ icon_state = "d100" sides = 100 -/obj/item/dice/d100/update_icon() - return + +/obj/item/dice/d100/update_overlays() + return list() + /obj/item/dice/d20/e20 var/triggered = FALSE @@ -151,7 +177,7 @@ comment = "ДВАДЦАТКА!" else if(sides == 20 && result == 1) comment = "М-да, невезуха." - update_icon() + update_icon(UPDATE_OVERLAYS) if(initial(icon_state) == "d00") result = (result - 1) * 10 if(length(special_faces) == sides) @@ -193,20 +219,190 @@ add_attack_logs(user, src, "detonated with a roll of [actual_result]", ATKLOG_FEW) explosion(epicenter, round(result * 0.25), round(result * 0.5), round(result), round(result * 1.5), TRUE, capped, cause = key_name(user)+" E20") -/obj/item/dice/update_icon() - overlays.Cut() - overlays += "[icon_state][result]" -/obj/item/storage/box/dice - name = "Коробка игральных костей" - desc = "ЕЩЁ ОДНИ!? ДА БЛЯДЬ!" - icon_state = "box" +// Die of Fate +/obj/item/dice/d20/fate + name = "\improper Die of Fate" + desc = "A die with twenty sides. You can feel unearthly energies radiating from it. Using this might be VERY risky." + icon_state = "d20" + var/reusable = TRUE + var/used = FALSE + +/obj/item/dice/d20/fate/stealth + name = "d20" + desc = "A die with twenty sides. The preferred die to throw at the GM." + +/obj/item/dice/d20/fate/one_use + reusable = FALSE + +/obj/item/dice/d20/fate/one_use/stealth + name = "d20" + desc = "A die with twenty sides. The preferred die to throw at the GM." + +/obj/item/dice/d20/fate/cursed + name = "cursed Die of Fate" + desc = "A die with twenty sides. You feel that rolling this is a REALLY bad idea." + color = "#00BB00" + + rigged = DICE_TOTALLY_RIGGED + rigged_value = 1 + +/obj/item/dice/d20/fate/diceroll(mob/user) + . = ..() + if(!used) + if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards)) + to_chat(user, "You feel the magic of the dice is restricted to ordinary humans!") + return + + if(!reusable) + used = TRUE + + var/turf/T = get_turf(src) + T.visible_message("[src] flares briefly.") + + addtimer(CALLBACK(src, PROC_REF(effect), user, .), 1 SECONDS) + +/obj/item/dice/d20/fate/equipped(mob/user, slot, initial) + . = ..() + + if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards)) + to_chat(user, "You feel the magic of the dice is restricted to ordinary humans! You should leave it alone.") + user.drop_item_ground(src) + +/obj/item/dice/d20/fate/proc/create_smoke(amount) + var/datum/effect_system/smoke_spread/smoke = new + smoke.set_up(amount, 0, drop_location()) + smoke.start() + +/obj/item/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user, roll) + var/turf/T = get_turf(src) + switch(roll) + if(1) + //Dust + T.visible_message("[user] turns to dust!") + user.dust() + if(2) + //Death + T.visible_message("[user] suddenly dies!") + user.death() + if(3) + //Swarm of creatures + T.visible_message("A swarm of creatures surround [user]!") + for(var/direction in GLOB.alldirs) + new /mob/living/simple_animal/hostile/netherworld(get_step(get_turf(user),direction)) + if(4) + //Destroy Equipment + T.visible_message("Everything [user] is holding and wearing disappears!") + for(var/obj/item/I in user) + if(istype(I, /obj/item/implant) || istype(I, /obj/item/organ)) + continue + qdel(I) + if(5) + //Monkeying + T.visible_message("[user] transforms into a monkey!") + user.monkeyize() + if(6) + //Cut speed + T.visible_message("[user] starts moving slower!") + var/datum/species/S = user.dna.species + S.speed_mod += 1 + if(7) + //Throw + T.visible_message("Unseen forces throw [user]!") + user.Stun(12 SECONDS) + user.adjustBruteLoss(50) + var/throw_dir = GLOB.cardinal + var/atom/throw_target = get_edge_target_turf(user, throw_dir) + user.throw_at(throw_target, 200, 4) + if(8) + //Fueltank Explosion + T.visible_message("An explosion bursts into existence around [user]!") + explosion(get_turf(user),-1,0,2, flame_range = 2, cause = src) + if(9) + //Cold + T.visible_message("[user] looks a little under the weather!") + var/datum/disease/virus/cold/D = new + D.Contract(user) + if(10) + //Nothing + T.visible_message("Nothing seems to happen.") + if(11) + //Cookie + T.visible_message("A cookie appears out of thin air!") + var/obj/item/reagent_containers/food/snacks/cookie/C = new(drop_location()) + create_smoke(2) + C.name = "Cookie of Fate" + if(12) + //Healing + T.visible_message("[user] looks very healthy!") + user.revive() + if(13) + //Mad Dosh + T.visible_message("Mad dosh shoots out of [src]!") + var/turf/Start = get_turf(src) + for(var/direction in GLOB.alldirs) + var/turf/dirturf = get_step(Start,direction) + if(rand(0,1)) + new /obj/item/stack/spacecash/c1000(dirturf) + else + var/obj/item/storage/bag/money/M = new(dirturf) + for(var/i in 1 to rand(5,50)) + new /obj/item/coin/gold(M) + if(14) + //Free Gun + T.visible_message("An impressive gun appears!") + create_smoke(2) + new /obj/item/gun/projectile/revolver/mateba(drop_location()) + if(15) + //Random One-use spellbook + T.visible_message("A magical looking book drops to the floor!") + create_smoke(2) + new /obj/item/spellbook/oneuse/random(drop_location()) + if(16) + //Servant & Servant Summon + T.visible_message("A Dice Servant appears in a cloud of smoke!") + var/mob/living/carbon/human/H = new(drop_location()) + create_smoke(2) + + H.equipOutfit(/datum/outfit/butler) + var/datum/mind/servant_mind = new /datum/mind() + var/datum/objective/O = new + O.owner = servant_mind + O.target = user.mind + O.explanation_text = "Serve [user.real_name]." + servant_mind.objectives += O + servant_mind.transfer_to(H) + + var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the servant of [user.real_name]?", ROLE_WIZARD, poll_time = 30 SECONDS, source = H) + if(LAZYLEN(candidates)) + var/mob/dead/observer/C = pick(candidates) + message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Dice Servant") + H.key = C.key + to_chat(H, "You are a servant of [user.real_name]. You must do everything in your power to follow their orders.") + + var/obj/effect/proc_holder/spell/summonmob/S = new + S.target_mob = H + user.mind.AddSpell(S) + + if(17) + //Tator Kit + T.visible_message("A suspicious box appears!") + new /obj/item/storage/box/syndicate(drop_location()) + create_smoke(2) + if(18) + //Captain ID + T.visible_message("A golden identification card appears!") + new /obj/item/card/id/captains_spare(drop_location()) + create_smoke(2) + if(19) + //Instrinct Resistance + T.visible_message("[user] looks very robust!") + var/datum/species/S = user.dna.species + S.brute_mod *= 0.5 + S.burn_mod *= 0.5 + + if(20) + //Free wizard! + T.visible_message("Magic flows out of [src] and into [user]!") + user.mind.make_Wizard() -/obj/item/storage/box/dice/populate_contents() - new /obj/item/dice/d2(src) - new /obj/item/dice/d4(src) - new /obj/item/dice/d8(src) - new /obj/item/dice/d10(src) - new /obj/item/dice/d00(src) - new /obj/item/dice/d12(src) - new /obj/item/dice/d20(src) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index a6a59400212..c2113a08ee8 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -33,6 +33,16 @@ QDEL_NULL(buf) return ..() + +/obj/item/dnainjector/update_icon_state() + icon_state = "[initial(icon_state)][used ? "0" : ""]" + + +/obj/item/dnainjector/update_desc(updates = ALL) + . = ..() + desc = used ? "[initial(desc)] This one is used up." : initial(desc) + + /obj/item/dnainjector/proc/GetRealBlock(selblock) if(selblock == 0) return block @@ -67,51 +77,62 @@ else return buf.dna.SetUIValue(real_block,val) -/obj/item/dnainjector/proc/inject(mob/living/M, mob/user) + +/obj/item/dnainjector/proc/inject(mob/living/carbon/human/target, mob/user) if(used) return - if(isliving(M)) - M.apply_effect(rand(20 / (damage_coeff ** 2), 50 / (damage_coeff ** 2)), IRRADIATE, 0, 1) - var/mob/living/carbon/human/H - if(ishuman(M)) - H = M + + if(isliving(target)) + target.apply_effect(rand(20 / (damage_coeff ** 2), 50 / (damage_coeff ** 2)), IRRADIATE, 0, 1) + + if(!ishuman(target)) + return if(!buf) - log_runtime(EXCEPTION("[src] used by [user] on [M] failed to initialize properly."), src) + log_runtime(EXCEPTION("[src] used by [user] on [target] failed to initialize properly."), src) return used = TRUE - icon_state = "[icon_state]0" - desc += " This one is used up." - - spawn(0) //Some mutations have sleeps in them, like monkey - if(!(NOCLONE in M.mutations) && !(H && (NO_DNA in H.dna.species.species_traits))) // prevents drained people from having their DNA changed - var/prev_ue = M.dna.unique_enzymes - // UI in syringe. - if(buf.types & DNA2_BUF_UI) - if(!block) //isolated block? - M.dna.UI = buf.dna.UI.Copy() - M.dna.UpdateUI() - M.UpdateAppearance() - if(buf.types & DNA2_BUF_UE) //unique enzymes? yes - - M.real_name = buf.dna.real_name - M.name = buf.dna.real_name - M.dna.real_name = buf.dna.real_name - M.dna.unique_enzymes = buf.dna.unique_enzymes - else - M.dna.SetUIValue(block,src.GetValue()) - M.UpdateAppearance() - if(buf.types & DNA2_BUF_SE) - if(!block) //isolated block? - M.dna.SE = buf.dna.SE.Copy() - M.dna.UpdateSE() - else - M.dna.SetSEValue(block,src.GetValue()) - domutcheck(M, null, forcedmutation ? MUTCHK_FORCED : 0) - M.update_mutations() - if(H) - H.sync_organ_dna(assimilate = 0, old_ue = prev_ue) + update_appearance(UPDATE_ICON_STATE|UPDATE_DESC) + INVOKE_ASYNC(src, PROC_REF(async_update), target) //Some mutations have sleeps in them, like monkey + + +/obj/item/dnainjector/proc/async_update(mob/living/carbon/human/target) + // prevents drained people from having their DNA changed + if(!target.dna || (NOCLONE in target.mutations) || (NO_DNA in target.dna.species.species_traits)) + return + + var/datum/dna/target_dna = target.dna + var/prev_UE = target_dna.unique_enzymes + + // UI in syringe + if(buf.types & DNA2_BUF_UI) + if(!block) //isolated block? + target_dna.UI = buf.dna.UI.Copy() + target_dna.UpdateUI() + target.UpdateAppearance() + + if(buf.types & DNA2_BUF_UE) //unique enzymes? yes + target.real_name = buf.dna.real_name + target.name = buf.dna.real_name + target_dna.real_name = buf.dna.real_name + target_dna.unique_enzymes = buf.dna.unique_enzymes + else + target_dna.SetUIValue(block, GetValue()) + target.UpdateAppearance() + + // SE in syringe + if(buf.types & DNA2_BUF_SE) + if(!block) //isolated block? + target_dna.SE = buf.dna.SE.Copy() + target_dna.UpdateSE() + else + target_dna.SetSEValue(block, GetValue()) + domutcheck(target, null, forcedmutation ? MUTCHK_FORCED : NONE) + target.update_mutations() + + target.sync_organ_dna(assimilate = FALSE, old_ue = prev_UE) + /obj/item/dnainjector/attack(mob/M, mob/user) if(used) diff --git a/code/game/objects/items/weapons/dna_upgrader.dm b/code/game/objects/items/weapons/dna_upgrader.dm index 3ca2bf1cdb4..4821d4d498c 100644 --- a/code/game/objects/items/weapons/dna_upgrader.dm +++ b/code/game/objects/items/weapons/dna_upgrader.dm @@ -13,6 +13,16 @@ icon_state = "dnaupgrader" var/used = FALSE + +/obj/item/dna_upgrader/update_icon_state() + icon_state = "dnaupgrader[used ? "0" : ""]" + + +/obj/item/dna_upgrader/update_name(updates = ALL) + . = ..() + name = used ? "used [initial(name)]" : initial(name) + + /obj/item/dna_upgrader/attack_self(mob/user) if(!used) ui_interact(user) @@ -79,7 +89,7 @@ H.gene_stability += 25 to_chat(H, span_notice("You feel like your body rebasing.")) used = TRUE - icon_state = "[icon_state]0" + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) return TRUE #undef VAULT_TOXIN diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm index 1dcc4a942c2..cefe9f7abc8 100644 --- a/code/game/objects/items/weapons/dnascrambler.dm +++ b/code/game/objects/items/weapons/dnascrambler.dm @@ -4,15 +4,22 @@ icon = 'icons/obj/hypo.dmi' item_state = "syringe_0" icon_state = "lepopen" - var/used = null + var/used = FALSE -/obj/item/dnascrambler/update_icon() + +/obj/item/dnascrambler/update_icon_state() if(used) icon_state = "lepopen0" else icon_state = "lepopen" -/obj/item/dnascrambler/attack(mob/M as mob, mob/user as mob) + +/obj/item/dnascrambler/update_name(updates = ALL) + . = ..() + name = used ? "used [initial(name)]" : initial(name) + + +/obj/item/dnascrambler/attack(mob/M, mob/user) if(!M || !user) return @@ -53,6 +60,6 @@ target.update_icons() add_attack_logs(user, target, "injected with [src]") - used = 1 - update_icon() - name = "used " + name + used = TRUE + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME) + diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index e2478d00882..edf464fd696 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -4,89 +4,108 @@ icon_state = "plastic-explosive0" item_state = "plastic-explosive" flags = NOBLUDGEON - det_time = 10 + det_time = 10 SECONDS display_timer = 0 origin_tech = "syndicate=1" toolspeed = 1 - var/atom/target = null - var/image_overlay = null - var/obj/item/assembly_holder/nadeassembly = null + var/atom/target + var/image_overlay + var/obj/item/assembly_holder/nadeassembly var/assemblyattacher var/notify_admins = TRUE -/obj/item/grenade/plastic/New() + +/obj/item/grenade/plastic/Initialize(mapload) + . = ..() image_overlay = image('icons/obj/weapons/grenade.dmi', "[item_state]2") - ..() + /obj/item/grenade/plastic/Destroy() QDEL_NULL(nadeassembly) target = null return ..() + /obj/item/grenade/plastic/attackby(obj/item/I, mob/user, params) if(!nadeassembly && istype(I, /obj/item/assembly_holder)) - var/obj/item/assembly_holder/A = I - if(!user.drop_item_ground(I)) + var/obj/item/assembly_holder/assembly_holder = I + if(!user.drop_transfer_item_to_loc(I, src)) return ..() - nadeassembly = A - A.master = src - A.loc = src + nadeassembly = assembly_holder + assembly_holder.master = src assemblyattacher = user.ckey - to_chat(user, "You add [A] to the [name].") + to_chat(user, "You add [assembly_holder] to the [name].") playsound(src, 'sound/weapons/tap.ogg', 20, 1) - update_icon() + update_icon(UPDATE_ICON_STATE) return - if(nadeassembly && istype(I, /obj/item/wirecutters)) + if(nadeassembly && I.tool_behaviour == TOOL_WIRECUTTER) playsound(src, I.usesound, 20, 1) - nadeassembly.loc = get_turf(src) + nadeassembly.forceMove_turf() nadeassembly.master = null nadeassembly = null - update_icon() + update_icon(UPDATE_ICON_STATE) return ..() + //assembly stuff /obj/item/grenade/plastic/receive_signal() prime() + /obj/item/grenade/plastic/Crossed(atom/movable/AM, oldloc) if(nadeassembly) nadeassembly.Crossed(AM, oldloc) + /obj/item/grenade/plastic/on_found(mob/finder) if(nadeassembly) nadeassembly.on_found(finder) + /obj/item/grenade/plastic/attack_self(mob/user) if(nadeassembly) nadeassembly.attack_self(user) return - var/newtime = input(usr, "Please set the timer.", "Timer", det_time) as num + var/newtime = input(usr, "Please set the timer (in seconds).", "Timer", det_time/10) as null|num + if(isnull(newtime)) + return if(user.is_in_active_hand(src)) - newtime = clamp(newtime, initial(det_time), 60000) - det_time = newtime - to_chat(user, "Timer set for [det_time] seconds.") + newtime = round(newtime) + det_time = clamp(newtime SECONDS, initial(det_time), 10 MINUTES) + to_chat(user, "Timer set for [newtime] seconds.") + + /obj/item/grenade/plastic/afterattack(atom/movable/AM, mob/user, flag) - if (!flag) + if(!flag) + return + if(iscarbon(AM)) + to_chat(user, "You can't get the [src] to stick to [AM]!") return - if (istype(AM, /mob/living/carbon)) + if(isobserver(AM)) + to_chat(user, "Your hand just phases through [AM]!") return - to_chat(user, "You start planting the [src]. The timer is set to [det_time]...") - - if(do_after(user, 50 * toolspeed * gettoolspeedmod(user), target = AM)) - if(!user.drop_item_ground(src)) - return - src.target = AM - loc = null - if(notify_admins) - message_admins("[ADMIN_LOOKUPFLW(user)] planted [src.name] on [target.name] at [ADMIN_COORDJMP(target)] with [det_time] second fuse") - add_game_logs("planted [name] on [target.name] at [COORD(target)] with [det_time] second fuse", user) - - target.overlays += image_overlay - if(!nadeassembly) - to_chat(user, "You plant the bomb. Timer counting down from [det_time].") - addtimer(CALLBACK(src, PROC_REF(prime)), det_time*10) + to_chat(user, "You start planting [src].[isnull(nadeassembly) ? " The timer is set to [det_time/10]..." : ""]") + + if(!do_after(user, 50 * toolspeed * gettoolspeedmod(user), target = AM)) + return + + if(!user.drop_item_ground(src)) + return + + target = AM + do_pickup_animation(AM) + loc = null + if(notify_admins) + message_admins("[ADMIN_LOOKUPFLW(user)] planted [src.name] on [target.name] at [ADMIN_COORDJMP(target)] with [det_time/10] second fuse") + add_game_logs("planted [name] on [target.name] at [COORD(target)] with [det_time/10] second fuse", user) + + AddComponent(/datum/component/persistent_overlay, image_overlay, target) + if(!nadeassembly) + to_chat(user, "You plant the bomb. Timer counting down from [det_time/10].") + addtimer(CALLBACK(src, PROC_REF(prime)), det_time) + /obj/item/grenade/plastic/suicide_act(mob/user) message_admins("[ADMIN_LOOKUPFLW(user)] suicided with [src.name] at [ADMIN_COORDJMP(user)]") @@ -119,12 +138,14 @@ user.gib() return OBLITERATION -/obj/item/grenade/plastic/update_icon() + +/obj/item/grenade/plastic/update_icon_state() if(nadeassembly) icon_state = "[item_state]1" else icon_state = "[item_state]0" + ////////////////////////// ///// The Explosives ///// ////////////////////////// @@ -145,7 +166,6 @@ location = get_turf(target) // Set the explosion location to turf if planted directly on a wall or floor else location = get_atom_on_turf(target) // Otherwise, make sure we're blowing up what's on top of the turf - target.overlays -= image_overlay else location = get_atom_on_turf(src) if(location) @@ -250,7 +270,7 @@ /obj/item/grenade/plastic/x4/thermite name = "T4" desc = "A wall breaching charge, containing fuel, metal oxide and metal powder mixed in just the right way. One hell of a combination. Effective against walls, ineffective against airlocks..." - det_time = 2 + det_time = 2 SECONDS icon_state = "t4breach0" item_state = "t4breach" @@ -259,7 +279,6 @@ if(target) if(!QDELETED(target)) location = get_turf(target) - target.overlays -= image_overlay else location = get_turf(src) if(location) @@ -268,7 +287,7 @@ if(target && target.density) var/turf/T = get_step(location, aim_dir) for(var/turf/simulated/wall/W in range(1, location)) - W.thermitemelt(speed = 30) + W.thermitemelt(time = 3 SECONDS) addtimer(CALLBACK(GLOBAL_PROC, /proc/explosion, T, 0, 0, 2), 3) addtimer(CALLBACK(smoke, TYPE_PROC_REF(/datum/effect_system/smoke_spread, start)), 3) else @@ -276,7 +295,6 @@ addtimer(CALLBACK(GLOBAL_PROC, /proc/explosion, T, 0, 0, 2), 3) addtimer(CALLBACK(smoke, TYPE_PROC_REF(/datum/effect_system/smoke_spread, start)), 3) - if(isliving(target)) var/mob/living/M = target M.adjust_fire_stacks(2) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 5e41af4e072..602e834f465 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -40,21 +40,34 @@ sprite_name = "miniFE" dog_fashion = null + +/obj/item/extinguisher/Initialize(mapload) + . = ..() + if(!reagents) + create_reagents(max_water) + reagents.add_reagent("water", max_water) + + /obj/item/extinguisher/examine(mob/user) . = ..() . += "The safety is [safety ? "on" : "off"]." -/obj/item/extinguisher/New() - ..() - create_reagents(max_water) - reagents.add_reagent("water", max_water) + +/obj/item/extinguisher/update_icon_state() + icon_state = "[sprite_name][!safety]" + + +/obj/item/extinguisher/update_desc(updates = ALL) + . = ..() + desc = "The safety is [safety ? "on" : "off"]." + + /obj/item/extinguisher/attack_self(mob/user as mob) safety = !safety - src.icon_state = "[sprite_name][!safety]" - src.desc = "The safety is [safety ? "on" : "off"]." + update_appearance(UPDATE_ICON_STATE|UPDATE_DESC) to_chat(user, "The safety is [safety ? "on" : "off"].") - return + /obj/item/extinguisher/attack_obj(obj/O, mob/living/user, params) if(AttemptRefill(O, user)) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index ca0f4756b24..3a02ab76dd3 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -48,21 +48,25 @@ igniter.flamethrower_process(location) -/obj/item/flamethrower/update_icon() - cut_overlays() +/obj/item/flamethrower/update_icon(updates = ALL) + . = ..() + update_equipped_item() + + + +/obj/item/flamethrower/update_icon_state() + item_state = "flamethrower_[lit]" + + +/obj/item/flamethrower/update_overlays() + . = ..() if(igniter) - add_overlay("+igniter[status]") + . += "+igniter[status]" if(ptank) - add_overlay("+ptank") + . += "+ptank" if(lit) - add_overlay("+lit") - item_state = "flamethrower_1" - else - item_state = "flamethrower_0" - if(ismob(loc)) - var/mob/M = loc - M.update_inv_l_hand() - M.update_inv_r_hand() + . += "+lit" + /obj/item/flamethrower/can_enter_storage(obj/item/storage/S, mob/user) if(lit) diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index 132ec7649fa..09b93ee0444 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -19,12 +19,11 @@ strangling = null return ..() -/obj/item/twohanded/garrote/update_icon() +/obj/item/twohanded/garrote/update_icon_state() if(strangling) // If we're strangling someone we want our icon to stay wielded icon_state = "garrot_unwrap" return - - icon_state = "garrot_[wielded ? "un" : ""]wrap" + icon_state = "garrot_[HAS_TRAIT(src, TRAIT_WIELDED) ? "un" : ""]wrap" /obj/item/twohanded/garrote/improvised // Made via tablecrafting name = "garrote" @@ -32,12 +31,11 @@ icon_state = "garrot_I_wrap" improvised = 1 -/obj/item/twohanded/garrote/improvised/update_icon() +/obj/item/twohanded/garrote/improvised/update_icon_state() if(strangling) icon_state = "garrot_I_unwrap" return - - icon_state = "garrot_I_[wielded ? "un" : ""]wrap" + icon_state = "garrot_I_[HAS_TRAIT(src, TRAIT_WIELDED) ? "un" : ""]wrap" /obj/item/twohanded/garrote/unwield(obj/item/source, mob/living/carbon/user) @@ -46,7 +44,7 @@ "You remove the [src] from [strangling]'s neck.") strangling.garroted_by.Remove(src) strangling = null - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) @@ -102,7 +100,7 @@ garrote_time = world.time + 10 START_PROCESSING(SSobj, src) strangling = M - update_icon() + update_icon(UPDATE_ICON_STATE) playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1) @@ -110,19 +108,18 @@ "[U] begins garroting you with the [src]![improvised ? "" : " You are unable to speak!"]", \ "You hear struggling and wire strain against flesh!") - return /obj/item/twohanded/garrote/process() if(!strangling) // Our mark got gibbed or similar - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return if(!istype(loc, /mob/living/carbon/human)) strangling = null - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return @@ -141,7 +138,7 @@ strangling.garroted_by.Remove(src) strangling = null - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return @@ -152,7 +149,7 @@ strangling.garroted_by.Remove(src) strangling = null - update_icon() + update_icon(UPDATE_ICON_STATE) STOP_PROCESSING(SSobj, src) return diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 2291671194d..649897ee351 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -42,7 +42,7 @@ /obj/effect/spresent/attackby(obj/item/W as obj, mob/user as mob, params) ..() - if(!istype(W, /obj/item/wirecutters)) + if(W.tool_behaviour != TOOL_WIRECUTTER) to_chat(user, "I need wirecutters for that.") return diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm index ea2cbc5f6cf..6c954b8c497 100644 --- a/code/game/objects/items/weapons/grenades/bananade.dm +++ b/code/game/objects/items/weapons/grenades/bananade.dm @@ -45,7 +45,7 @@ qdel(I) else to_chat(usr, "The bananade is full, screwdriver it shut to lock it down.") - if(istype(I, /obj/item/screwdriver)) + if(I.tool_behaviour == TOOL_SCREWDRIVER) if(fillamt) var/obj/item/grenade/bananade/G = new /obj/item/grenade/bananade(drop_location()) if(!remove_item_from_storage(user)) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index ffa8a8b4b5f..15fec3a3187 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -25,22 +25,26 @@ var/contained = "" // For logging var/cores = "" // Also for logging -/obj/item/grenade/chem_grenade/New() - ..() + +/obj/item/grenade/chem_grenade/Initialize(mapload) + . = ..() create_reagents(1000) if(payload_name) payload_name += " " // formatting, ignore me update_icon() + /obj/item/grenade/chem_grenade/Destroy() QDEL_NULL(nadeassembly) if (!no_splash) QDEL_LIST(beakers) return ..() + /obj/item/grenade/chem_grenade/examine(mob/user) - . = ..() display_timer = (stage == READY && !nadeassembly) //show/hide the timer based on assembly state + . = ..() + /obj/item/grenade/chem_grenade/proc/get_trigger() if(!nadeassembly) return null @@ -49,21 +53,11 @@ return O return null -/obj/item/grenade/chem_grenade/update_overlays() - underlays = list() - if(nadeassembly) - underlays += "[nadeassembly.a_left.icon_state]_left" - for(var/O in nadeassembly.a_left.attached_overlays) - underlays += "[O]_l" - underlays += "[nadeassembly.a_right.icon_state]_right" - for(var/O in nadeassembly.a_right.attached_overlays) - underlays += "[O]_r" -/obj/item/grenade/chem_grenade/update_icon() +/obj/item/grenade/chem_grenade/update_icon_state() if(nadeassembly) icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = bomb_state - update_overlays() var/obj/item/assembly/A = get_trigger() if(stage != READY) name = "bomb casing[label]" @@ -75,7 +69,6 @@ else icon = 'icons/obj/weapons/grenade.dmi' icon_state = initial(icon_state) - overlays = list() switch(stage) if(EMPTY) name = "grenade casing[label]" @@ -89,12 +82,21 @@ icon_state += "_locked" name = payload_name + "grenade" + label + underlays.Cut() + if(nadeassembly) + underlays += "[nadeassembly.a_left.icon_state]_left" + for(var/O in nadeassembly.a_left.attached_overlays) + underlays += "[O]_l" + underlays += "[nadeassembly.a_right.icon_state]_right" + for(var/O in nadeassembly.a_right.attached_overlays) + underlays += "[O]_r" + /obj/item/grenade/chem_grenade/attack_self(mob/user) if(stage == READY && !active) if(nadeassembly) nadeassembly.attack_self(user) - update_icon() + update_icon(UPDATE_ICON_STATE) else if(clown_check(user)) // This used to go before the assembly check, but that has absolutely zero to do with priming the damn thing. You could spam the admins with it. investigate_log("[key_name_log(usr)] has primed a [name] for detonation [contained].", INVESTIGATE_BOMB) @@ -127,38 +129,9 @@ else if(label) label = null - update_icon() + update_icon(UPDATE_ICON_STATE) to_chat(user, "You remove the label from [src].") return 1 - if(istype(I, /obj/item/screwdriver)) - if(stage == WIRED) - if(beakers.len) - to_chat(user, "You lock the assembly.") - playsound(loc, prime_sound, 25, -3) - stage = READY - update_icon() - contained = "" - cores = "" // clear them out so no recursive logging by accidentally - for(var/obj/O in beakers) - if(!O.reagents) continue - if(istype(O,/obj/item/slime_extract)) - cores += " [O]" - for(var/R in O.reagents.reagent_list) - var/datum/reagent/reagent = R - contained += "[reagent.volume] [reagent], " - if(contained) - if(cores) - contained = "\[[cores]; [contained]\]" - else - contained = "\[ [contained]\]" - add_attack_logs(user, src, "has completed with [contained]", ATKLOG_FEW) - else - to_chat(user, "You need to add at least one beaker before locking the assembly.") - else if(stage == READY && !nadeassembly) - det_time = det_time == 50 ? 30 : 50 //toggle between 30 and 50 - to_chat(user, "You modify the time delay. It's set for [det_time / 10] second\s.") - else if(stage == EMPTY) - to_chat(user, "You need to add an activation mechanism.") else if(stage == WIRED && is_type_in_list(I, allowed_containers)) if(beakers.len == 2) @@ -187,7 +160,7 @@ assemblyattacher = user.ckey stage = WIRED to_chat(user, "You add [A] to [src]!") - update_icon() + update_icon(UPDATE_ICON_STATE) else if(stage == EMPTY && istype(I, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = I @@ -195,14 +168,14 @@ stage = WIRED to_chat(user, "You rig [src].") - update_icon() + update_icon(UPDATE_ICON_STATE) - else if(stage == READY && istype(I, /obj/item/wirecutters)) + else if(stage == READY && I.tool_behaviour == TOOL_WIRECUTTER) to_chat(user, "You unlock the assembly.") stage = WIRED - update_icon() + update_icon(UPDATE_ICON_STATE) - else if(stage == WIRED && istype(I, /obj/item/wrench)) + else if(stage == WIRED && I.tool_behaviour == TOOL_WRENCH) to_chat(user, "You open the grenade and remove the contents.") stage = EMPTY payload_name = null @@ -218,7 +191,47 @@ for(var/obj/O in beakers) O.loc = get_turf(src) beakers = list() - update_icon() + update_icon(UPDATE_ICON_STATE) + + +/obj/item/grenade/chem_grenade/screwdriver_act(mob/living/user, obj/item/I) + if(stage == WIRED) + if(!length(beakers)) + to_chat(user, "You need to add at least one beaker before locking the assembly.") + return TRUE + + to_chat(user, "You lock the assembly.") + playsound(loc, prime_sound, 25, -3) + stage = READY + update_icon(UPDATE_ICON_STATE) + contained = "" + cores = "" // clear them out so no recursive logging by accidentally + for(var/obj/O in beakers) + if(!O.reagents) + continue + if(istype(O, /obj/item/slime_extract)) + cores += " [O]" + for(var/R in O.reagents.reagent_list) + var/datum/reagent/reagent = R + contained += "[reagent.volume] [reagent], " + if(contained) + if(cores) + contained = "\[[cores]; [contained]\]" + else + contained = "\[ [contained]\]" + var/turf/bombturf = get_turf(loc) + add_attack_logs(user, src, "has completed with [contained]", ATKLOG_MOST) + log_game("[key_name(usr)] has completed [name] at [bombturf.x], [bombturf.y], [bombturf.z]. [contained]") + return TRUE + + else if(stage == READY && !nadeassembly) + det_time = det_time == 5 SECONDS ? 3 SECONDS : 5 SECONDS + to_chat(user, "You modify the time delay. It's set for [det_time / 10] second\s.") + return TRUE + + else if(stage == EMPTY) + to_chat(user, "You need to add an activation mechanism.") + return TRUE //assembly stuff @@ -281,7 +294,7 @@ O.forceMove(get_turf(src)) beakers = list() stage = EMPTY - update_icon() + update_icon(UPDATE_ICON_STATE) return if(nadeassembly) @@ -430,8 +443,9 @@ desc = "Used for emergency sealing of air breaches." stage = READY -/obj/item/grenade/chem_grenade/metalfoam/New() - ..() +/obj/item/grenade/chem_grenade/metalfoam/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -441,7 +455,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/firefighting @@ -449,8 +463,9 @@ desc = "Can help to put out dangerous fires from a distance." stage = READY -/obj/item/grenade/chem_grenade/firefighting/New() - ..() +/obj/item/grenade/chem_grenade/firefighting/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -459,15 +474,16 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/incendiary payload_name = "incendiary" desc = "Used for clearing rooms of living things." stage = READY -/obj/item/grenade/chem_grenade/incendiary/New() - ..() +/obj/item/grenade/chem_grenade/incendiary/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) @@ -478,7 +494,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/antiweed @@ -486,8 +502,9 @@ desc = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents." stage = READY -/obj/item/grenade/chem_grenade/antiweed/New() - ..() +/obj/item/grenade/chem_grenade/antiweed/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) @@ -499,7 +516,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/cleaner @@ -507,8 +524,9 @@ desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas." stage = READY -/obj/item/grenade/chem_grenade/cleaner/New() - ..() +/obj/item/grenade/chem_grenade/cleaner/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -518,7 +536,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/teargas @@ -526,8 +544,9 @@ desc = "Used for nonlethal riot control. Contents under pressure. Do not directly inhale contents." stage = READY -/obj/item/grenade/chem_grenade/teargas/New() - ..() +/obj/item/grenade/chem_grenade/teargas/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) @@ -539,15 +558,16 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/facid payload_name = "acid smoke" desc = "Use to chew up opponents from the inside out." stage = READY -/obj/item/grenade/chem_grenade/facid/New() - ..() +/obj/item/grenade/chem_grenade/facid/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) @@ -559,15 +579,16 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/chem_grenade/saringas payload_name = "sarin gas" desc = "Contains sarin gas; extremely deadly and fast acting; use with extreme caution." stage = READY -/obj/item/grenade/chem_grenade/saringas/New() - ..() +/obj/item/grenade/chem_grenade/saringas/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -579,7 +600,7 @@ beakers += B1 beakers += B2 - update_icon() + update_icon(UPDATE_ICON_STATE) #undef EMPTY #undef WIRED diff --git a/code/game/objects/items/weapons/grenades/custom_grenades.dm b/code/game/objects/items/weapons/grenades/custom_grenades.dm index 3cb0be484b0..41d473d0411 100644 --- a/code/game/objects/items/weapons/grenades/custom_grenades.dm +++ b/code/game/objects/items/weapons/grenades/custom_grenades.dm @@ -39,7 +39,7 @@ payload_name = "holy water" desc = "Then shalt thou count to three, no more, no less." stage = 2 - det_time = 30 + det_time = 3 SECONDS /obj/item/grenade/chem_grenade/holywater/New() ..() @@ -51,7 +51,7 @@ payload_name = "hell water" desc = "And he struck them down with an unholy fury that burn like one-thousands badmins." stage = 2 - det_time = 30 + det_time = 3 SECONDS /obj/item/grenade/chem_grenade/hellwater/New() ..() diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 10488d8e01e..681bb8edf63 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -78,9 +78,8 @@ if(istype(ears)) ears.receive_damage(5) if(ears.damage >= 15) - to_chat(M, "Your ears start to ring badly!") + to_chat(M, span_warning("Your ears start to ring badly!")) if(prob(ears.damage - 5)) - to_chat(M, "You can't hear anything!") - M.BecomeDeaf() + to_chat(M, span_warning("You can't hear anything!")) else if(ears.damage >= 5) - to_chat(M, "Your ears start to ring!") + to_chat(M, span_warning("Your ears start to ring!")) diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index 09ce7f8f6e0..31da0cf28e6 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -12,7 +12,7 @@ flags = CONDUCT slot_flags = SLOT_BELT active = 0 - det_time = 50 + det_time = 5 SECONDS display_timer = 0 var/list/times @@ -20,10 +20,10 @@ ..() overlays += "improvised_grenade_filled" overlays += "improvised_grenade_wired" - times = list("5" = 10, "-1" = 20, "[rand(30, 80)]" = 50, "[rand(65, 180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value] + times = list("5" = 1 SECONDS, "-1" = 2 SECONDS, "[rand(3 SECONDS, 8 SECONDS)]" = 5 SECONDS, "[rand(6.5 SECONDS, 18 SECONDS)]" = 2 SECONDS)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value] det_time = text2num(pickweight(times)) if(det_time < 0) //checking for 'duds' - det_time = rand(30,80) + det_time = rand(3 SECONDS, 8 SECONDS) /obj/item/grenade/iedcasing/CheckParts(list/parts_list) ..() @@ -37,6 +37,11 @@ underlays += can_underlay +/obj/item/grenade/iedcasing/update_overlays() + . = ..() + + + /obj/item/grenade/iedcasing/attack_self(mob/user) // if(!active) if(clown_check(user)) @@ -44,6 +49,7 @@ active = TRUE overlays -= "improvised_grenade_filled" icon_state = initial(icon_state) + "_active" + update_icon() add_fingerprint(user) investigate_log("[key_name_log(user)] has primed a [name] for detonation", INVESTIGATE_BOMB) add_attack_logs(user, src, "has primed for detonation", ATKLOG_FEW) @@ -67,7 +73,7 @@ icon_state = "improvised_satchel" item_state = "plastic-explosive" toolspeed = 1 - det_time = 80 + det_time = 8 SECONDS var/atom/target = null var/image_overlay = null var/planted = FALSE @@ -80,6 +86,17 @@ if(burned_out) . += span_notice("Looks like wick has burned out") + +/obj/item/grenade/iedsatchel/update_icon_state() + if(active) + icon_state = "[initial(icon_state)]_active" + return + if(anchored || burned_out) + icon_state = "[initial(icon_state)]_burned" + return + icon_state = initial(icon_state) + + /obj/item/grenade/iedsatchel/afterattack(atom/T, mob/user, proximity) if(!proximity) return @@ -98,12 +115,12 @@ layer = ABOVE_OBJ_LAYER add_game_logs("planted [src] on [T.name] at [T.loc]", user) - icon_state = initial(icon_state) + "_burned" + update_icon(UPDATE_ICON_STATE) to_chat(user, span_notice("You plant the [src].")) -/obj/item/grenade/iedsatchel/attack_hand(var/mob/user) +/obj/item/grenade/iedsatchel/attack_hand(mob/user) if(anchored) - icon_state = initial(icon_state) + "_burned" + update_icon(UPDATE_ICON_STATE) return ..() @@ -114,7 +131,7 @@ to_chat(user, span_notice("You tickled a makeshift wick made of wires, it looks like it needs to be set on fire.")) /obj/item/grenade/iedsatchel/attackby(obj/item/W, user) - if(active == 1) + if(active) return if(istype(W, /obj/item/lighter)) var/obj/item/lighter/I = W @@ -126,7 +143,7 @@ var/obj/item/match/I = W if(!I.lit) return - trigger() + trigger(user) return if(istype(W, /obj/item/weldingtool)) var/obj/item/weldingtool/I = W @@ -142,17 +159,18 @@ if(I.use(5)) to_chat(user, span_notice("You made a new wick from the cable")) burned_out = FALSE + update_icon(UPDATE_ICON_STATE) return to_chat(user, span_notice("There is not enough cables to make a wick.")) - if(istype(W, /obj/item/wirecutters)) + if(W.tool_behaviour == TOOL_WIRECUTTER) if(!anchored) return pixel_w = 0 pixel_z = 0 to_chat(user, span_notice("You unattached [src].")) - icon_state = "improvised_satchel" layer = TURF_LAYER anchored = FALSE + update_icon(UPDATE_ICON_STATE) target = null /obj/item/grenade/iedsatchel/proc/trigger(mob/user) @@ -160,9 +178,9 @@ to_chat(user, span_notice("There is no wick to ignite [src].")) return var/N = roll(11) - 1 - active = 1 + active = TRUE to_chat(user, span_danger("You ignite wires on [src]!")) - icon_state = initial(icon_state) + "_active" + update_icon(UPDATE_ICON_STATE) add_game_logs("Triggered [name] at [COORD(target)]", user) if(N <= 3) active = 1 @@ -175,10 +193,10 @@ prime() /obj/item/grenade/iedsatchel/proc/prime_fake() - src.visible_message(span_notice("The wires on [src] burned out, but nothing happened.")) - active = 0 + visible_message(span_notice("The wires on [src] burned out, but nothing happened.")) + active = FALSE burned_out = TRUE - icon_state = initial(icon_state) + "_burned" + update_icon(UPDATE_ICON_STATE) /obj/item/grenade/iedsatchel/prime() update_mob() diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 7a02c0a4381..0280830be32 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -12,9 +12,16 @@ slot_flags = SLOT_BELT resistance_flags = FLAMMABLE max_integrity = 40 - var/active = 0 - var/det_time = 50 - var/display_timer = 1 + var/active = FALSE + var/det_time = 5 SECONDS + var/display_timer = TRUE + + +/obj/item/grenade/Destroy() + ///We need to clear the walk_to on destroy to allow a grenade which uses walk_to or related to properly GC + walk_to(src, 0) + return ..() + /obj/item/grenade/deconstruct(disassembled = TRUE) if(!disassembled) @@ -22,65 +29,56 @@ if(!QDELETED(src)) qdel(src) -/obj/item/grenade/proc/clown_check(var/mob/living/user) + +/obj/item/grenade/proc/clown_check(mob/living/user) if((CLUMSY in user.mutations) && prob(50)) - to_chat(user, "Huh? How does this thing work?") - active = 1 - icon_state = initial(icon_state) + "_active" - playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) - spawn(5) - if(user) - user.drop_from_active_hand() - prime() - return 0 - return 1 - - -/*/obj/item/grenade/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) - if(istype(target, /obj/item/storage)) return ..() // Trying to put it in a full container - if(istype(target, /obj/item/gun/grenadelauncher)) return ..() - if((user.is_in_active_hand(src)) && (!active) && (clown_check(user)) && target.loc != src.loc) - to_chat(user, "You prime the [name]! [det_time/10] seconds!") - active = 1 - icon_state = initial(icon_state) + "_active" - playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) - spawn(det_time) - prime() - return - user.dir = get_dir(user, target) - user.drop_from_active_hand() - var/t = (isturf(target) ? target : target.loc) - walk_towards(src, t, 3) - return*/ + to_chat(user, span_warning("Huh? How does this thing work?")) + active = TRUE + update_icon(UPDATE_ICON_STATE) + playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3) + addtimer(CALLBACK(src, PROC_REF(delayed_boom)), 0.5 SECONDS) + return FALSE + return TRUE + + +/obj/item/grenade/proc/delayed_boom(mob/living/user) + if(!QDELETED(user)) + user.drop_item_ground(src) + prime() + + +/obj/item/grenade/update_icon_state() + icon_state = "[initial(icon_state)][active ? "_active" : ""]" /obj/item/grenade/examine(mob/user) . = ..() if(display_timer) if(det_time > 1) - . += "The timer is set to [det_time/10] second\s." + . += span_notice("The timer is set to [det_time/10] second\s.") else - . += "\The [src] is set for instant detonation." - -/obj/item/grenade/attack_self(mob/user as mob) - if(!active) - if(clown_check(user)) - to_chat(user, "You prime the [name]! [det_time/10] seconds!") - active = 1 - icon_state = initial(icon_state) + "_active" - add_fingerprint(user) - var/turf/bombturf = get_turf(src) - message_admins("[key_name_admin(usr)] has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)]") - investigate_log("[key_name_log(usr)] has primed a [name] for detonation", INVESTIGATE_BOMB) - add_attack_logs(user, src, "has primed for detonation", ATKLOG_FEW) - if(iscarbon(user)) - var/mob/living/carbon/C = user - C.throw_mode_on() - spawn(det_time) - prime() + . += span_warning("[src] is set for instant detonation.") + + +/obj/item/grenade/attack_self(mob/user) + if(!active && clown_check(user)) + to_chat(user, "You prime the [name]! [det_time/10] seconds!") + active = TRUE + update_icon(UPDATE_ICON_STATE) + add_fingerprint(user) + var/turf/bombturf = get_turf(src) + message_admins("[key_name_admin(usr)] has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)]") + investigate_log("[key_name_log(usr)] has primed a [name] for detonation", INVESTIGATE_BOMB) + add_attack_logs(user, src, "has primed for detonation", ATKLOG_FEW) + if(iscarbon(user)) + var/mob/living/carbon/c_user = user + c_user.throw_mode_on() + addtimer(CALLBACK(src, PROC_REF(prime)), det_time) /obj/item/grenade/proc/prime(mob/user) + return + /obj/item/grenade/proc/update_mob() if(ismob(loc)) @@ -88,24 +86,25 @@ M.drop_item_ground(src) -/obj/item/grenade/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/screwdriver)) - switch(det_time) - if("1") - det_time = 10 - to_chat(user, "You set the [name] for 1 second detonation time.") - if("10") - det_time = 30 - to_chat(user, "You set the [name] for 3 second detonation time.") - if("30") - det_time = 50 - to_chat(user, "You set the [name] for 5 second detonation time.") - if("50") - det_time = 1 - to_chat(user, "You set the [name] for instant detonation.") - add_fingerprint(user) - ..() +/obj/item/grenade/screwdriver_act(mob/living/user, obj/item/I) + switch(det_time) + if(0.1 SECONDS) + det_time = 1 SECONDS + to_chat(user, span_notice("You set [src] for 1 second detonation time.")) + if(1 SECONDS) + det_time = 3 SECONDS + to_chat(user, span_notice("You set [src] for 3 second detonation time.")) + if(3 SECONDS) + det_time = 5 SECONDS + to_chat(user, span_notice("You set [src] for 5 second detonation time.")) + if(5 SECONDS) + det_time = 0.1 SECONDS + to_chat(user, span_notice("You set [src] for instant detonation.")) + add_fingerprint(user) + return TRUE + /obj/item/grenade/attack_hand() walk(src, null, null) ..() + diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index 715a18e9ca6..eb486c54b09 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -3,7 +3,7 @@ name = "smoke bomb" icon = 'icons/obj/weapons/grenade.dmi' icon_state = "flashbang" - det_time = 20 + det_time = 2 SECONDS item_state = "flashbang" slot_flags = SLOT_BELT var/datum/effect_system/smoke_spread/bad/smoke diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 72a36fdb90b..8b9f985e683 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -51,7 +51,7 @@ if(istype(loc, /obj/item/implanter)) var/obj/item/implanter/implanter = loc implanter.imp = null - implanter.update_icon() + implanter.update_state() if(istype(loc, /obj/item/implantpad)) var/obj/item/implantcase/implantcase = loc implantcase.imp = null @@ -92,15 +92,13 @@ to_chat(user, span_warning("You can't trigger [src] with a custom emote.")) return FALSE - if(!(emote_key in user.usable_emote_keys(trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL))) + var/intentional_cause = (trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL) && !(trigger_causes & BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL) + if(!(emote_key in user.usable_emote_keys(intentional_cause))) if(!silent) - to_chat(user, span_warning("You can't trigger [src] with that emote! Try *help to see emotes you can use.")) + to_chat(user, span_warning("You can't trigger [src] with that emote [intentional_cause ? "intentionally" : "unintentionally"]! Try *help to see emotes you can use.")) return FALSE - if(!(emote_key in user.usable_emote_keys(trigger_causes & BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL))) - CRASH("User was given an bio-chip for an unintentional emote that they can't use.") - - LAZYADD(trigger_emotes, emote_key) + LAZYADDOR(trigger_emotes, emote_key) RegisterSignal(user, COMSIG_MOB_EMOTED(emote_key), PROC_REF(on_emote)) @@ -113,7 +111,7 @@ if(!(intentional && (trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL)) && !(!intentional && (trigger_causes & BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL))) return - add_attack_logs(user, user, "[intentional ? "intentionally" : "unintentionally"] [src] was [intentional ? "intentionally" : "unintentionally"] triggered with the emote [fired_emote].") + add_attack_logs(user, user, "[src] was [intentional ? "intentionally" : "unintentionally"] triggered with the emote [fired_emote].") emote_trigger(key, user, intentional) @@ -136,7 +134,7 @@ death_trigger(source, gibbed) -/obj/item/implant/proc/emote_trigger(emote, mob/source, force) +/obj/item/implant/proc/emote_trigger(emote, mob/source, intentional) return @@ -183,13 +181,13 @@ if(trigger_emotes) if(!(trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL|BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL)) CRASH("Bio-chip [src] has trigger emotes defined but no trigger cause with which to use them!") - if(!activated && (trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL)) + if(activated == BIOCHIP_ACTIVATED_PASSIVE && (trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL)) CRASH("Bio-chip [src] has intentional emote triggers on a passive bio-chip") // If you can't activate the implant manually, you shouldn't be able to deliberately activate it with an emote for(var/emote in trigger_emotes) set_trigger(source, emote, on_implant = TRUE) - if(activated) + if(activated == BIOCHIP_ACTIVATED_ACTIVE) for(var/datum/action/action as anything in actions) action.Grant(source) update_button(action) diff --git a/code/game/objects/items/weapons/implants/implant_sad_trombone.dm b/code/game/objects/items/weapons/implants/implant_sad_trombone.dm index 097324fe1ce..e4868acb04f 100644 --- a/code/game/objects/items/weapons/implants/implant_sad_trombone.dm +++ b/code/game/objects/items/weapons/implants/implant_sad_trombone.dm @@ -8,15 +8,15 @@ implant_state = "implant-honk" -/obj/item/implant/sad_trombone/emote_trigger(emote, mob/source, force) - activate(emote) +/obj/item/implant/sad_trombone/emote_trigger(emote, mob/source, intentional) + activate() /obj/item/implant/sad_trombone/death_trigger(mob/user, gibbed) - activate(gibbed) + activate() -/obj/item/implant/sad_trombone/activate() +/obj/item/implant/sad_trombone/activate(cause) playsound(loc, 'sound/misc/sadtrombone.ogg', 50, FALSE) diff --git a/code/game/objects/items/weapons/implants/implant_stealth.dm b/code/game/objects/items/weapons/implants/implant_stealth.dm index 7fe0ed65984..5ac03283359 100644 --- a/code/game/objects/items/weapons/implants/implant_stealth.dm +++ b/code/game/objects/items/weapons/implants/implant_stealth.dm @@ -155,7 +155,8 @@ qdel(src) -/obj/structure/closet/cardboard/agent/update_icon() // When the box is opened, it's deleted, so we never need to update this. +// When the box is opened, it's deleted, so we never need to update this. +/obj/structure/closet/cardboard/agent/update_icon_state() return diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 5c50ffdd780..5d610eb97a4 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -36,15 +36,13 @@ origin_tech = initial(origin_tech) flags = initial(flags) reagents = null - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/item/implantcase/update_icon() - ..() - cut_overlays() +/obj/item/implantcase/update_overlays() + . = ..() if(imp) - var/image/implant_overlay = image('icons/obj/implants.dmi', imp.implant_state) - add_overlay(implant_overlay) + . += image('icons/obj/implants.dmi', imp.implant_state) /obj/item/implantcase/attackby(obj/item/I, mob/user) @@ -58,7 +56,8 @@ implater.imp.forceMove(src) imp = implater.imp implater.imp = null - implater.update_icon() + update_state() + implater.update_state() else if(imp) if(implater.imp) @@ -66,8 +65,8 @@ imp.forceMove(implater) implater.imp = imp imp = null - implater.update_icon() - update_state() + update_state() + implater.update_state() else return ..() diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 63de271a625..f11a3e75097 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -33,12 +33,8 @@ LAZYADD(implants_list, bio_chip) -/obj/machinery/implantchair/update_icon() - . = ..() - if(occupant) - icon_state = "implantchair_on" - else - icon_state = "implantchair" +/obj/machinery/implantchair/update_icon_state() + icon_state = "implantchair[occupant ? "_on" : ""]" /obj/machinery/implantchair/attack_hand(mob/user) @@ -124,7 +120,7 @@ return FALSE -/obj/machinery/implantchair/MouseDrop_T(mob/living/carbon/human/dropping, mob/living/user) +/obj/machinery/implantchair/MouseDrop_T(mob/living/carbon/human/dropping, mob/living/user, params) return put_mob(dropping, user) @@ -136,7 +132,7 @@ target.forceMove(src) occupant = target add_fingerprint(user) - update_icon() + update_icon(UPDATE_ICON_STATE) updateUsrDialog() return TRUE @@ -178,7 +174,7 @@ occupant.forceMove(loc) add_fingerprint(user) occupant = null - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 418fb1321fa..1cc51f73a03 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -18,7 +18,7 @@ . = ..() if(ispath(imp, /obj/item/implant)) imp = new imp(src) - update_icon() + update_state() /obj/item/implanter/Destroy() @@ -26,13 +26,13 @@ return ..() -/obj/item/implanter/update_icon() - if(imp) - icon_state = "implanter1" - origin_tech = imp.origin_tech - else - icon_state = "implanter0" - origin_tech = initial(origin_tech) +/obj/item/implanter/proc/update_state() + origin_tech = imp ? imp.origin_tech : initial(origin_tech) + update_icon(UPDATE_ICON_STATE) + + +/obj/item/implanter/update_icon_state() + icon_state = "implanter[imp ? "1" : "0"]" /obj/item/implanter/attack(mob/living/carbon/target, mob/user) @@ -50,7 +50,7 @@ else target.visible_message("[user] has implanted [target].", span_notice("[user] bio-chips you.")) imp = null - update_icon() + update_state() /obj/item/implanter/attackby(obj/item/I, mob/user, params) diff --git a/code/game/objects/items/weapons/implants/implantfluff.dm b/code/game/objects/items/weapons/implants/implantfluff.dm index db189b35b4a..86d1865dbbd 100644 --- a/code/game/objects/items/weapons/implants/implantfluff.dm +++ b/code/game/objects/items/weapons/implants/implantfluff.dm @@ -151,13 +151,6 @@ function = "Plays a sad trombone noise upon death of the implantee, allows clowns to entertain the crew even post-mortem." -/datum/implant_fluff/pathfinder - name = "Paizo Productions 5-E Pathfinder Implant" - life = "Lasts 2-12 months. Known to fail at the worst possible time, space radation may be a factor." - notes = "By use of an internal private GPS signal, allows the pathfinder module to have the MODsuit find the user. Also wirelessly transfers ID information to the suit, to allow doors to open." - function = "Allows for the recall of a Modular Outerwear Device by the implant owner at any time." - - /datum/implant_fluff/stealth name = "Syndicate S3 \"Stealth\" Bio-chip" life = "Unknown. No collected sample has been active long enough to determine lifespan." diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index a14bcaeb9d6..75adb54aa87 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -17,11 +17,8 @@ return ..() -/obj/item/implantpad/update_icon() - if(case) - icon_state = "implantpad-on" - else - icon_state = "implantpad-off" +/obj/item/implantpad/update_icon_state() + icon_state = "implantpad-[case ? "on" : "off"]" /obj/item/implantpad/attack_self(mob/user) @@ -43,7 +40,7 @@ return user.drop_transfer_item_to_loc(new_case, src) case = new_case - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/implantpad/proc/eject_case(mob/user) @@ -57,7 +54,7 @@ case.add_fingerprint(user) case = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/implantpad/AltClick(mob/living/user) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 992b04842f7..d72f997ab0b 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -293,17 +293,20 @@ drop_sound = 'sound/items/handling/bone_drop.ogg' var/size + /obj/item/kitchen/knife/glassshiv/Initialize(mapload, obj/item/shard/sh) . = ..() if(sh) size = sh.icon_state - update_icon() - -/obj/item/kitchen/knife/glassshiv/update_icon() if(!size) size = pick("large", "medium", "small") + update_icon(UPDATE_ICON_STATE) + + +/obj/item/kitchen/knife/glassshiv/update_icon_state() icon_state = "[size]_[initial(icon_state)]" + /obj/item/kitchen/knife/glassshiv/plasma name = "plasma glass shiv" desc = "A plasma glass shard with some cloth wrapped around it" diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index e18f2c03c14..dd7ccbd9968 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -42,11 +42,16 @@ return BRUTELOSS +/obj/item/restraints/legcuffs/beartrap/update_icon_state() + icon_state = "[initial(icon_state)][armed]" + + + /obj/item/restraints/legcuffs/beartrap/attack_self(mob/user) ..() if(ishuman(user) && !user.stat && !user.restrained()) armed = !armed - icon_state = "[initial(icon_state)][armed]" + update_icon(UPDATE_ICON_STATE) to_chat(user, span_notice("[src] is now [armed ? "armed" : "disarmed"]")) @@ -116,7 +121,7 @@ return armed = FALSE - icon_state = "[initial(icon_state)][armed]" + update_icon(UPDATE_ICON_STATE) playsound(src.loc, 'sound/effects/snap.ogg', 50, TRUE) moving_thing.visible_message(span_danger("[moving_thing] triggers [src]."), span_userdanger("You trigger [src]!")) @@ -185,6 +190,11 @@ RegisterSignal(src, COMSIG_CARBON_TOGGLE_THROW, PROC_REF(spin_up_wrapper)) +/obj/item/restraints/legcuffs/bola/update_icon_state() + item_state = spinning ? "[initial(item_state)]_spin" : initial(item_state) + update_equipped_item() + + /obj/item/restraints/legcuffs/bola/proc/spin_up_wrapper(datum/source, throw_mode_state) // so that signal handler works SIGNAL_HANDLER if(throw_mode_state) // if we actually turned throw mode on @@ -196,8 +206,7 @@ return var/mob/living/owner = loc // can only be called if the mob is holding the bola. spinning = TRUE - item_state = "[initial(item_state)]_spin" - owner.update_inv_hands() + update_icon(UPDATE_ICON_STATE) playsound(owner, spin_sound, 30, list(38000, 48000), SHORT_RANGE_SOUND_EXTRARANGE) spin_timer_id = addtimer(CALLBACK(src, PROC_REF(spin_loop), owner), 1 SECONDS, TIMER_UNIQUE|TIMER_LOOP|TIMER_STOPPABLE|TIMER_DELETE_ME) do_spin_cycle(owner) @@ -244,10 +253,9 @@ /obj/item/restraints/legcuffs/bola/proc/reset_values(mob/living/user) throw_range = initial(throw_range) throw_speed = initial(throw_speed) - item_state = initial(item_state) spin_cycle = 0 spinning = FALSE - user?.update_inv_hands() + update_icon(UPDATE_ICON_STATE) if(spin_timer_id) deltimer(spin_timer_id) diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index d4d3126cab5..02c8dbf7c05 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -280,6 +280,7 @@ pickup_sound = 'sound/items/handling/generic_small_pickup.ogg' drop_sound = 'sound/items/handling/generic_small_drop.ogg' + /obj/item/match/process() var/turf/location = get_turf(src) smoketime-- @@ -287,50 +288,65 @@ matchburnout() if(location) location.hotspot_expose(700, 5) - return + /obj/item/match/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) ..() matchignite() + /obj/item/match/extinguish_light(force = FALSE) if(!force) return matchburnout() + +/obj/item/match/update_icon_state() + icon_state = lit ? "match_lit" : "match_burnt" + item_state = lit ? "cigon" : "cigoff" + + +/obj/item/match/update_name(updates = ALL) + . = ..() + var/init_name = initial(name) + name = lit ? "lit [init_name]" : burnt ? "burnt [init_name]" : initial(name) + + +/obj/item/match/update_desc(updates = ALL) + . = ..() + var/init_name = initial(name) + desc = lit ? "A [init_name]. This one is lit." : burnt ? "A [init_name]. This one has seen better days." : initial(desc) + + /obj/item/match/proc/matchignite() if(!lit && !burnt) lit = TRUE - icon_state = "match_lit" - damtype = "fire" + damtype = FIRE force = 3 hitsound = 'sound/weapons/tap.ogg' - item_state = "cigon" - name = "lit match" - desc = "A match. This one is lit." attack_verb = list("burnt","singed") START_PROCESSING(SSobj, src) - update_icon() + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) return TRUE + /obj/item/match/proc/matchburnout() if(lit) lit = FALSE burnt = TRUE - damtype = "brute" + damtype = BRUTE force = initial(force) - icon_state = "match_burnt" - item_state = "cigoff" - name = "burnt match" - desc = "A match. This one has seen better days." attack_verb = list("flicked") STOP_PROCESSING(SSobj, src) + update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC) return TRUE + /obj/item/match/dropped(mob/user, silent = FALSE) matchburnout() . = ..() + /obj/item/match/attack(mob/living/carbon/M, mob/living/carbon/user) if(!isliving(M)) return ..() @@ -359,6 +375,7 @@ else ..() + /obj/item/match/decompile_act(obj/item/matter_decompiler/C, mob/user) if(burnt) C.stored_comms["wood"] += 1 @@ -366,20 +383,24 @@ return TRUE return ..() + /obj/item/proc/help_light_cig(mob/living/M) var/mask_item = M.get_item_by_slot(slot_wear_mask) if(istype(mask_item, /obj/item/clothing/mask/cigarette)) return mask_item + /obj/item/match/firebrand name = "firebrand" desc = "An unlit firebrand. It makes you wonder why it's not just called a stick." smoketime = 20 //40 seconds -/obj/item/match/firebrand/New() - ..() + +/obj/item/match/firebrand/Initialize(mapload) + . = ..() matchignite() + /obj/item/match/unathi name = "small blaze" desc = "A little flame of your own, currently located dangerously in your mouth." @@ -391,16 +412,24 @@ lit = TRUE w_class = WEIGHT_CLASS_BULKY //to prevent it going to pockets + /obj/item/match/unathi/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) + +/obj/item/match/unathi/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) + return // we are already burning + + /obj/item/match/unathi/matchburnout() if(!lit) return lit = FALSE //to avoid a qdel loop qdel(src) + /obj/item/match/unathi/Destroy() . = ..() STOP_PROCESSING(SSobj, src) + diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index d6caf9caf68..4357fb33819 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -38,6 +38,21 @@ "[user] is falling on the [name]! It looks like [user.p_theyre()] trying to commit suicide.")) return BRUTELOSS|FIRELOSS + +/obj/item/melee/energy/update_icon_state() + if(!active) + icon_state = initial(icon_state) + set_light(0) + return + if(icon_state_on) + icon_state = icon_state_on + set_light(brightness_on, l_color = item_color ? colormap[item_color] : null) + else + icon_state = "sword[item_color]" + set_light(brightness_on, l_color = colormap[item_color]) + update_equipped_item() + + /obj/item/melee/energy/attack_self(mob/living/carbon/user) if((CLUMSY in user.mutations) && prob(50)) to_chat(user, "You accidentally cut yourself with [src], like a doofus!") @@ -48,14 +63,6 @@ throwforce = throwforce_on hitsound = 'sound/weapons/blade1.ogg' throw_speed = 4 - if(attack_verb_on.len) - attack_verb = attack_verb_on - if(icon_state_on) - icon_state = icon_state_on - set_light(brightness_on, l_color = item_color ? colormap[item_color] : null) - else - icon_state = "sword[item_color]" - set_light(brightness_on, l_color=colormap[item_color]) w_class = w_class_on playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness to_chat(user, "[src] is now active.") @@ -66,17 +73,12 @@ throw_speed = initial(throw_speed) if(attack_verb_on.len) attack_verb = list() - icon_state = initial(icon_state) w_class = initial(w_class) playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) //changed it from 50% volume to 35% because deafness - set_light(0) to_chat(user, "[src] can now be concealed.") - if(istype(user,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = user - H.update_inv_l_hand() - H.update_inv_r_hand() add_fingerprint(user) - return + update_icon(UPDATE_ICON_STATE) + /obj/item/melee/energy/axe name = "energy axe" @@ -119,7 +121,7 @@ origin_tech = "combat=3;magnets=4;syndicate=4" block_chance = 50 sharp = 1 - var/hacked = 0 + var/hacked = FALSE /obj/item/melee/energy/sword/New() ..() @@ -201,32 +203,24 @@ user.adjustBrainLoss(10) else to_chat(user, "You attach the ends of the two energy swords, making a single double-bladed weapon! You're cool.") - var/obj/item/twohanded/dualsaber/newSaber = new /obj/item/twohanded/dualsaber(drop_location()) - if(src.hacked) // That's right, we'll only check the "original" esword. - newSaber.hacked = 1 - newSaber.item_color = "rainbow" + var/obj/item/twohanded/dualsaber/newSaber = new(drop_location()) + if(hacked) // That's right, we'll only check the "original" esword. + newSaber.hacked = TRUE + newSaber.blade_color = "rainbow" user.temporarily_remove_item_from_inventory(W) user.temporarily_remove_item_from_inventory(src) qdel(W) qdel(src) user.put_in_hands(newSaber, ignore_anim = FALSE) - else if(istype(W, /obj/item/multitool)) - if(hacked == 0) - hacked = 1 - item_color = "rainbow" - to_chat(user, "RNBW_ENGAGE") - - if(active) - icon_state = "swordrainbow" - // Updating overlays, copied from welder code. - // I tried calling attack_self twice, which looked cool, except it somehow didn't update the overlays!! - if(user.r_hand == src) - user.update_inv_r_hand() - else if(user.l_hand == src) - user.update_inv_l_hand() - - else + else if(W.tool_behaviour == TOOL_MULTITOOL) + if(hacked) to_chat(user, "It's already fabulous!") + return + + hacked = TRUE + item_color = "rainbow" + to_chat(user, "RNBW_ENGAGE") + update_icon(UPDATE_ICON_STATE) /obj/item/melee/energy/sword/saber/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) @@ -337,12 +331,6 @@ throw_speed = 4 if(attack_verb_on.len) attack_verb = attack_verb_on - if(icon_state_on) - icon_state = icon_state_on - set_light(brightness_on, l_color = item_color ? colormap[item_color] : null) - else - icon_state = "sword[item_color]" - set_light(brightness_on, l_color=colormap[item_color]) w_class = w_class_on playsound(user, 'sound/magic/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000)) to_chat(user, "You open [src]. It will now cleave enemies in a wide arc and deal additional damage to fauna.") @@ -353,17 +341,10 @@ throw_speed = initial(throw_speed) if(attack_verb_on.len) attack_verb = list() - icon_state = initial(icon_state) w_class = initial(w_class) playsound(user, 'sound/magic/fellowship_armory.ogg', 35, 1) //changed it from 50% volume to 35% because deafness - set_light(0) to_chat(user, "You close [src]. It will now attack rapidly and cause fauna to bleed.") - - if(ishuman(user)) - var/mob/living/carbon/human/H = user - H.update_inv_l_hand() - H.update_inv_r_hand() - + update_icon(UPDATE_ICON_STATE) add_fingerprint(user) /obj/item/melee/energy/cleaving_saw/examine(mob/user) diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 60a67ff64ee..e19f946512c 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -92,12 +92,19 @@ icon = 'icons/obj/lightning.dmi' icon_state = "lightning" desc = "test lightning" + var/angle -/obj/item/lightning/New() - ..() + +/obj/item/lightning/Initialize(mapload) + . = ..() icon_state = "1" -/obj/item/lightning/afterattack(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, flag, params) + +/obj/item/lightning/update_icon_state() + icon_state = "[angle]" + + +/obj/item/lightning/afterattack(atom/A, mob/living/user, flag, params) var/angle = get_angle(A, user) //to_chat(world, angle) angle = round(angle) + 45 @@ -108,9 +115,7 @@ if(!angle) angle = 1 - //to_chat(world, "adjusted [angle]") - icon_state = "[angle]" - //to_chat(world, "[angle] [(get_dist(user, A) - 1)]") + update_icon(UPDATE_ICON_STATE) user.Beam(A, "lightning", 'icons/obj/zap.dmi', 50, 15) /obj/item/newton diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 5593fe302d7..f4b6aa1dcfc 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -24,16 +24,20 @@ GLOB.janitorial_equipment -= src return ..() -/obj/item/mop/proc/wet_mop(obj/o, mob/user) - if(o.reagents.total_volume < 1) - to_chat(user, "[o] is out of water!") - if(!istype(o, /obj/item/reagent_containers/glass/bucket)) - janicart_insert(user, o) + +/obj/item/mop/proc/wet_mop(obj/target, mob/user) + if(target.reagents.total_volume < 1) + to_chat(user, "[target] is out of water!") + if(istype(target, /obj/structure/mopbucket)) + mopbucket_insert(user, target) + if(!istype(target, /obj/item/reagent_containers/glass/bucket)) + janicart_insert(user, target) return - o.reagents.trans_to(src, 5) - to_chat(user, "You wet [src] in [o].") - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + target.reagents.trans_to(src, 5) + to_chat(user, "You wet [src] in [target].") + playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE) + /obj/item/mop/proc/clean(turf/simulated/A) if(reagents.has_reagent("water", 1) || reagents.has_reagent("cleaner", 1) || reagents.has_reagent("holywater", 1)) @@ -69,10 +73,16 @@ else return ..() -/obj/item/mop/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J) - J.put_in_cart(src, user) - J.mymop=src - J.update_icon() + +/obj/item/mop/proc/janicart_insert(mob/user, obj/structure/janitorialcart/cart) + cart.mymop = src + cart.put_in_cart(src, user) + + +/obj/item/mop/proc/mopbucket_insert(mob/user, obj/structure/mopbucket/bucket) + bucket.mymop = src + bucket.put_in_cart(src, user) + /obj/item/mop/wash(mob/user, atom/source) reagents.add_reagent("water", 5) diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index 30c97a48fa7..93a1cd0acd6 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -182,14 +182,14 @@ return to_chat(user, span_notice("You hook [thetank] up to [src].")) tank = thetank - update_icons() + update_icon(UPDATE_OVERLAYS) + + +/obj/item/pneumatic_cannon/update_overlays() + . = ..() + if(tank) + . += "[tank.icon_state]" -/obj/item/pneumatic_cannon/proc/update_icons() - overlays.Cut() - if(!tank) - return - overlays += image('icons/obj/weapons/pneumaticCannon.dmi', "[tank.icon_state]") - update_icon() #undef LOW_PRESSURE #undef MID_PRESSURE diff --git a/code/game/objects/items/weapons/pneumaticRifle.dm b/code/game/objects/items/weapons/pneumaticRifle.dm index 81992d550e4..01ed69bfabb 100644 --- a/code/game/objects/items/weapons/pneumaticRifle.dm +++ b/code/game/objects/items/weapons/pneumaticRifle.dm @@ -65,7 +65,7 @@ to_chat(user, span_notice("You strapped [src], so now you can wear it on your back")) isBelted = TRUE slot_flags |= SLOT_BACK - update_icons() + update_icon(UPDATE_OVERLAYS) return else to_chat(user, span_warning("[src] is already strapped!")) @@ -166,7 +166,7 @@ return to_chat(user, span_notice("You hook [thetank] up to [src].")) tank = thetank - update_icons() + update_icon(UPDATE_OVERLAYS) /datum/crafting_recipe/pneumatic_rifle name = "Pneumatic Rifle" @@ -181,10 +181,11 @@ category = CAT_WEAPONRY subcategory = CAT_WEAPON -/obj/item/gun/pneumatic_rifle/proc/update_icons() - overlays.Cut() + +/obj/item/gun/pneumatic_rifle/update_overlays() + . = ..() if(tank) - overlays += image('icons/obj/weapons/pneumaticRifle.dmi', "[tank.icon_state]") + . += "[tank.icon_state]" if(isBelted) - overlays += image('icons/obj/weapons/pneumaticRifle.dmi', "belt") - update_icon() + . += "belt" + diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm index def5938bfd3..add53a5ba3c 100644 --- a/code/game/objects/items/weapons/rpd.dm +++ b/code/game/objects/items/weapons/rpd.dm @@ -16,7 +16,7 @@ icon_state = "rpd" opacity = 0 density = 0 - anchored = 0 + anchored = FALSE flags = CONDUCT force = 10 throwforce = 10 diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 7e8fb75cb2e..cc0f5e69a7d 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -37,7 +37,7 @@ attack_verb = list("shoved", "bashed") var/cooldown = 0 //shield bash cooldown. based on world.time -/obj/item/shield/riot/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/shield/riot/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/melee/baton)) if(cooldown < world.time - 25) user.visible_message("[user] bashes [src] with [W]!") @@ -130,14 +130,14 @@ add_fingerprint(user) return -/obj/item/shield/energy/update_icon() +/obj/item/shield/energy/update_icon_state() icon_state = "eshield[active]" /obj/item/shield/energy/syndie icon_state = "syndieshield0" desc = "Reverse-engineered shield that reflects almost all energy projectiles, but is useless against physical attacks. It can be retracted, expanded, and stored anywhere. Property of Gorlex marauders." -/obj/item/shield/energy/syndie/update_icon() +/obj/item/shield/energy/syndie/update_icon_state() icon_state = "syndieshield[active]" /obj/item/shield/riot/tele @@ -160,9 +160,14 @@ return ..() return FALSE + +/obj/item/shield/riot/tele/update_icon_state() + icon_state = "teleriot[active]" + + /obj/item/shield/riot/tele/attack_self(mob/living/user) active = !active - icon_state = "teleriot[active]" + update_icon(UPDATE_ICON_STATE) playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1) if(active) @@ -179,9 +184,6 @@ w_class = WEIGHT_CLASS_NORMAL slot_flags = null to_chat(user, "[src] can now be concealed.") - if(istype(user,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = user - H.update_inv_l_hand() - H.update_inv_r_hand() + update_equipped_item() add_fingerprint(user) - return + diff --git a/code/game/objects/items/weapons/spacechips.dm b/code/game/objects/items/weapons/spacechips.dm index b33ec81a7fe..f84f9478631 100644 --- a/code/game/objects/items/weapons/spacechips.dm +++ b/code/game/objects/items/weapons/spacechips.dm @@ -15,8 +15,7 @@ merge_type = /obj/item/stack/spacechips -/obj/item/stack/spacechips/update_icon()//changes icon depending on the amount of chips - ..() +/obj/item/stack/spacechips/update_icon_state()//changes icon depending on the amount of chips name = "[amount == max_amount ? "1000000" : amount] Chip[amount > 1 ? "s" : ""]" if(amount >= 1 && amount <= 20) icon_state = "c20" @@ -31,6 +30,7 @@ else icon_state = "c1000" + /obj/item/stack/spacechips/c10 amount = 10 diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm index 3c0a03d3785..edf7cdadb62 100644 --- a/code/game/objects/items/weapons/staff.dm +++ b/code/game/objects/items/weapons/staff.dm @@ -19,37 +19,38 @@ icon_state = "broom" item_state = "broom0" + +/obj/item/twohanded/staff/broom/update_icon_state() + item_state = "broom[HAS_TRAIT(src, TRAIT_WIELDED)]" + update_equipped_item() + + /obj/item/twohanded/staff/broom/wield(obj/item/source, mob/living/carbon/user) - item_state = "broom[wielded ? 1 : 0]" - force = wielded ? 5 : 3 - attack_verb = wielded ? list("rammed into", "charged at") : list("bludgeoned", "whacked", "cleaned") - if(user) - user.update_inv_l_hand() - user.update_inv_r_hand() - if(user.mind in SSticker.mode.wizards) - user.flying = wielded ? 1 : 0 - if(wielded) - to_chat(user, "You hold \the [src] between your legs.") - user.say("QUID 'ITCH") - animate(user, pixel_y = pixel_y + 10 , time = 10, loop = 1, easing = SINE_EASING) - else - animate(user, pixel_y = pixel_y + 10 , time = 1, loop = 1) - animate(user, pixel_y = pixel_y, time = 10, loop = 1, easing = SINE_EASING) - animate(user) - if(user.lying)//aka. if they have just been stunned - user.pixel_y -= 6 - else - if(wielded) - to_chat(user, "You hold \the [src] between your legs.") + force = 5 + attack_verb = list("rammed into", "charged at") + if(!user) + return + + update_icon(UPDATE_ICON_STATE) + if(user.mind && (user.mind in SSticker.mode.wizards)) + user.flying = TRUE + user.float(TRUE) + user.say("QUID 'ITCH") + animate(user, pixel_y = pixel_y + 10 , time = 10, loop = 1, easing = SINE_EASING) + + to_chat(user, "You hold \the [src] between your legs.") /obj/item/twohanded/staff/broom/unwield(obj/item/source, mob/living/carbon/user) + update_icon(UPDATE_ICON_STATE) + force = 3 + attack_verb = list("bludgeoned", "whacked", "cleaned") user.flying = FALSE user.update_gravity(user.mob_has_gravity()) animate(user) -/obj/item/twohanded/staff/broom/attackby(var/obj/O, mob/user) +/obj/item/twohanded/staff/broom/attackby(obj/O, mob/user) if(istype(O, /obj/item/clothing/mask/horsehead)) new/obj/item/twohanded/staff/broom/horsebroom(get_turf(src)) user.temporarily_remove_item_from_inventory(O) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 9d6fcad5899..1da6a104916 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -110,7 +110,8 @@ max_w_class = WEIGHT_CLASS_NORMAL max_combined_w_class = 400 // can store a ton of shit! -/obj/item/storage/backpack/santabag/update_icon() + +/obj/item/storage/backpack/santabag/update_icon_state() var/items_count = length(contents) switch(items_count) if(1 to 10) @@ -120,10 +121,8 @@ if(21 to INFINITY) icon_state = "giftbag2" - if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - H.update_inv_l_hand() - H.update_inv_r_hand() + update_equipped_item() + /obj/item/storage/backpack/cultpack name = "trophy rack" @@ -413,14 +412,14 @@ level = 1 cant_hold = list(/obj/item/storage/backpack/satchel_flat) //muh recursive backpacks -/obj/item/storage/backpack/satchel_flat/hide(var/intact) +/obj/item/storage/backpack/satchel_flat/hide(intact) if(intact) - invisibility = INVISIBILITY_ABSTRACT - anchored = 1 //otherwise you can start pulling, cover it, and drag around an invisible backpack. + invisibility = INVISIBILITY_MAXIMUM + anchored = TRUE //otherwise you can start pulling, cover it, and drag around an invisible backpack. icon_state = "[initial(icon_state)]2" else invisibility = initial(invisibility) - anchored = 0 + anchored = FALSE icon_state = initial(icon_state) /obj/item/storage/backpack/satchel_flat/populate_contents() diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index df8f52adbeb..8344ed4bd03 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -49,8 +49,9 @@ playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1) return TOXLOSS -/obj/item/storage/bag/trash/update_icon() - switch(contents.len) + +/obj/item/storage/bag/trash/update_icon_state() + switch(length(contents)) if(21 to INFINITY) icon_state = "[initial(icon_state)]3" if(11 to 20) @@ -59,11 +60,8 @@ icon_state = "[initial(icon_state)]1" else icon_state = "[initial(icon_state)]" - if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - H.update_inv_l_hand() - H.update_inv_r_hand() - ..() + update_equipped_item() + /obj/item/storage/bag/trash/cyborg @@ -451,18 +449,12 @@ if(prob(10)) M.Weaken(4 SECONDS) -/obj/item/storage/bag/tray/proc/rebuild_overlays() - overlays.Cut() - for(var/obj/item/I in contents) - overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1) -/obj/item/storage/bag/tray/remove_from_storage(obj/item/W, atom/new_location) - ..() - rebuild_overlays() +/obj/item/storage/bag/tray/update_overlays() + . = ..() + for(var/obj/item/item in contents) + . += image(icon = item.icon, icon_state = item.icon_state, layer = -1, pixel_x = rand(-4,4), pixel_y = rand(-4,4)) -/obj/item/storage/bag/tray/handle_item_insertion(obj/item/I, prevent_warning = 0) - overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1) - ..() /obj/item/storage/bag/tray/cyborg @@ -482,8 +474,6 @@ else // they clicked on a table dropspot = target.loc - overlays = null - var/droppedSomething = 0 for(var/obj/item/I in contents) @@ -502,18 +492,19 @@ user.visible_message("[user] unloads [user.p_their()] service tray.") else user.visible_message("[user] drops all the items on [user.p_their()] tray.") - + update_icon(UPDATE_OVERLAYS) return ..() /obj/item/storage/bag/tray/cookies_tray var/cookie = /obj/item/reagent_containers/food/snacks/cookie + /obj/item/storage/bag/tray/cookies_tray/populate_contents() /// By Azule Utama, thank you a lot! for(var/i in 1 to 6) var/obj/item/C = new cookie(src) handle_item_insertion(C) // Done this way so the tray actually has the cookies visible when spawned - rebuild_overlays() + /obj/item/storage/bag/tray/cookies_tray/sugarcookie cookie = /obj/item/reagent_containers/food/snacks/sugarcookie @@ -560,18 +551,11 @@ M.Weaken(4 SECONDS) -/obj/item/storage/bag/dangertray/proc/rebuild_overlays() - overlays.Cut() - for(var/obj/item/I in contents) - overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1) - -/obj/item/storage/bag/dangertray/remove_from_storage(obj/item/W, atom/new_location) - ..() - rebuild_overlays() +/obj/item/storage/bag/dangertray/update_overlays() + . = ..() + for(var/obj/item/item in contents) + . += image(icon = item.icon, icon_state = item.icon_state, layer = -1, pixel_x = rand(-4,4), pixel_y = rand(-4,4)) -/obj/item/storage/bag/dangertray/handle_item_insertion(obj/item/I, prevent_warning = 0) - overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1) - ..() /* * Chemistry bag diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index bb506aef1e3..95396f4a984 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -7,6 +7,7 @@ lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi' slot_flags = SLOT_BELT + flags_2 = BLOCKS_LIGHT_2 attack_verb = list("whipped", "lashed", "disciplined") max_integrity = 300 pickup_sound = 'sound/items/handling/backpack_pickup.ogg' @@ -14,13 +15,16 @@ drop_sound = 'sound/items/handling/backpack_drop.ogg' var/use_item_overlays = FALSE // Do we have overlays for items held inside the belt? -/obj/item/storage/belt/update_icon() - if(use_item_overlays) - overlays.Cut() - for(var/obj/item/I in contents) - if(I.belt_icon) - overlays += "[I.belt_icon]" - ..() + +/obj/item/storage/belt/update_overlays() + . = ..() + if(!use_item_overlays) + return + for(var/obj/item/item in contents) + if(!item.belt_icon) + continue + . += mutable_appearance(icon, item.belt_icon, color = item.color) + /obj/item/storage/belt/proc/can_use() return is_equipped() @@ -450,6 +454,12 @@ new /obj/item/grenade/plastic/x4/thermite(src) new /obj/item/storage/pill_bottle/sovietstimulants(src) +/obj/item/storage/belt/military/assault/gammaert/full/populate_contents() + new /obj/item/storage/pouch/fast(src) + new /obj/item/storage/pouch/fast(src) + new /obj/item/storage/pouch/fast(src) + new /obj/item/melee/classic_baton/telescopic(src) + /obj/item/storage/belt/janitor name = "janibelt" desc = "A belt used to hold most janitorial supplies." @@ -501,21 +511,16 @@ /obj/item/storage/belt/lazarus/Initialize(mapload) . = ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/obj/item/storage/belt/lazarus/update_icon() - ..() +/obj/item/storage/belt/lazarus/update_icon_state() icon_state = "[initial(icon_state)]_[length(contents)]" /obj/item/storage/belt/lazarus/attackby(obj/item/W, mob/user) var/amount = length(contents) . = ..() if(amount != length(contents)) - update_icon() - -/obj/item/storage/belt/lazarus/remove_from_storage(obj/item/W, atom/new_location) - ..() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/storage/belt/bandolier name = "bandolier" @@ -544,19 +549,14 @@ new /obj/item/ammo_casing/shotgun/beanbag/fake(src) update_icon() -/obj/item/storage/belt/bandolier/update_icon() - ..() +/obj/item/storage/belt/bandolier/update_icon_state() icon_state = "[initial(icon_state)]_[length(contents)]" /obj/item/storage/belt/bandolier/attackby(obj/item/W, mob/user) var/amount = length(contents) . = ..() if(amount != length(contents)) - update_icon() - -/obj/item/storage/belt/bandolier/remove_from_storage(obj/item/W, atom/new_location) - ..() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/storage/belt/holster name = "shoulder holster" @@ -695,16 +695,14 @@ return playsound(src, 'sound/weapons/blade_unsheath.ogg', 20) -/obj/item/storage/belt/rapier/update_icon() - . = ..() +/obj/item/storage/belt/rapier/update_icon_state() icon_state = initial(icon_state) item_state = initial(item_state) if(length(contents)) icon_state = "[icon_state]-rapier" item_state = "[item_state]-rapier" - if(isliving(loc)) - var/mob/living/L = loc - L.update_inv_belt() + update_equipped_item() + // ------------------------------------- // Bluespace Belt @@ -977,22 +975,19 @@ sheath_sound = 'sound/weapons/blade_dark_sheath.ogg' unsheath_sound = 'sound/weapons/blade_dark_unsheath.ogg' -/obj/item/storage/belt/claymore/update_icon() - . = ..() +/obj/item/storage/belt/claymore/update_icon_state() if(length(contents)) icon_state = "[initial(icon_state)]_blade" item_state = "[initial(icon_state)]_blade" else icon_state = initial(icon_state) item_state = initial(item_state) - if(isliving(loc)) - var/mob/living/L = loc - L.update_inv_belt() - L.update_inv_s_store() + update_equipped_item() + /obj/item/storage/belt/claymore/populate_contents() new claymore_path(src) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/storage/belt/claymore/attack_hand(mob/user) if(loc != user) @@ -1008,7 +1003,7 @@ var/obj/item/I = contents[1] H.visible_message(span_notice("[H] takes [I] out of [src]."), span_notice("You take [I] out of [src].")) H.put_in_hands(I, ignore_anim = FALSE) - update_icon() + update_icon(UPDATE_ICON_STATE) else to_chat(user, span_warning("[src] is empty!")) diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index e8bb99075a5..20754ee59d4 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -85,10 +85,10 @@ else M.LAssailant = user - if(!(ishuman(user) || SSticker) && SSticker.mode.name != "monkey") + if(!ishuman(user) || ismonkeybasic(user)) to_chat(user, "You don't have the dexterity to do this!") return - if(!user.mind?.isholy) + if(!user.mind || !user.mind.isholy) to_chat(user, "The book sizzles in your hands.") user.take_organ_damage(0, 10) return @@ -181,21 +181,6 @@ item_state = choice_icons["inhand"] customisable = FALSE - // Carpet symbol icons are currently broken, so commented out until it's fixed - /*var/carpet_dir - switch(choice) - if("Bible") - carpet_dir = 2 - if("Koran") - carpet_dir = 4 - if("Scientology") - carpet_dir = 8 - if(carpet_dir) - for(var/area/chapel/main/A in world) - for(var/turf/T in A.contents) - if(T.icon_state == "carpetsymbol") - T.dir = carpet_dir*/ - SSblackbox.record_feedback("text", "religion_book", 1, "[choice]", 1) if(SSticker) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index f07c412fd44..35518f02d05 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -269,7 +269,7 @@ new /obj/item/implantcase/tracking(src) new /obj/item/implanter(src) new /obj/item/implantpad(src) - new /obj/item/locator(src) + new /obj/item/gps/security(src) /obj/item/storage/box/minertracker name = "boxed tracking implant kit" @@ -281,7 +281,7 @@ new /obj/item/implantcase/tracking(src) new /obj/item/implanter(src) new /obj/item/implantpad(src) - new /obj/item/locator(src) + new /obj/item/gps/security(src) /obj/item/storage/box/chemimp name = "chemical implant kit" @@ -647,6 +647,7 @@ icon = 'icons/obj/cigarettes.dmi' icon_state = "matchbox" item_state = "matchbox" + base_icon_state = "matchbox" storage_slots = 10 w_class = WEIGHT_CLASS_TINY max_w_class = WEIGHT_CLASS_TINY @@ -663,7 +664,19 @@ if(istype(W, /obj/item/match) && !W.lit) W.matchignite() playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, 1) - return + + +/obj/item/storage/box/matches/update_icon_state() + switch(length(contents)) + if(10 to INFINITY) + icon_state = base_icon_state + if(5 to 9) + icon_state = "[base_icon_state]_almostfull" + if(1 to 4) + icon_state = "[base_icon_state]_almostempty" + else + icon_state = "[base_icon_state]_e" + /obj/item/storage/box/autoinjectors name = "box of injectors" @@ -762,13 +775,29 @@ foldable = null var/design = NODESIGN -/obj/item/storage/box/papersack/update_icon() - if(!contents.len) - icon_state = "[item_state]" - else icon_state = "[item_state]_closed" + +/obj/item/storage/box/papersack/update_desc(updates = ALL) + . = ..() + switch(design) + if(NODESIGN) + desc = "A sack neatly crafted out of paper." + if(NANOTRASEN) + desc = "A standard Nanotrasen paper lunch sack for loyal employees on the go." + if(SYNDI) + desc = "The design on this paper sack is a remnant of the notorious 'SyndieSnacks' program." + if(HEART) + desc = "A paper sack with a heart etched onto the side." + if(SMILE) + desc = "A paper sack with a crude smile etched onto the side." + + +/obj/item/storage/box/papersack/update_icon_state() + item_state = "paperbag_[design]" + icon_state = length(contents) ? "[item_state]_closed" : "[item_state]" + /obj/item/storage/box/papersack/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/pen)) + if(is_pen(W)) //if a pen is used on the sack, dialogue to change its design appears if(contents.len) to_chat(user, "You can't modify [src] with items still inside!") @@ -784,19 +813,7 @@ return to_chat(usr, "You make some modifications to [src] using your pen.") design = switchDesign - icon_state = "paperbag_[design]" - item_state = "paperbag_[design]" - switch(design) - if(NODESIGN) - desc = "A sack neatly crafted out of paper." - if(NANOTRASEN) - desc = "A standard Nanotrasen paper lunch sack for loyal employees on the go." - if(SYNDI) - desc = "The design on this paper sack is a remnant of the notorious 'SyndieSnacks' program." - if(HEART) - desc = "A paper sack with a heart etched onto the side." - if(SMILE) - desc = "A paper sack with a crude smile etched onto the side." + update_appearance(UPDATE_DESC|UPDATE_ICON_STATE) return else if(is_sharp(W)) if(!contents.len) @@ -844,8 +861,7 @@ new /obj/item/crowbar/red(src) new /obj/item/kitchen/knife/combat(src) new /obj/item/radio/centcom(src) - new /obj/item/reagent_containers/food/pill/patch/synthflesh(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/storage/firstaid/crew(src) /obj/item/storage/box/soviet name = "boxed survival kit" @@ -1018,6 +1034,24 @@ new /obj/item/clothing/gloves/combat(src) new /obj/item/storage/backpack/security(src) +/obj/item/storage/box/dominator_kit + name = "Dominator kit" + icon_state = "box_dominator" + +/obj/item/storage/box/dominator_kit/populate_contents() + new /obj/item/gun/energy/dominator/sibyl(src) + new /obj/item/clothing/accessory/holster(src) + +/obj/item/storage/box/enforcer_kit + name = "Enforcer kit" + icon_state = "box_enforcer" + +/obj/item/storage/box/enforcer_kit/populate_contents() + new /obj/item/gun/projectile/automatic/pistol/enforcer/security(src) + new /obj/item/ammo_box/magazine/enforcer(src) + new /obj/item/ammo_box/magazine/enforcer(src) + new /obj/item/clothing/accessory/holster(src) + /obj/item/storage/box/hardmode_box name = "box of HRD-MDE project box" desc = "Contains everything needed to get yourself killed for a medal." diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index acf687cfa60..2c9df74c88e 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -18,10 +18,10 @@ resistance_flags = FLAMMABLE var/icon_type -/obj/item/storage/fancy/update_icon(var/itemremoved = 0) - var/total_contents = src.contents.len - itemremoved - src.icon_state = "[src.icon_type]box[total_contents]" - return + +/obj/item/storage/fancy/update_icon_state() + icon_state = "[icon_type]box[length(contents)]" + /obj/item/storage/fancy/examine(mob/user) . = ..() @@ -47,23 +47,29 @@ foldable = /obj/item/stack/sheet/cardboard foldable_amt = 1 -/obj/item/storage/fancy/donut_box/update_icon() - overlays.Cut() - for(var/i = 1 to length(contents)) - var/obj/item/reagent_containers/food/snacks/donut/donut = contents[i] - var/icon/new_donut_icon = icon('icons/obj/food/containers.dmi', "donut_[donut.donut_sprite_type]") - new_donut_icon.Shift(EAST, 3 * (i-1)) - overlays += new_donut_icon +/obj/item/storage/fancy/donut_box/update_icon_state() + return + + +/obj/item/storage/fancy/donut_box/update_overlays() + . = ..() + for(var/I = 1 to length(contents)) + var/obj/item/reagent_containers/food/snacks/donut/donut = contents[I] + var/icon/new_donut_icon = icon(icon, "donut_[donut.donut_sprite_type]") + new_donut_icon.Shift(EAST, 3 * (I - 1)) + . += new_donut_icon + . += "donutbox_front" - overlays += icon('icons/obj/food/containers.dmi', "donutbox_front") /obj/item/storage/fancy/donut_box/populate_contents() for(var/i = 1 to storage_slots) new /obj/item/reagent_containers/food/snacks/donut(src) - update_icon() + update_icon(UPDATE_OVERLAYS) + /obj/item/storage/fancy/donut_box/empty/populate_contents() + update_icon(UPDATE_OVERLAYS) return /* @@ -135,17 +141,23 @@ new /obj/item/toy/crayon/blue(src) new /obj/item/toy/crayon/purple(src) new /obj/item/toy/crayon/black(src) - update_icon() + update_icon(UPDATE_OVERLAYS) + -/obj/item/storage/fancy/crayons/update_icon() - overlays = list() //resets list - overlays += image('icons/obj/crayons.dmi',"crayonbox") +/obj/item/storage/fancy/crayons/update_icon_state() + return + + +/obj/item/storage/fancy/crayons/update_overlays() + . = ..() for(var/obj/item/toy/crayon/crayon in contents) - overlays += image('icons/obj/crayons.dmi',crayon.colourName) + . += crayon.colourName + -/obj/item/storage/fancy/crayons/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W,/obj/item/toy/crayon)) - switch(W:colourName) +/obj/item/storage/fancy/crayons/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/toy/crayon)) + var/obj/item/toy/crayon/crayon = I + switch(crayon.colourName) if("mime") to_chat(usr, "This crayon is too sad to be contained in this box.") return @@ -182,58 +194,57 @@ for(var/i = 1 to storage_slots) new cigarette_type(src) -/obj/item/storage/fancy/cigarettes/update_icon() //lazy as hell - switch(contents.len) +/obj/item/storage/fancy/cigarettes/update_icon_state() + var/init_state = initial(icon_state) + switch(length(contents)) if(17 to INFINITY) - icon_state = "[initial(icon_state)]6" + icon_state = "[init_state]6" if(14 to 16) - icon_state = "[initial(icon_state)]5" + icon_state = "[init_state]5" if(11 to 13) - icon_state = "[initial(icon_state)]4" + icon_state = "[init_state]4" if(7 to 10) - icon_state = "[initial(icon_state)]3" + icon_state = "[init_state]3" if(4 to 6) - icon_state = "[initial(icon_state)]2" + icon_state = "[init_state]2" if(1 to 3) - icon_state = "[initial(icon_state)]1" + icon_state = "[init_state]1" else - icon_state = "[initial(icon_state)]0" - -/obj/item/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - if(!istype(M, /mob)) - return - - if(istype(M) && M == user && user.zone_selected == "mouth" && contents.len > 0 && !user.wear_mask) - var/got_cig = 0 - for(var/num=1, num <= contents.len, num++) - var/obj/item/I = contents[num] - if(istype(I, /obj/item/clothing/mask/cigarette)) - var/obj/item/clothing/mask/cigarette/C = I - user.equip_to_slot_if_possible(C, slot_wear_mask) - to_chat(user, "You take \a [C.name] out of the pack.") - update_icon() - got_cig = 1 - break - if(!got_cig) - to_chat(user, "There are no smokables in the pack!") + icon_state = "[init_state]0" + + +/obj/item/storage/fancy/cigarettes/attack(mob/living/carbon/human/target, mob/living/carbon/user) + if(!ishuman(target) || user.zone_selected != BODY_ZONE_PRECISE_MOUTH) + return ..() + + var/obj/item/clothing/mask/cigarette/cigar = locate() in src + if(!cigar) + to_chat(user, span_warning("There are no smokables in the pack!")) + return TRUE + + if(target.equip_to_slot_if_possible(cigar, slot_wear_mask, disable_warning = TRUE)) + to_chat(user, span_notice("You took \a [cigar.name] out of the pack[target != user ? " and deftly place it in [target] mouth" : ""].")) else - ..() + to_chat(user, span_warning("Something is blocking [target] mouth!")) + + return TRUE -/obj/item/storage/fancy/cigarettes/can_be_inserted(obj/item/W as obj, stop_messages = 0) + +/obj/item/storage/fancy/cigarettes/can_be_inserted(obj/item/W , stop_messages = 0) if(istype(W, /obj/item/match)) - var/obj/item/match/M = W - if(M.lit == 1) + var/obj/item/match/match = W + if(match.lit) if(!stop_messages) - to_chat(usr, "Putting a lit [W] in [src] probably isn't a good idea.") - return 0 + to_chat(usr, span_notice("Putting a lit [W] in [src] probably isn't a good idea.")) + return FALSE if(istype(W, /obj/item/lighter)) - var/obj/item/lighter/L = W - if(L.lit == 1) + var/obj/item/lighter/lighter = W + if(lighter.lit) if(!stop_messages) - to_chat(usr, "Putting [W] in [src] while lit probably isn't a good idea.") - return 0 - //if we get this far, handle the insertion checks as normal - .=..() + to_chat(usr, span_notice("Putting [W] in [src] while lit probably isn't a good idea.")) + return FALSE + return ..() + /obj/item/storage/fancy/cigarettes/decompile_act(obj/item/matter_decompiler/C, mob/user) if(!length(contents)) @@ -336,10 +347,15 @@ for(var/i in 1 to storage_slots) new /obj/item/rollingpaper(src) -/obj/item/storage/fancy/rollingpapers/update_icon() - overlays.Cut() - if(!contents.len) - overlays += "[icon_state]_empty" + +/obj/item/storage/fancy/crayons/update_icon_state() + return + + +/obj/item/storage/fancy/rollingpapers/update_icon_state() + . = ..() + if(!length(contents)) + . += "[icon_state]_empty" /* * cigcase @@ -353,10 +369,10 @@ storage_slots = 7 can_hold = list(/obj/item/clothing/mask/cigarette/cigar) -/obj/item/storage/fancy/cigcase/update_icon(var/itemremoved = 0) - var/total_contents = src.contents.len - itemremoved - src.icon_state = "[src.icon_type]case[total_contents]" - return + +/obj/item/storage/fancy/cigcase/update_icon_state() + icon_state = "[icon_type]case[length(contents)]" + /obj/item/storage/fancy/cigcase/populate_contents() for(var/I = 1 to storage_slots) @@ -390,27 +406,25 @@ storage_slots = 6 req_access = list(ACCESS_VIROLOGY) + /obj/item/storage/lockbox/vials/populate_contents() for(var/I = 1 to storage_slots) new /obj/item/reagent_containers/glass/beaker/vial(src) update_icon() -/obj/item/storage/lockbox/vials/update_icon(var/itemremoved = 0) - var/total_contents = src.contents.len - itemremoved - src.icon_state = "vialbox[total_contents]" - src.overlays.Cut() + +/obj/item/storage/lockbox/vials/update_icon_state() + icon_state = "vialbox[length(contents)]" + + +/obj/item/storage/lockbox/vials/update_overlays() + . = ..() if(!broken) - overlays += image(icon, src, "led[locked]") + . += "led[locked]" if(locked) - overlays += image(icon, src, "cover") + . += "cover" else - overlays += image(icon, src, "ledb") - return - -/obj/item/storage/lockbox/vials/attackby(obj/item/W as obj, mob/user as mob, params) - ..() - update_icon() - + . += "ledb" ///Aquatic Starter Kit diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 6bc66cb282c..6b33df174aa 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -353,22 +353,25 @@ new /obj/item/reagent_containers/food/pill/charcoal(src) new /obj/item/reagent_containers/food/pill/charcoal(src) -/obj/item/storage/pill_bottle/MouseDrop(obj/over_object as obj) // Best utilized if you're a cantankerous doctor with a Vicodin habit. - if(iscarbon(over_object)) - var/mob/living/carbon/C = over_object - if(loc == C && src == C.get_active_hand()) - if(!contents.len) - to_chat(C, "There is nothing in [src]!") - return - C.visible_message("[C] [rapid_intake_message]") - if(do_mob(C, C, 100)) // 10 seconds - for(var/obj/item/reagent_containers/food/pill/P in contents) - P.attack(C, C) - C.visible_message("[C] [rapid_post_instake_message]") - return + +/obj/item/storage/pill_bottle/MouseDrop(mob/living/carbon/user, src_location, over_location, src_control, over_control, params) // Best utilized if you're a cantankerous doctor with a Vicodin habit. + if(iscarbon(user) && src == user.get_active_hand()) + if(!length(contents)) + to_chat(user, span_notice("There is nothing in [src]!")) + return FALSE + + user.visible_message(span_danger("[user] [rapid_intake_message]")) + if(!do_mob(user, user, 10 SECONDS) || src != user.get_active_hand()) + return FALSE + + for(var/obj/item/reagent_containers/food/pill/pill in src) + pill.attack(user, user) + user.visible_message(span_danger("[user] [rapid_post_instake_message]")) + return FALSE return ..() + /obj/item/storage/pill_bottle/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen)) rename_interactive(user, I) diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm index e9f3455468a..1c08db71d6e 100644 --- a/code/game/objects/items/weapons/storage/internal.dm +++ b/code/game/objects/items/weapons/storage/internal.dm @@ -34,70 +34,36 @@ * If you are using these you will probably want to override attackby() as well. * See /obj/item/clothing/suit/storage for an example. * Items that use internal storage have the option of calling this to emulate default storage MouseDrop behaviour. - * Returns `TRUE` if the master item's parent's MouseDrop() should be called, `FALSE` otherwise. It's strange, but no other way of + * Returns `FALSE` if the master item's parent's MouseDrop() should be called, `TRUE` otherwise. It's strange, but no other way of * doing it without the ability to call another proc's parent, really. */ -/obj/item/storage/internal/proc/handle_mousedrop(mob/user, obj/over_object) - if(ishuman(user)) //so monkeys can take off their backpacks -- Urist - - if(istype(user.loc,/obj/mecha)) // stops inventory actions in a mech - return FALSE - - if(over_object == user && Adjacent(user)) // this must come before the screen objects only block - src.open(user) - return FALSE - - if(!(istype(over_object, /obj/screen))) - return TRUE - - //makes sure master_item is equipped before putting it in hand, so that we can't drag it into our hand from miles away. - //there's got to be a better way of doing this... - if(!(master_item.loc == user) || (master_item.loc && master_item.loc.loc == user)) - return FALSE - - if(!(user.restrained() ) && !(user.stat)) - switch(over_object.name) - if("r_hand") - if(!master_item.remove_item_from_storage(drop_location())) - user.drop_item_ground(master_item) - user.put_in_r_hand(master_item) - if("l_hand") - if(!master_item.remove_item_from_storage(drop_location())) - user.drop_item_ground(master_item) - user.put_in_l_hand(master_item) - master_item.add_fingerprint(user) - return FALSE - return FALSE +/obj/item/storage/internal/proc/handle_mousedrop(mob/living/carbon/human/user, obj/over_object) + . = FALSE + if(over_object == user && ishuman(user) && !user.incapacitated() && !ismecha(user.loc) && !is_ventcrawling(user) && user.Adjacent(master_item)) + open(user) + master_item.add_fingerprint(user) + return TRUE /** * Items that use internal storage have the option of calling this to emulate default storage attack_hand behaviour. - * Returns `TRUE` if the master item's parent's attack_hand() should be called, 0 otherwise. + * Returns `FALSE` if the master item's parent's attack_hand() should be called, `TRUE` otherwise. * It's strange, but no other way of doing it without the ability to call another proc's parent, really. */ -/obj/item/storage/internal/proc/handle_attack_hand(mob/user) - - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(H.l_store == master_item && !H.get_active_hand()) //Prevents opening if it's in a pocket. - H.put_in_hands(master_item) - H.l_store = null - return FALSE - if(H.r_store == master_item && !H.get_active_hand()) - H.put_in_hands(master_item) - H.r_store = null - return FALSE - - src.add_fingerprint(user) - if(master_item.loc == user) - src.open(user) +/obj/item/storage/internal/proc/handle_attack_hand(mob/living/carbon/human/user) + . = TRUE + if(master_item.loc != user || !ishuman(user) || user.incapacitated() || ismecha(user.loc) || is_ventcrawling(user)) return FALSE - for(var/mob/M in range(1, master_item.loc)) - if(M.s_active == src) - src.close(M) - return TRUE + //Prevents opening if it's in a pocket. + if(!user.get_active_hand() && (master_item == user.l_store || master_item == user.r_store)) + user.temporarily_remove_item_from_inventory(master_item) + user.put_in_hands(master_item) + return . + open(user) + master_item.add_fingerprint(user) -/obj/item/storage/internal/Adjacent(var/atom/neighbor) + +/obj/item/storage/internal/Adjacent(atom/neighbor) return master_item.Adjacent(neighbor) diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index e48f0e8d6cc..c001c82d5ac 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -8,12 +8,20 @@ max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item. storage_slots = 4 req_access = list(ACCESS_ARMORY) - var/locked = 1 - var/broken = 0 + var/locked = TRUE + var/broken = FALSE var/icon_locked = "lockbox+l" var/icon_closed = "lockbox" var/icon_broken = "lockbox+b" + +/obj/item/storage/lockbox/update_icon_state() + if(broken) + icon_state = icon_broken + return + icon_state = locked ? icon_locked : icon_closed + + /obj/item/storage/lockbox/attackby(obj/item/I, mob/user, params) if(I.GetID()) if(broken) @@ -21,14 +29,13 @@ return if(check_access(I)) locked = !locked + update_icon() if(locked) - icon_state = icon_locked to_chat(user, "You lock \the [src]!") if(user.s_active) user.s_active.close(user) return else - icon_state = icon_closed to_chat(user, "You unlock \the [src]!") origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D. return @@ -42,36 +49,39 @@ ..() else to_chat(user, "It's locked!") - return -/obj/item/storage/lockbox/show_to(mob/user as mob) + +/obj/item/storage/lockbox/show_to(mob/user) if(locked) to_chat(user, "It's locked!") else ..() return + /obj/item/storage/lockbox/can_be_inserted(obj/item/W, stop_messages = 0) if(!locked) return ..() if(!stop_messages) to_chat(usr, "[src] is locked!") - return 0 + return FALSE + /obj/item/storage/lockbox/emag_act(mob/user) if(!broken) add_attack_logs(user, src, "emagged") - broken = 1 - locked = 0 + broken = TRUE + locked = FALSE desc = "It appears to be broken." - icon_state = icon_broken + update_icon() if(user) to_chat(user, "You unlock \the [src].") origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D. -/obj/item/storage/lockbox/hear_talk(mob/living/M as mob, list/message_pieces) -/obj/item/storage/lockbox/hear_message(mob/living/M as mob, msg) +/obj/item/storage/lockbox/hear_talk(mob/living/M, list/message_pieces) + +/obj/item/storage/lockbox/hear_message(mob/living/M, msg) /obj/item/storage/lockbox/mindshield name = "Lockbox (Mindshield Implants)" @@ -83,6 +93,9 @@ new /obj/item/implantcase/mindshield(src) new /obj/item/implanter/mindshield(src) +/obj/item/storage/lockbox/mindshield/ert + w_class = WEIGHT_CLASS_NORMAL + /obj/item/storage/lockbox/sibyl_system_mod name = "lockbox (Sibyl System Mods)" desc = "Contains proprietary Sibyl System mods for energy guns." @@ -126,6 +139,7 @@ name = "lockbox (T4)" desc = "Contains three T4 breaching charges." req_access = list(ACCESS_CENT_SPECOPS) + w_class = WEIGHT_CLASS_NORMAL /obj/item/storage/lockbox/t4/populate_contents() for(var/I in 1 to 3) diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 77376ffa221..f0360a18106 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -27,11 +27,21 @@ max_w_class = WEIGHT_CLASS_SMALL max_combined_w_class = 14 + /obj/item/storage/secure/examine(mob/user) . = ..() if(in_range(user, src)) . += "The service panel is [open ? "open" : "closed"]." + +/obj/item/storage/secure/update_overlays() + . = ..() + if(emagged) + . += icon_locking + else if(!locked) + . += icon_opened + + /obj/item/storage/secure/populate_contents() new /obj/item/paper(src) new /obj/item/pen(src) @@ -41,13 +51,13 @@ if((istype(W, /obj/item/melee/energy/blade)) && (!emagged)) emag_act(user, W) - if(istype(W, /obj/item/screwdriver)) + if(W.tool_behaviour == TOOL_SCREWDRIVER) if(do_after(user, 20 * W.toolspeed * gettoolspeedmod(user), target = src)) open = !open user.show_message("You [open ? "open" : "close"] the service panel.", 1) return - if((istype(W, /obj/item/multitool)) && (open) && (!l_hacking)) + if((W.tool_behaviour = TOOL_MULTITOOL) && (open) && (!l_hacking)) user.show_message("Now attempting to reset internal memory, please hold.", 1) l_hacking = TRUE if(do_after(user, 100 * W.toolspeed * gettoolspeedmod(user), target = src)) @@ -70,30 +80,34 @@ return ..() + /obj/item/storage/secure/emag_act(mob/user, obj/weapon) - if(!emagged) - add_attack_logs(user, src, "emagged") - emagged = TRUE - overlays += image('icons/obj/storage.dmi', icon_sparking) - sleep(6) - overlays.Cut() - overlays += image('icons/obj/storage.dmi', icon_locking) - locked = FALSE - if(istype(weapon, /obj/item/melee/energy/blade)) - do_sparks(5, 0, loc) - playsound(loc, 'sound/weapons/blade1.ogg', 50, 1) - playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - if(user) - to_chat(user, "You slice through the lock on [src].") - else if(user) - to_chat(user, "You short out the lock on [src].") + if(emagged) + return + + add_attack_logs(user, src, "emagged") + emagged = TRUE + locked = FALSE + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + flick_overlay_view(image(icon, src, icon_sparking), 1 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS) + + if(istype(weapon, /obj/item/melee/energy/blade)) + do_sparks(5, 0, loc) + playsound(loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + if(user) + to_chat(user, "You slice through the lock on [src].") + else if(user) + to_chat(user, "You short out the lock on [src].") + /obj/item/storage/secure/AltClick(mob/living/user) if(istype(user) && !try_to_open()) return FALSE return ..() -/obj/item/storage/secure/MouseDrop(over_object, src_location, over_location) +/obj/item/storage/secure/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) if(!try_to_open()) return FALSE return ..() @@ -138,8 +152,8 @@ switch(action) if("close") locked = TRUE - overlays.Cut() code = null + update_icon(UPDATE_OVERLAYS) close(usr) if("setnumber") switch(params["buttonValue"]) @@ -150,9 +164,8 @@ to_chat(usr, "The code was set successfully.") else if((code == l_code) && l_set) locked = FALSE - overlays.Cut() - overlays += image('icons/obj/storage.dmi', icon_opened) code = null + update_icon(UPDATE_OVERLAYS) else code = "ERROR" if("R") @@ -232,7 +245,7 @@ force = 8 w_class = WEIGHT_CLASS_HUGE max_w_class = 8 - anchored = 1 + anchored = TRUE density = 0 cant_hold = list(/obj/item/storage/secure/briefcase) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index ce9e95495ac..5f06e4bc428 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -9,6 +9,7 @@ name = "storage" icon = 'icons/obj/storage.dmi' w_class = WEIGHT_CLASS_NORMAL + flags_2 = BLOCKS_LIGHT_2 ///No message on putting items in var/silent = FALSE ///List of objects which this item can store (if set, it can't store anything else) @@ -98,40 +99,44 @@ continue hide_from(player) -/obj/item/storage/MouseDrop(obj/over_object) - if(ishuman(usr)) //so monkeys can take off their backpacks -- Urist - var/mob/M = usr - if(istype(M.loc,/obj/mecha) || M.incapacitated(FALSE, TRUE, TRUE)) // Stops inventory actions in a mech as well as while being incapacitated - return +/obj/item/storage/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) + if(!ishuman(usr)) + return FALSE - if(over_object == M && Adjacent(M)) // this must come before the screen objects only block - if(M.s_active) - M.s_active.close(M) - open(M) - return + var/mob/living/carbon/human/user = usr - if((istype(over_object, /obj/structure/table) || istype(over_object, /turf/simulated/floor)) \ - && contents.len && loc == usr && !usr.stat && !usr.restrained() && usr.canmove && over_object.Adjacent(usr) \ - && !istype(src, /obj/item/storage/lockbox)) - var/turf/T = get_turf(over_object) - if(istype(over_object, /turf/simulated/floor)) - if(get_turf(usr) != T) - return // Can only empty containers onto the floor under you - if("Yes" != alert(usr,"Empty \the [src] onto \the [T]?","Confirm","Yes","No")) - return - if(!(usr && over_object && contents.len && loc == usr && !usr.stat && !usr.restrained() && usr.canmove && get_turf(usr) == T)) - return // Something happened while the player was thinking - hide_from(usr) - usr.face_atom(over_object) - usr.visible_message("[usr] empties \the [src] onto \the [over_object].", - "You empty \the [src] onto \the [over_object].") - for(var/obj/item/I in contents) - remove_from_storage(I, T) - update_icon() // For content-sensitive icons - return + // Stops inventory actions in a mech, while ventcrawling and while being incapacitated + if(ismecha(user.loc) || is_ventcrawling(user) || user.incapacitated(FALSE, TRUE, TRUE)) + return FALSE + + if(over_object == user && user.Adjacent(src)) // this must come before the screen objects only block + open(user) + return FALSE + + if((!istype(src, /obj/item/storage/lockbox) && (istype(over_object, /obj/structure/table) || istype(over_object, /turf/simulated/floor)) \ + && length(contents) && loc == user && !user.incapacitated() && user.Adjacent(over_object))) + + if(alert(user, "Empty [src] onto [over_object]?", "Confirm", "Yes", "No") != "Yes") + return FALSE + + if(!user || !over_object || user.incapacitated() || loc != user || !user.Adjacent(over_object)) + return FALSE + + close(user) + user.face_atom(over_object) + user.visible_message( + span_notice("[user] empties [src] onto [over_object]."), + span_notice("You empty [src] onto [over_object]."), + ) + var/turf/object_turf = get_turf(over_object) + for(var/obj/item/item in src) + remove_from_storage(item, object_turf) + + update_icon() // For content-sensitive icons + return FALSE - return ..() + return ..() /obj/item/storage/AltClick(mob/user) @@ -186,6 +191,14 @@ if(user.s_active == src) user.s_active = null + +/obj/item/storage/proc/hide_from_all_viewers() + if(!LAZYLEN(mobs_viewing)) + return + for(var/mob/viewer as anything in mobs_viewing) + hide_from(viewer) + + /obj/item/storage/proc/update_viewers() for(var/_M in mobs_viewing) var/mob/M = _M @@ -438,7 +451,7 @@ if(istype(src, /obj/item/storage/fancy)) var/obj/item/storage/fancy/F = src - F.update_icon(TRUE) + F.update_icon() for(var/_M in mobs_viewing) var/mob/M = _M diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index b27d66f347e..86dd971d773 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -35,56 +35,70 @@ var/obj/item/card/id/front_id = null var/image/front_id_overlay = null -/obj/item/storage/wallet/proc/id_check() - front_id = (locate(/obj/item/card/id) in contents) - if(!front_id) - name = "[item_color] leather wallet" - return FALSE - name = "[item_color] leather wallet with [front_id] on the front" - return TRUE -/obj/item/storage/wallet/remove_from_storage(obj/item/W, atom/new_location) - . = ..(W, new_location) - if(.) - id_check() - update_icon() +/obj/item/storage/wallet/remove_from_storage(obj/item/I, atom/new_location) + . = ..() + if(. && istype(I, /obj/item/card/id)) + refresh_ID() + + +/obj/item/storage/wallet/handle_item_insertion(obj/item/I, prevent_warning = FALSE) + . = ..() + if(. && istype(I, /obj/item/card/id)) + refresh_ID() -/obj/item/storage/wallet/handle_item_insertion(obj/item/W, prevent_warning = 0) - . = ..(W, prevent_warning) - if(.) - id_check() - update_icon() /obj/item/storage/wallet/swap_items(obj/item/item_1, obj/item/item_2, mob/user) - . = ..(item_1, item_2, user) + . = ..() if(.) - id_check() - update_icon() + refresh_ID() + +/obj/item/storage/wallet/orient2hud(mob/user) + . = ..() + refresh_ID() + + +/obj/item/storage/wallet/proc/refresh_ID() + // Locate the first ID in the wallet + front_id = (locate(/obj/item/card/id) in contents) -/obj/item/storage/wallet/update_icon() if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - if(H.wear_id == src) - H.sec_hud_set_ID() - overlays -= front_id_overlay + var/mob/living/carbon/human/wearing_human = loc + if(wearing_human.wear_id == src) + wearing_human.sec_hud_set_ID() + + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) + + +/obj/item/storage/wallet/update_overlays() + . = ..() if(!front_id) - front_id_overlay = null return var/front_id_icon_state_holder = front_id.icon_state - if (copytext(front_id_icon_state_holder,1,4) == "ERT") + if(copytext(front_id_icon_state_holder,1,4) == "ERT") front_id_icon_state_holder = "ERT" else if(!(front_id_icon_state_holder in icon_states(src.icon))) front_id_icon_state_holder = "id" - front_id_overlay = image('icons/obj/wallets.dmi', front_id_icon_state_holder) - overlays += front_id_overlay + . += mutable_appearance('icons/obj/wallets.dmi', front_id_icon_state_holder) + + +/obj/item/storage/wallet/update_name(updates = ALL) + . = ..() + if(front_id) + name = "[item_color] leather wallet with [front_id] on the front" + else + name = "[item_color] leather wallet" + /obj/item/storage/wallet/GetID() return front_id ? front_id : ..() + /obj/item/storage/wallet/GetAccess() return front_id ? front_id.GetAccess() : ..() + /obj/item/storage/wallet/random/populate_contents() var/cash = pick(/obj/item/stack/spacecash, /obj/item/stack/spacecash/c10, @@ -110,6 +124,7 @@ icon = 'icons/obj/wallets.dmi' item_state = "wallet" + /obj/item/storage/wallet/color/Initialize(mapload) . = ..() if(!item_color) @@ -117,31 +132,17 @@ new color_wallet(src.loc) qdel(src) return - UpdateDesc() + update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON_STATE) -/obj/item/storage/wallet/color/proc/UpdateDesc() - name = "[item_color] wallet" - desc = "[item_color] wallet made from... leather?" - icon_state = "[item_color]_wallet" +/obj/item/storage/wallet/color/update_icon_state() + icon_state = "[item_color]_wallet" -/obj/item/storage/wallet/color/remove_from_storage(obj/item/W, atom/new_location) - . = ..(W, new_location) - if(.) - id_check() - update_icon() -/obj/item/storage/wallet/color/handle_item_insertion(obj/item/W, prevent_warning = 0) - . = ..(W, prevent_warning) - if(.) - id_check() - update_icon() +/obj/item/storage/wallet/color/update_desc(updates = ALL) + . = ..() + desc = "[item_color] wallet made from... leather?" -/obj/item/storage/wallet/color/swap_items(obj/item/item_1, obj/item/item_2, mob/user) - . = ..(item_1, item_2, user) - if(.) - id_check() - update_icon() /obj/item/storage/wallet/color/blue item_color = "blue" diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index cf670bd194f..526780bc215 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -54,14 +54,18 @@ A.UpdateButtonIcon() +/obj/item/tank/jetpack/update_icon_state() + icon_state = "[initial(icon_state)][on ? "-on" : ""]" + + /obj/item/tank/jetpack/proc/turn_on(mob/user) on = TRUE - icon_state = "[initial(icon_state)]-on" + update_icon(UPDATE_ICON_STATE) /obj/item/tank/jetpack/proc/turn_off(mob/user) on = FALSE stabilizers = FALSE - icon_state = initial(icon_state) + update_icon(UPDATE_ICON_STATE) /obj/item/tank/jetpack/proc/allow_thrust(num, mob/living/user, should_leave_trail) if(!on) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index b592c3d220a..e9040c412c3 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -62,7 +62,7 @@ if(!silent) to_chat(C, "You are not wearing a suitable mask or helmet.") return FALSE - if(M.mask_adjusted) // If the mask is equipped but pushed down + if(M.up) // If the mask is equipped but pushed down M.adjustmask(C) // Adjust it back if(!silent) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 357d0ccabef..ea7891ca7b9 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -190,12 +190,28 @@ /obj/item/watertank/atmos/make_noz() return new /obj/item/extinguisher/mini/nozzle(src) + +/obj/item/watertank/atmos/update_icon_state() + var/obj/item/extinguisher/mini/nozzle/our_noz = noz + switch(our_noz.nozzle_mode) + if(EXTINGUISHER) + icon_state = "waterbackpackatmos_0" + if(NANOFROST) + icon_state = "waterbackpackatmos_1" + if(METAL_FOAM) + icon_state = "waterbackpackatmos_2" + else + icon_state = "waterbackpackatmos" + + /obj/item/watertank/atmos/dropped(mob/user, silent = FALSE) - ..() - icon_state = "waterbackpackatmos" - if(istype(noz, /obj/item/extinguisher/mini/nozzle)) - var/obj/item/extinguisher/mini/nozzle/N = noz - N.nozzle_mode = 0 + . = ..() + if(!noz) + return + var/obj/item/extinguisher/mini/nozzle/our_noz = noz + our_noz.nozzle_mode = NONE + update_icon(UPDATE_ICON_STATE) + /obj/item/extinguisher/mini/nozzle name = "extinguisher nozzle" @@ -210,11 +226,12 @@ cooling_power = 5 w_class = WEIGHT_CLASS_HUGE flags = NODROP //Necessary to ensure that the nozzle and tank never seperate - var/obj/item/watertank/tank - var/nozzle_mode = 0 + var/obj/item/watertank/atmos/tank + var/nozzle_mode = NONE var/metal_synthesis_cooldown = 0 var/nanofrost_cooldown = 0 + /obj/item/extinguisher/mini/nozzle/New(parent_tank) . = ..() if(check_tank_exists(parent_tank, src)) @@ -222,32 +239,30 @@ reagents = tank.reagents max_water = tank.volume loc = tank - return + /obj/item/extinguisher/mini/nozzle/Move() . = ..() if(tank && loc != tank.loc) loc = tank - return -/obj/item/extinguisher/mini/nozzle/attack_self(mob/user as mob) + +/obj/item/extinguisher/mini/nozzle/attack_self(mob/user) switch(nozzle_mode) if(EXTINGUISHER) nozzle_mode = NANOFROST - tank.icon_state = "waterbackpackatmos_1" to_chat(user, "Swapped to nanofrost launcher") - return + if(NANOFROST) nozzle_mode = METAL_FOAM - tank.icon_state = "waterbackpackatmos_2" to_chat(user, "Swapped to metal foam synthesizer") - return + if(METAL_FOAM) nozzle_mode = EXTINGUISHER - tank.icon_state = "waterbackpackatmos_0" to_chat(user, "Swapped to water extinguisher") - return - return + + tank.update_icon(UPDATE_ICON_STATE) + /obj/item/extinguisher/mini/nozzle/dropped(mob/user, silent = FALSE) ..() diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index a66470628d4..d4cfa546b95 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -9,10 +9,9 @@ amount = 25 max_amount = 25 -/obj/item/stack/tape_roll/New(var/loc, var/amount=null) +/obj/item/stack/tape_roll/New(loc, amount=null) ..() - - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/item/stack/tape_roll/attack(mob/living/carbon/human/M, mob/living/user) if(!istype(M)) //What good is a duct tape mask if you are unable to speak? @@ -43,7 +42,8 @@ M.equip_to_slot_if_possible(G, slot_wear_mask) G.add_fingerprint(user) -/obj/item/stack/tape_roll/update_icon() + +/obj/item/stack/tape_roll/update_icon_state() var/amount = get_amount() if((amount <= 2) && (amount > 0)) icon_state = "[initial(icon_state)]" @@ -55,7 +55,7 @@ icon_state = "[initial(icon_state)]4" else icon_state = "[initial(icon_state)]4" - ..() + /obj/item/stack/tape_roll/thick name = "incredibly thick tape roll" @@ -90,3 +90,4 @@ var/obj/item/clothing/mask/muzzle/G = new /obj/item/clothing/mask/muzzle/tapegag/thick M.equip_to_slot_if_possible(G, slot_wear_mask) G.add_fingerprint(user) + diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index be1e86f519d..171ab0f1a5e 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -1,103 +1,10 @@ -/* Teleportation devices. - * Contains: - * Locator - * Hand-tele - */ - -/* - * Locator - */ -/obj/item/locator - name = "locator" - desc = "Used to track those with locater implants." - icon = 'icons/obj/device.dmi' - icon_state = "locator" - var/temp = null - var/frequency = 1451 - var/broadcasting = null - var/listening = 1.0 - flags = CONDUCT - w_class = WEIGHT_CLASS_SMALL - item_state = "electronic" - throw_speed = 4 - throw_range = 20 - materials = list(MAT_METAL=400) - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) - origin_tech = "magnets=3;bluespace=2" - -/obj/item/locator/attack_self(mob/user as mob) - add_fingerprint(user) - var/dat = {""} - if(temp) - dat += "[src.temp]
Clear" - else - dat += {" -Persistent Signal Locator
-Frequency: -- -- [format_frequency(src.frequency)] -+ -+
- -Refresh"} - user << browse(dat, "window=radio") - onclose(user, "radio") - return - -/obj/item/locator/Topic(href, href_list) - if(..()) - return 1 - - var/turf/current_location = get_turf(usr)//What turf is the user on? - if(!current_location || is_admin_level(current_location.z))//If turf was not found or they're in the admin zone - to_chat(usr, "\The [src] is malfunctioning.") - return 1 - - if(href_list["refresh"]) - temp = "Persistent Signal Locator
" - var/turf/sr = get_turf(src) - - if(sr) - temp += "Located Beacons:
" - - for(var/obj/item/radio/beacon/W in GLOB.beacons) - if(W.frequency == frequency && !W.syndicate) - if(W && W.z == z) - var/turf/TB = get_turf(W) - temp += "[W.code]: [TB.x], [TB.y], [TB.z]
" - - temp += "Located Implants:
" - for(var/obj/item/implant/tracking/T in GLOB.tracked_implants) - if(!T.implanted || !T.imp_in) - continue - var/turf/Tr = get_turf(T) - - if(Tr && Tr.z == sr.z) - temp += "[T.gps_tag]: [Tr.x], [Tr.y], [Tr.z]
" - - temp += "You are at \[[sr.x],[sr.y],[sr.z]\]." - temp += "
Refresh
" - else - temp += "Processing error: Unable to locate orbital position.
" - else - if(href_list["freq"]) - frequency += text2num(href_list["freq"]) - frequency = sanitize_frequency(frequency) - else - if(href_list["temp"]) - temp = null - - attack_self(usr) - return 1 - -/* - * Hand-tele - */ +/// Hand-tele /obj/item/hand_tele name = "hand tele" desc = "A portable item using blue-space technology." icon = 'icons/obj/device.dmi' icon_state = "hand_tele" + base_icon_state = "hand_tele" item_state = "electronic" throwforce = 0 w_class = WEIGHT_CLASS_SMALL @@ -163,7 +70,7 @@ Frequency: /obj/item/hand_tele/proc/make_inactive(severity) - var/time = rand(20 SECONDS, 30 SECONDS) * severity + var/time = rand(10 SECONDS, 15 SECONDS) * (severity == EMP_HEAVY ? 2 : 1) emp_timer = world.time + time update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, PROC_REF(check_inactive), emp_timer), time) @@ -182,7 +89,7 @@ Frequency: /obj/item/hand_tele/update_icon_state() - icon_state = (emp_timer > world.time) ? icon_state_inactive : initial(icon_state) + icon_state = (emp_timer > world.time) ? icon_state_inactive : base_icon_state /obj/item/hand_tele/portal_destroyed(obj/effect/portal/P) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index df52cc09e1e..515128f65d2 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -115,15 +115,14 @@ resistance_flags = FIRE_PROOF -/obj/item/twohanded/fireaxe/update_icon() //Currently only here to fuck with the on-mob icons. - icon_state = "fireaxe[wielded]" - ..() +/obj/item/twohanded/fireaxe/update_icon_state() //Currently only here to fuck with the on-mob icons. + icon_state = "fireaxe[HAS_TRAIT(src, TRAIT_WIELDED)]" /obj/item/twohanded/fireaxe/afterattack(atom/A, mob/user, proximity) if(!proximity) return - if(wielded) //destroys windows and grilles in one hit + if(HAS_TRAIT(src, TRAIT_WIELDED)) //destroys windows and grilles in one hit if(istype(A, /obj/structure/window) || istype(A, /obj/structure/grille)) var/obj/structure/W = A W.obj_destruction("fireaxe") @@ -136,8 +135,8 @@ needs_permit = TRUE -/obj/item/twohanded/fireaxe/boneaxe/update_icon() - icon_state = "bone_axe[wielded]" +/obj/item/twohanded/fireaxe/boneaxe/update_icon_state() + icon_state = "bone_axe[HAS_TRAIT(src, TRAIT_WIELDED)]" /obj/item/twohanded/fireaxe/energized @@ -148,8 +147,8 @@ var/max_charge = 30 -/obj/item/twohanded/fireaxe/energized/update_icon() - if(wielded) +/obj/item/twohanded/fireaxe/energized/update_icon_state() + if(HAS_TRAIT(src, TRAIT_WIELDED)) icon_state = "fireaxe2" else icon_state = "fireaxe0" @@ -171,7 +170,7 @@ /obj/item/twohanded/fireaxe/energized/attack(mob/M, mob/user) . = ..() - if(wielded && charge == max_charge) + if(HAS_TRAIT(src, TRAIT_WIELDED) && charge == max_charge) if(isliving(M)) var/mob/living/target = M charge = 0 @@ -241,27 +240,26 @@ /obj/item/twohanded/dualsaber/IsReflect() - if(wielded) + if(HAS_TRAIT(src, TRAIT_WIELDED)) return TRUE -/obj/item/twohanded/dualsaber/update_icon() - if(wielded) - icon_state = "dualsaber[blade_color][wielded]" - set_light(brightness_on, l_color=colormap[blade_color]) +/obj/item/twohanded/dualsaber/update_icon_state() + if(HAS_TRAIT(src, TRAIT_WIELDED)) + icon_state = "dualsaber[blade_color]1" + set_light(brightness_on, l_color = colormap[blade_color]) else icon_state = "dualsaber0" set_light(0) - ..() /obj/item/twohanded/dualsaber/attack(mob/target, mob/living/user) ..() - if((CLUMSY in user.mutations) && (wielded) && prob(40)) + if((CLUMSY in user.mutations) && HAS_TRAIT(src, TRAIT_WIELDED) && prob(40)) to_chat(user, "You twirl around a bit before losing your balance and impaling yourself on the [src].") user.take_organ_damage(20, 25) return - if((wielded) && prob(50)) + if(HAS_TRAIT(src, TRAIT_WIELDED) && prob(50)) INVOKE_ASYNC(src, PROC_REF(jedi_spin), user) @@ -274,7 +272,7 @@ /obj/item/twohanded/dualsaber/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) - if(wielded) + if(HAS_TRAIT(src, TRAIT_WIELDED)) return ..() return FALSE @@ -344,8 +342,8 @@ var/icon_prefix = "spearglass" -/obj/item/twohanded/spear/update_icon() - icon_state = "[icon_prefix][wielded]" +/obj/item/twohanded/spear/update_icon_state() + icon_state = "[icon_prefix][HAS_TRAIT(src, TRAIT_WIELDED)]" /obj/item/twohanded/spear/CheckParts(list/parts_list) @@ -365,7 +363,7 @@ return if(isturf(AM)) //So you can actually melee with it return - if(explosive && wielded) + if(explosive && HAS_TRAIT(src, TRAIT_WIELDED)) explosive.forceMove(AM) explosive.prime() qdel(src) @@ -580,15 +578,12 @@ flags &= ~NODROP -/obj/item/twohanded/chainsaw/update_icon() - if(wielded) - icon_state = "chainsaw[wielded]" - else - icon_state = "chainsaw0" - ..() +/obj/item/twohanded/chainsaw/update_icon_state() + icon_state = "chainsaw[HAS_TRAIT(src, TRAIT_WIELDED)]" + /obj/item/twohanded/chainsaw/attack(mob/living/target, mob/living/user) - if(wielded) + if(HAS_TRAIT(src, TRAIT_WIELDED)) playsound(loc, 'sound/weapons/chainsaw.ogg', 100, 1, -1) //incredibly loud; you ain't goin' for stealth with this thing. Credit to Lonemonk of Freesound for this sound. if(isrobot(target)) ..() @@ -638,9 +633,9 @@ if(charged < 5) charged++ -/obj/item/twohanded/singularityhammer/update_icon() //Currently only here to fuck with the on-mob icons. - icon_state = "mjollnir[wielded]" - ..() +/obj/item/twohanded/singularityhammer/update_icon_state() //Currently only here to fuck with the on-mob icons. + icon_state = "mjollnir[HAS_TRAIT(src, TRAIT_WIELDED)]" + /obj/item/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder) for(var/atom/movable/X in orange(5, pull)) @@ -664,7 +659,7 @@ /obj/item/twohanded/singularityhammer/afterattack(atom/A, mob/user, proximity) if(!proximity) return - if(wielded) + if(HAS_TRAIT(src, TRAIT_WIELDED)) if(charged == 5) charged = 0 if(isliving(A)) @@ -699,9 +694,7 @@ /obj/item/twohanded/mjollnir/attack(mob/living/M, mob/user) ..() - if(wielded) - //if(charged == 5) - //charged = 0 + if(HAS_TRAIT(src, TRAIT_WIELDED)) playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) if(isliving(M)) M.Stun(4 SECONDS) @@ -714,9 +707,9 @@ L.Stun(4 SECONDS) shock(L) -/obj/item/twohanded/mjollnir/update_icon() //Currently only here to fuck with the on-mob icons. - icon_state = "mjollnir[wielded]" - ..() +/obj/item/twohanded/mjollnir/update_icon_state() //Currently only here to fuck with the on-mob icons. + icon_state = "mjollnir[HAS_TRAIT(src, TRAIT_WIELDED)]" + /obj/item/twohanded/knighthammer name = "singuloth knight's hammer" @@ -745,9 +738,9 @@ if(charged < 5) charged++ -/obj/item/twohanded/knighthammer/update_icon() //Currently only here to fuck with the on-mob icons. - icon_state = "knighthammer[wielded]" - ..() +/obj/item/twohanded/knighthammer/update_icon_state() //Currently only here to fuck with the on-mob icons. + icon_state = "knighthammer[HAS_TRAIT(src, TRAIT_WIELDED)]" + /obj/item/twohanded/knighthammer/afterattack(atom/A, mob/user, proximity) if(!proximity) @@ -763,13 +756,13 @@ var/atom/throw_target = get_edge_target_turf(Z, get_dir(src, get_step_away(Z, src))) Z.throw_at(throw_target, 200, 4) playsound(user, 'sound/weapons/marauder.ogg', 50, 1) - else if(wielded && Z.health < 1) + else if(HAS_TRAIT(src, TRAIT_WIELDED) && Z.health < 1) Z.visible_message("[Z.name] was blown to pieces by the power of [name]!", \ "You feel a powerful blow rip you apart!", \ "You hear a heavy impact and the sound of ripping flesh!.") Z.gib() playsound(user, 'sound/weapons/marauder.ogg', 50, 1) - if(wielded) + if(HAS_TRAIT(src, TRAIT_WIELDED)) if(istype(A, /turf/simulated/wall)) var/turf/simulated/wall/Z = A Z.ex_act(2) @@ -816,8 +809,8 @@ force_unwielded = 100 force_wielded = 500000 // Kills you DEAD. -/obj/item/twohanded/pitchfork/update_icon() - icon_state = "pitchfork[wielded]" +/obj/item/twohanded/pitchfork/update_icon_state() + icon_state = "pitchfork[HAS_TRAIT(src, TRAIT_WIELDED)]" /obj/item/twohanded/pitchfork/suicide_act(mob/user) user.visible_message("[user] impales \himself in \his abdomen with [src]! It looks like \he's trying to commit suicide...") @@ -844,7 +837,7 @@ // It's no fun being the lord of all hell if you can't get out of a simple room /obj/item/twohanded/pitchfork/demonic/ascended/afterattack(atom/target, mob/user, proximity) - if(!proximity || !wielded) + if(!proximity || !HAS_TRAIT(src, TRAIT_WIELDED)) return if(istype(target, /turf/simulated/wall)) var/turf/simulated/wall/W = target @@ -872,8 +865,8 @@ embed_chance = 50 embedded_ignore_throwspeed_threshold = TRUE -/obj/item/twohanded/bamboospear/update_icon() - icon_state = "bamboo_spear[wielded]" +/obj/item/twohanded/bamboospear/update_icon_state() + icon_state = "bamboo_spear[HAS_TRAIT(src, TRAIT_WIELDED)]" //pyro claws /obj/item/twohanded/required/pyro_claws @@ -1013,9 +1006,6 @@ w_class = initial(w_class) item_state = "" -/obj/item/twohanded/fishingrod/update_icon() - if(wielded) - icon_state = "fishing_rod[wielded]" - else - icon_state = "fishing_rod0" - ..() +/obj/item/twohanded/fishingrod/update_icon_state() + icon_state = "fishing_rod[HAS_TRAIT(src, TRAIT_WIELDED)]" + diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 6cc621bd3ce..736cca7b9f3 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -349,7 +349,6 @@ В официальных документах эта бита проходит под элегантным названием \"Высокоскоростная система доставки СРП\". \ Выдаваясь только самым верным и эффективным офицерам NanoTrasen, это оружие является одновременно символом статуса \ и инструментом высшего правосудия." - slot_flags = SLOT_BELT w_class = WEIGHT_CLASS_SMALL can_deflect = FALSE @@ -374,22 +373,39 @@ /// Attack verbs when extended (created on Initialize) var/list/attack_verb_on = list("smacked", "struck", "cracked", "beaten") + /obj/item/melee/baseball_bat/homerun/central_command/srt name = "тактическая бита ГСН" desc = "Выдвижная тактическая бита Центрального Командования Nanotrasen. Скорее всего, к этому моменту командование станции уже осознало, что их коленные чашечки не переживут эту встречу." - item_state = "srt_bat_0" item_state_on = "srt_bat_1" icon_state = "srt_bat_0" icon_state_on = "srt_bat_1" -/obj/item/melee/baseball_bat/homerun/central_command/Initialize(mapload) - . = ..() + +/obj/item/melee/baseball_bat/homerun/central_command/update_icon_state() icon_state = on ? icon_state_on : initial(icon_state) + item_state = on ? item_state_on : initial(item_state) + + +/obj/item/melee/baseball_bat/homerun/central_command/proc/toggle(mob/living/user) + on = !on + slot_flags = on ? NONE : SLOT_BELT force = on ? force_on : initial(force) attack_verb = on ? attack_verb_on : initial(attack_verb) w_class = on ? WEIGHT_CLASS_HUGE : WEIGHT_CLASS_SMALL homerun_able = on + homerun_ready = on + update_icon(UPDATE_ICON_STATE) + update_equipped_item() + playsound(loc, extend_sound, 50, TRUE) + add_fingerprint(user) + if(on) + to_chat(user, span_userdanger("Вы активировали [name] - время для правосудия!")) + else + to_chat(user, span_notice("Вы деактивировали [name].")) + + /obj/item/melee/baseball_bat/homerun/central_command/pickup(mob/living/user) if(!(isertmindshielded(user))) @@ -404,31 +420,10 @@ return FALSE return ..() + /obj/item/melee/baseball_bat/homerun/central_command/attack_self(mob/user) - on = !on - icon_state = on ? icon_state_on : initial(icon_state) - if(on) - to_chat(user, "Вы активировали [src.name] - время для правосудия!") - item_state = item_state_on - w_class = WEIGHT_CLASS_HUGE //doesnt fit in backpack when its on for balance - force = force_on - attack_verb = attack_verb_on - homerun_ready = TRUE - else - to_chat(user, "Вы деактивировали [src.name].") - item_state = initial(item_state) - slot_flags = SLOT_BELT - w_class = WEIGHT_CLASS_SMALL - force = initial(force) - attack_verb = initial(attack_verb) - homerun_ready = FALSE - // Update mob hand visuals - if(ishuman(user)) - var/mob/living/carbon/human/H = user - H.update_inv_l_hand() - H.update_inv_r_hand() - playsound(loc, extend_sound, 50, TRUE) - add_fingerprint(user) + toggle(user) + /obj/item/claymore/bone name = "bone sword" @@ -441,3 +436,4 @@ armour_penetration = 15 w_class = WEIGHT_CLASS_BULKY block_chance = 30 + diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index ef71c1cc4bf..31751386403 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -193,8 +193,8 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e if(!(resistance_flags & ON_FIRE) && (resistance_flags & FLAMMABLE) && !(resistance_flags & FIRE_PROOF)) resistance_flags |= ON_FIRE SSfires.processing[src] = src - add_overlay(GLOB.fire_overlay, TRUE) - return 1 + add_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay) + return TRUE ///called when the obj is destroyed by fire /obj/proc/burn() @@ -206,7 +206,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e /obj/proc/extinguish() if(resistance_flags & ON_FIRE) resistance_flags &= ~ON_FIRE - cut_overlay(GLOB.fire_overlay, TRUE) + cut_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay, TRUE) SSfires.processing -= src ///Called when the obj is hit by a tesla bolt. diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 138cd396ed8..47ba86c7220 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -79,11 +79,11 @@ do_climb(usr) -/obj/structure/MouseDrop_T(var/atom/movable/C, mob/user as mob) - if(..()) - return - if(C == user) +/obj/structure/MouseDrop_T(atom/movable/dropping, mob/user, params) + . = ..() + if(!. && dropping == user) do_climb(user) + return TRUE /obj/structure/proc/density_check() for(var/obj/O in orange(0, src)) @@ -212,18 +212,18 @@ /obj/structure/proc/can_touch(mob/living/user) if(!istype(user)) - return 0 + return FALSE if(!Adjacent(user)) - return 0 + return FALSE if(user.restrained() || user.buckled) - to_chat(user, "You need your hands and legs free for this.") - return 0 - if(user.stat || user.IsParalyzed() || user.IsSleeping() || user.lying || user.IsWeakened()) - return 0 + to_chat(user, span_notice("You need your hands and legs free for this.")) + return FALSE + if(user.incapacitated()) + return FALSE if(issilicon(user)) - to_chat(user, "You need hands for this.") - return 0 - return 1 + to_chat(user, span_notice("You need hands for this.")) + return FALSE + return TRUE /obj/structure/examine(mob/user) . = ..() @@ -235,17 +235,19 @@ var/examine_status = examine_status(user) if(examine_status) . += examine_status + if(climbable) + . += "You can Click-Drag someone to [src] to put them on the table after a short delay." /obj/structure/proc/examine_status(mob/user) //An overridable proc, mostly for falsewalls. var/healthpercent = (obj_integrity/max_integrity) * 100 switch(healthpercent) if(50 to 99) - return "It looks slightly damaged." + . += "It looks slightly damaged." if(25 to 50) - return "It appears heavily damaged." + . += "It appears heavily damaged." if(0 to 25) if(!broken) - return "It's falling apart!" + . += "It's falling apart!" /obj/structure/proc/prevents_buckled_mobs_attacking() return FALSE diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index f7060c17f70..607555ec888 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -150,7 +150,7 @@ return ..() -/obj/structure/alien/resin/door/update_icon() +/obj/structure/alien/resin/door/update_icon_state() switch(state) if(RESIN_DOOR_CLOSED) icon_state = "resin_door_closed" @@ -460,18 +460,35 @@ status = BURST icon_state = "egg_hatched" -/obj/structure/alien/egg/New() - new /obj/item/clothing/mask/facehugger(src) - ..() - if(status == BURST) - obj_integrity = integrity_failure - else if(status != GROWN) - spawn(rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME)) - Grow() + +/obj/structure/alien/egg/Initialize(mapload) + . = ..() + update_icon(UPDATE_ICON_STATE) + switch(status) + if(GROWING) + new /obj/item/clothing/mask/facehugger(src) + addtimer(CALLBACK(src, PROC_REF(Grow)), rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME)) + if(GROWN) + new /obj/item/clothing/mask/facehugger(src) + AddComponent(/datum/component/proximity_monitor) + if(BURST) + obj_integrity = integrity_failure + + +/obj/structure/alien/egg/update_icon_state() + switch(status) + if(GROWING) + icon_state = "egg_growing" + if(GROWN) + icon_state = "egg" + if(BURST) + icon_state = "egg_hatched" + /obj/structure/alien/egg/attack_alien(mob/living/carbon/alien/user) return attack_hand(user) + /obj/structure/alien/egg/attack_hand(mob/living/user) if(user.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel)) switch(status) @@ -485,7 +502,7 @@ return if(GROWN) to_chat(user, "You retrieve the child.") - Burst(0) + Burst(kill = FALSE) return else to_chat(user, "It feels slimy.") @@ -495,51 +512,62 @@ /obj/structure/alien/egg/proc/GetFacehugger() return locate(/obj/item/clothing/mask/facehugger) in contents + /obj/structure/alien/egg/proc/Grow() - icon_state = "egg" status = GROWN + update_icon(UPDATE_ICON_STATE) AddComponent(/datum/component/proximity_monitor) + +///Need to carry the kill from Burst() to Hatch(), this section handles the alien opening the egg /obj/structure/alien/egg/proc/Burst(kill = TRUE) //drops and kills the hugger if any is remaining if(status == GROWN || status == GROWING) playsound(get_turf(src), 'sound/creatures/alien/xeno_egg_crack.ogg', 50) - icon_state = "egg_hatched" flick("egg_opening", src) status = BURSTING qdel(GetComponent(/datum/component/proximity_monitor)) - spawn(15) - status = BURST - var/obj/item/clothing/mask/facehugger/child = GetFacehugger() - if(child) - child.loc = get_turf(src) - if(kill && istype(child)) - child.Die() - else - for(var/mob/M in range(1,src)) - if(CanHug(M)) - child.Attach(M) - break + addtimer(CALLBACK(src, PROC_REF(Hatch), kill), 1.5 SECONDS) + + +///We now check HOW the hugger is hatching, kill carried from Burst() and obj_break() +/obj/structure/alien/egg/proc/Hatch(kill) + status = BURST + update_icon(UPDATE_ICON_STATE) + var/obj/item/clothing/mask/facehugger/child = GetFacehugger() + if(!child) + return + child.forceMove(get_turf(src)) + if(kill) + child.Die() + return + for(var/mob/living/victim in range(1, src)) + if(CanHug(victim)) + child.Attach(victim) + break + /obj/structure/alien/egg/obj_break(damage_flag) - if(!(flags & NODECONSTRUCT)) - if(status != BURST) - Burst(kill = TRUE) + if(!(flags & NODECONSTRUCT) && status != BURST) + Burst(kill = TRUE) + /obj/structure/alien/egg/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() if(exposed_temperature > 500) take_damage(5, BURN, 0, 0) + /obj/structure/alien/egg/HasProximity(atom/movable/AM) if(status == GROWN) if(!CanHug(AM)) return - var/mob/living/carbon/C = AM - if(C.stat == CONSCIOUS && C.get_int_organ(/obj/item/organ/internal/body_egg/alien_embryo)) + var/mob/living/carbon/target = AM + if(iscarbon(target) && target.stat == CONSCIOUS && target.get_int_organ(/obj/item/organ/internal/body_egg/alien_embryo)) return - Burst(0) + Burst(kill = FALSE) + #undef BURST #undef BURSTING diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index c71ec0075d7..38f3a956792 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -6,6 +6,7 @@ req_access = list(ACCESS_BAR) max_integrity = 500 integrity_failure = 250 + blocks_emissive = FALSE armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) var/list/barsigns=list() var/list/hiddensigns diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index f6398b2f16e..d3e03623d6a 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -246,7 +246,7 @@ LINEN BINS desc = "A linen bin. It looks rather cosy." icon = 'icons/obj/structures.dmi' icon_state = "linenbin-full" - anchored = 1 + anchored = TRUE resistance_flags = FLAMMABLE max_integrity = 70 var/amount = 20 @@ -263,7 +263,7 @@ LINEN BINS else . += "There are [amount] bed sheets in the bin." -/obj/structure/bedsheetbin/update_icon() +/obj/structure/bedsheetbin/update_icon_state() switch(amount) if(0) icon_state = "linenbin-empty" @@ -276,13 +276,13 @@ LINEN BINS /obj/structure/bedsheetbin/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) if(amount) amount = 0 - update_icon() + update_icon(UPDATE_ICON_STATE) ..() /obj/structure/bedsheetbin/burn() amount = 0 extinguish() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/bedsheet)) @@ -338,7 +338,7 @@ LINEN BINS B.loc = loc to_chat(user, "You telekinetically remove [B] from [src].") - update_icon() + update_icon(UPDATE_ICON_STATE) if(hidden) hidden.loc = loc diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 1d2d70ebdf1..2f0f691800e 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -3,104 +3,103 @@ desc = "Rack that holds coats." icon = 'icons/obj/coatrack.dmi' icon_state = "coatrack0" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/obj/item/clothing/suit/coat - var/list/allowed = list( + var/static/list/allowed = list( /obj/item/clothing/suit/storage/labcoat, /obj/item/clothing/suit/storage/det_suit, /obj/item/clothing/suit/storage/blueshield, /obj/item/clothing/suit/leathercoat, - /obj/item/clothing/suit/browntrenchcoat + /obj/item/clothing/suit/browntrenchcoat, ) + /obj/structure/coatrack/Initialize(mapload) . = ..() icon_state = "coatrack[rand(0, 1)]" + /obj/structure/coatrack/attack_hand(mob/living/user) if(coat) add_fingerprint(user) - user.visible_message("[user] takes [coat] off \the [src].", "You take [coat] off the \the [src].") + user.visible_message("[user] takes [coat] off [src].", "You take [coat] off [src].") coat.forceMove_turf() user.put_in_active_hand(coat, ignore_anim = FALSE) coat = null - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/structure/coatrack/attackby(obj/item/W, mob/living/user, params) - var/can_hang = FALSE - for(var/T in allowed) - if(istype(W,T)) - can_hang = TRUE - break - if(can_hang && !coat) - add_fingerprint(user) - user.visible_message("[user] hangs [W] on \the [src].", "You hang [W] on the \the [src].") - coat = W - user.drop_transfer_item_to_loc(W, src) - update_icon() - else +/obj/structure/coatrack/attackby(obj/item/W, mob/living/user, params) + if(!move_on_rack(W, user)) return ..() -/obj/structure/coatrack/MouseDrop_T(obj/item/W, mob/user) + +/obj/structure/coatrack/MouseDrop_T(obj/item/I, mob/user, params) + . = TRUE + move_on_rack(I, user) + + +/obj/structure/coatrack/Bumped(atom/movable/moving_atom) + . = ..() + move_on_rack(moving_atom) + + +/obj/structure/coatrack/proc/move_on_rack(atom/movable/moving_atom, mob/living/user) + . = FALSE + if(coat) + return . + var/can_hang = FALSE - for(var/T in allowed) - if(istype(W,T)) + for(var/check_type in allowed) + if(istype(moving_atom, check_type)) can_hang = TRUE break - if(can_hang && !coat) - add_fingerprint(user) - user.visible_message("[user] hangs [W] on \the [src].", "You hang [W] on the \the [src].") - coat = W - user.drop_transfer_item_to_loc(W, src) - update_icon() - else - return ..() + if(can_hang) + if(user && !user.drop_transfer_item_to_loc(moving_atom, src)) + return . + . = TRUE + coat = moving_atom + if(user) + add_fingerprint(user) + user.visible_message("[user] hangs [coat] on [src].", "You hang [coat] on [src].") + else + visible_message("[coat] lands on [src].") + coat.forceMove(src) + update_icon(UPDATE_OVERLAYS) -// Hanging a coat on the hanger only after a bump. Force stoping throwing -/obj/structure/coatrack/Bumped(atom/movable/moving_atom) - ..() - if (coat) - return +/obj/structure/coatrack/update_overlays() + . = ..() - for (var/T in allowed) - if (!istype(moving_atom, T)) - continue - visible_message("[moving_atom] lands on \the [src].") - moving_atom.forceMove(src) - coat = moving_atom - update_icon() + if(!coat) return -/obj/structure/coatrack/update_icon() - overlays.Cut() - if(istype(coat, /obj/item/clothing/suit/storage/labcoat)) - overlays += image(icon, icon_state = "coat_lab") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/cmo)) - overlays += image(icon, icon_state = "coat_cmo") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/mad)) - overlays += image(icon, icon_state = "coat_mad") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/genetics)) - overlays += image(icon, icon_state = "coat_gen") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/chemist)) - overlays += image(icon, icon_state = "coat_chem") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/virologist)) - overlays += image(icon, icon_state = "coat_vir") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/science)) - overlays += image(icon, icon_state = "coat_sci") - if(istype(coat, /obj/item/clothing/suit/storage/labcoat/mortician)) - overlays += image(icon, icon_state = "coat_mor") - if(istype(coat, /obj/item/clothing/suit/storage/blueshield)) - overlays += image(icon, icon_state = "coat_blue") - if(istype(coat, /obj/item/clothing/suit/storage/det_suit)) - overlays += image(icon, icon_state = "coat_det") - if(istype(coat, /obj/item/clothing/suit/browntrenchcoat)) - overlays += image(icon, icon_state = "coat_brtrench") - if(istype(coat, /obj/item/clothing/suit/leathercoat)) - overlays += image(icon, icon_state = "coat_leather") + var/static/list/type2overlay = list( + /obj/item/clothing/suit/storage/labcoat/cmo = "coat_cmo", + /obj/item/clothing/suit/storage/labcoat/mad = "coat_mad", + /obj/item/clothing/suit/storage/labcoat/genetics = "coat_gen", + /obj/item/clothing/suit/storage/labcoat/chemist = "coat_chem", + /obj/item/clothing/suit/storage/labcoat/virologist = "coat_vir", + /obj/item/clothing/suit/storage/labcoat/science = "coat_sci", + /obj/item/clothing/suit/storage/labcoat/mortician = "coat_mor", + /obj/item/clothing/suit/storage/labcoat = "coat_lab", + /obj/item/clothing/suit/storage/blueshield = "coat_det", + /obj/item/clothing/suit/browntrenchcoat = "coat_brtrench", + /obj/item/clothing/suit/leathercoat = "coat_leather", + ) + + var/coat_found = FALSE + for(var/path in type2overlay) + if(coat.type == path) // we need to check type explicitly + . += type2overlay[path] + coat_found = TRUE + break + + if(!coat_found) + . += "coat_lab" + /obj/structure/coatrack/crowbar_act(mob/user, obj/item/I) . = TRUE @@ -109,16 +108,19 @@ TOOL_DISMANTLE_SUCCESS_MESSAGE deconstruct(disassembled = TRUE) + /obj/structure/coatrack/wrench_act(mob/user, obj/item/I) . = TRUE default_unfasten_wrench(user, I, time = 10) + /obj/structure/coatrack/deconstruct(disassembled = FALSE) var/mat_drop = 2 if(disassembled) mat_drop = 10 new /obj/item/stack/sheet/wood(drop_location(), mat_drop) if(coat) - coat.loc = get_turf(src) + coat.forceMove_turf() coat = null ..() + diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 91af470b716..1ac4691d5b6 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -1,13 +1,18 @@ +GLOBAL_LIST_EMPTY(closets) + /obj/structure/closet name = "closet" desc = "It's a basic storage unit." icon = 'icons/obj/closet.dmi' icon_state = "closed" - density = 1 + density = TRUE layer = LOW_ITEM_LAYER //Prevents items from dropping on turf visually max_integrity = 200 integrity_failure = 50 armor = list("melee" = 20, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 60) + + /// Special marker for the closet to use default icon_closed/icon_opened states, skipping everything else. + var/no_overlays = FALSE var/icon_closed = "closed" //stays here for compatibility issues var/icon_opened = "open" @@ -19,12 +24,13 @@ var/custom_door_overlay = null //handles overlay of door looking into screen var/custom_open_overlay = null //handles overlay of opened door (its inner side) + var/ignore_density_closed = FALSE var/opened = FALSE var/welded = FALSE var/locked = FALSE var/large = TRUE var/can_be_emaged = FALSE - var/wall_mounted = 0 //never solid (You can always pass over it) + var/wall_mounted = FALSE //never solid (You can always pass over it) var/lastbang var/open_sound = 'sound/machines/closet_open.ogg' var/close_sound = 'sound/machines/closet_close.ogg' @@ -42,6 +48,7 @@ // Please dont override this unless you absolutely have to /obj/structure/closet/Initialize(mapload) . = ..() + GLOB.closets += src if(mapload && !opened) // Youre probably asking, why is this a 0 seconds timer AA? // Well, I will tell you. One day, all /obj/effect/spawner will use Initialize @@ -60,7 +67,8 @@ /obj/structure/closet/proc/take_contents() var/itemcount = 0 for(var/obj/item/I in loc) - if(I.density || I.anchored || I == src) continue + if(I.density || I.anchored || I == src) + continue I.forceMove(src) // Ensure the storage cap is respected if(++itemcount >= storage_capacity) @@ -68,6 +76,7 @@ // Fix for #383 - C4 deleting fridges with corpses /obj/structure/closet/Destroy() + GLOB.closets -= src dump_contents() return ..() @@ -162,12 +171,14 @@ playsound(loc, close_sound, close_sound_volume, TRUE, -3) else playsound(loc, 'sound/machines/click.ogg', close_sound_volume, TRUE, -3) - density = TRUE + density = ignore_density_closed ? FALSE : TRUE return TRUE /obj/structure/closet/proc/toggle(mob/user) + . = TRUE if(!(opened ? close() : open())) - to_chat(user, "It won't budge!") + . = FALSE + to_chat(user, span_notice("It won't budge!")) /obj/structure/closet/proc/bust_open() welded = FALSE //applies to all lockers @@ -247,10 +258,10 @@ user.visible_message("[user] welds [src] [adjective]!", "You weld [src] [adjective]!") welded = !welded update_icon() - return -/obj/structure/closet/MouseDrop_T(atom/movable/O, mob/living/user) - ..() + +/obj/structure/closet/MouseDrop_T(atom/movable/O, mob/living/user, params) + . = ..() if(istype(O, /obj/screen)) //fix for HUD elements making their way into the world -Pete return if(O.loc == user) @@ -271,6 +282,7 @@ if(user != O) user.visible_message("[user] stuffs [O] into [src]!", "You stuff [O] into [src]!") add_fingerprint(user) + return TRUE /obj/structure/closet/attack_ai(mob/user) if(isrobot(user) && Adjacent(user)) //Robots can open/close it, but not the AI @@ -300,8 +312,7 @@ // tk grab then use on self /obj/structure/closet/attack_self_tk(mob/user) add_fingerprint(user) - if(!toggle()) - to_chat(usr, "It won't budge!") + toggle() /obj/structure/closet/verb/verb_toggleopen() set src in oview(1) @@ -317,20 +328,43 @@ else to_chat(usr, "This mob type can't use this verb.") -/obj/structure/closet/update_icon() //Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) - overlays.Cut() - if(!opened) - if(custom_door_overlay) - overlays += "[custom_door_overlay]_door" + +/obj/structure/closet/update_icon(updates = ALL) + if(no_overlays) + return ..(UPDATE_ICON_STATE) + return ..() + + +/obj/structure/closet/update_icon_state() + if(no_overlays) + icon_state = opened ? icon_opened : icon_closed + + +/obj/structure/closet/update_overlays() + . = ..() + if(opened) + if(custom_open_overlay) + . += "[custom_open_overlay]_open" else - overlays += "[icon_state]_door" //No initials because of custom map-made closets. - if(welded) - overlays += "welded" + . += "[icon_state]_open" else - if(custom_open_overlay) - overlays += "[custom_open_overlay]_open" + for(var/olay in apply_contents_overlays()) + . += olay + if(custom_door_overlay) + . += "[custom_door_overlay]_door" else - overlays += "[icon_state]_open" + . += "[icon_state]_door" //No initials because of custom map-made closets. + if(welded) + . += "welded" + + +/** + * Additional overlays for contents inside the closet. Usefull when the door is transparent. + */ +/obj/structure/closet/proc/apply_contents_overlays() + RETURN_TYPE(/list) + . = list() + // Objects that try to exit a locker by stepping were doing so successfully, // and due to an oversight in turf/Enter() were going through walls. That @@ -434,23 +468,26 @@ transparent = transparency update_icon() -/obj/structure/closet/bluespace/update_icon() - overlays.Cut() - icon_state = initial(icon_state) + +/obj/structure/closet/bluespace/update_icon_state() + icon_state = "[initial(icon_state)][transparent ? "_trans" : ""]" + + +/obj/structure/closet/bluespace/update_overlays() + . = list() if(!opened) - if(welded) - overlays += "welded" if(transparent) - icon_state += "_trans" - overlays += "[initial(icon_state)]_door_trans" + . += "[initial(icon_state)]_door_trans" else - overlays += "[initial(icon_state)]_door" + . += "[initial(icon_state)]_door" + if(welded) + . += "welded" else if(transparent) - icon_state += "_trans" - overlays += "[initial(icon_state)]_open_trans" + . += "[initial(icon_state)]_open_trans" else - overlays += "[initial(icon_state)]_open" + . += "[initial(icon_state)]_open" + /obj/structure/closet/bluespace/Crossed(atom/movable/AM, oldloc) if(AM.density) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 448e51d9949..5b71d629ad4 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -3,8 +3,6 @@ desc = "Just a box..." icon = 'icons/obj/cardboard_boxes.dmi' icon_state = "cardboard" - icon_opened = "cardboard_open" - icon_closed = "cardboard" resistance_flags = FLAMMABLE max_integrity = 70 integrity_failure = 0 @@ -13,6 +11,7 @@ open_sound_volume = 35 close_sound_volume = 35 material_drop = /obj/item/stack/sheet/cardboard + no_overlays = TRUE var/decal = "" var/amt = 4 var/move_delay = FALSE @@ -71,7 +70,7 @@ /obj/structure/closet/cardboard/attackby(obj/item/W as obj, mob/user as mob, params) if(src.opened) - if(istype(W, /obj/item/wirecutters)) + if(W.tool_behaviour == TOOL_WIRECUTTER) var/obj/item/wirecutters/WC = W new /obj/item/stack/sheet/cardboard(src.loc, amt) for(var/mob/M in viewers(src)) @@ -105,7 +104,7 @@ update_icon() -/obj/structure/closet/cardboard/update_icon() //Not deriving, because of different logic. +/obj/structure/closet/cardboard/update_icon_state() //Not deriving, because of different logic. if(!opened) if(decal) icon_state = "cardboard_" + decal @@ -116,3 +115,8 @@ icon_state = "cardboard_open_" + decal else icon_state = "cardboard_open" + + +/obj/structure/closet/cardboard/update_overlays() + . = list() + diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm index edb3d1e50d1..eb8d7490fbd 100644 --- a/code/game/objects/structures/crates_lockers/closets/coffin.dm +++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm @@ -11,12 +11,8 @@ close_sound = 'sound/machines/wooden_closet_close.ogg' open_sound_volume = 25 close_sound_volume = 50 + no_overlays = TRUE -/obj/structure/closet/coffin/update_icon() - if(!opened) - icon_state = icon_closed - else - icon_state = icon_opened /obj/structure/closet/coffin/sarcophagus name = "sarcophagus" diff --git a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm index 8370048ecd0..83f34b4eb07 100644 --- a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm @@ -2,6 +2,4 @@ name = "critter crate" desc = "A crate which can sustain life for a while." icon_state = "critter" - icon_opened = "critteropen" - icon_closed = "critter" material_drop = /obj/item/stack/sheet/wood diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 1b9f3d38738..3c6f12d69c7 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -2,234 +2,204 @@ /obj/structure/closet/fireaxecabinet name = "fire axe cabinet" desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if." - icon_state = "fireaxe1000" - icon_closed = "fireaxe1000" - icon_opened = "fireaxe1100" + icon_state = "fireaxe_full_0hits" + icon_closed = "fireaxe_full_0hits" + icon_opened = "fireaxe_full_open" anchored = TRUE density = FALSE - armor = list("melee" = 50, "bullet" = 20, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50) - opened = TRUE - locked = TRUE + no_overlays = TRUE + armor = list(MELEE = 50, BULLET = 20, LASER = 0, ENERGY = 100, BOMB = 10, RAD = 100, FIRE = 90, ACID = 50) var/obj/item/twohanded/fireaxe/fireaxe var/localopened = FALSE //Setting this to keep it from behaviouring like a normal closet and obstructing movement in the map. -Agouri + opened = TRUE var/hitstaken = FALSE + locked = TRUE var/smashed = FALSE + var/operating = FALSE + var/has_axe = null // Use a string over a boolean value to make the sprite names more readable -/obj/structure/closet/fireaxecabinet/Initialize(mapload) - . = ..() - if(!fireaxe) - fireaxe = new(src) - update_icon() +/obj/structure/closet/fireaxecabinet/Destroy() + if(!obj_integrity) + if(fireaxe) + fireaxe.forceMove(loc) + fireaxe = null + else + QDEL_NULL(fireaxe) + return ..() + + +/obj/structure/closet/fireaxecabinet/populate_contents() + fireaxe = new(src) + has_axe = "full" + update_icon(UPDATE_ICON_STATE) // So its initial icon doesn't show it without the fireaxe /obj/structure/closet/fireaxecabinet/examine(mob/user) . = ..() - . += "Use a multitool to lock/unlock it." + if(!smashed) + . += span_notice("Use a multitool to lock/unlock it.") + else + . += span_notice("It is damaged beyond repair.") -/obj/structure/closet/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/living/user as mob) //Marker -Agouri + +/obj/structure/closet/fireaxecabinet/attackby(obj/item/I, mob/living/user) + add_fingerprint(user) if(isrobot(user) || locked) - if(istype(O, /obj/item/multitool)) - to_chat(user, "Resetting circuitry...") - playsound(user, 'sound/machines/lockreset.ogg', 50, 1) - if(do_after(user, 20 * O.toolspeed * gettoolspeedmod(user), target = src)) - add_fingerprint(user) - locked = FALSE - to_chat(user, " You disable the locking modules.") - update_icon() - return - else if(istype(O, /obj/item)) - user.changeNext_move(CLICK_CD_MELEE) - var/obj/item/W = O - if(smashed || localopened) - if(localopened) - add_fingerprint(user) - localopened = FALSE - update_icon_closing() + if(ismultitool(I)) + to_chat(user, span_warning("Resetting circuitry...")) + playsound(user, 'sound/machines/lockreset.ogg', 50, TRUE) + if(!do_after_once(user, 2 SECONDS * I.toolspeed, target = src)) return - else - user.do_attack_animation(src) - playsound(user, 'sound/effects/glasshit.ogg', 100, 1) //We don't want this playing every time - if(W.force < 15) - to_chat(user, "The cabinet's protective glass glances off the hit.") - else - hitstaken++ - if(hitstaken == 4) - playsound(user, 'sound/effects/glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that. - smashed = TRUE - locked = FALSE - localopened = TRUE - add_fingerprint(user) - update_icon() + + locked = FALSE + to_chat(user, span_caution("You disable the locking modules.")) + update_icon(UPDATE_ICON_STATE) + return + + user.changeNext_move(CLICK_CD_MELEE) + if(smashed || localopened) + if(localopened) + operate_panel() + return + + user.do_attack_animation(src) + playsound(user, 'sound/effects/glasshit.ogg', 100, TRUE) //We don't want this playing every time + if(I.force < 15) + to_chat(user, span_notice("The cabinet's protective glass glances off the hit.")) + else + hitstaken++ + if(hitstaken == 4) + playsound(user, 'sound/effects/glassbr3.ogg', 100, TRUE) //Break cabinet, receive goodies. Cabinet's fucked for life after that. + smashed = TRUE + locked = FALSE + localopened = TRUE + update_icon(UPDATE_ICON_STATE) return - if(istype(O, /obj/item/twohanded/fireaxe) && localopened) + + if(istype(I, /obj/item/twohanded/fireaxe) && localopened) if(!fireaxe) - var/obj/item/twohanded/fireaxe/F = O - if(F.wielded) - to_chat(user, "Unwield \the [F] first.") - return - if(!user.drop_item_ground(F)) - to_chat(user, "\The [F] stays stuck to your hands!") + var/obj/item/twohanded/fireaxe/placed_axe = I + if(HAS_TRAIT(placed_axe, TRAIT_WIELDED)) + to_chat(user, span_warning("Unwield [placed_axe] first.")) return - add_fingerprint(user) - fireaxe = F - contents += F - to_chat(user, "You place \the [F] back in the [name].") - update_icon() - else - if(smashed) + if(!user.drop_transfer_item_to_loc(placed_axe, src)) + to_chat(user, span_warning("[placed_axe] stays stuck to your hands!")) return - else - add_fingerprint(user) - localopened = !localopened - if(localopened) - update_icon_opening() - else - update_icon_closing() - else + fireaxe = placed_axe + has_axe = "full" + to_chat(user, span_notice("You place [placed_axe] back in the [name].")) + update_icon(UPDATE_ICON_STATE) + return + if(smashed) return - if(istype(O, /obj/item/multitool)) - if(localopened) - add_fingerprint(user) - localopened = FALSE - update_icon_closing() - return - else - to_chat(user, "Resetting circuitry...") - playsound(user, 'sound/machines/lockenable.ogg', 50, 1) - if(do_after(user, 20 * O.toolspeed * gettoolspeedmod(user), target = src)) - add_fingerprint(user) - locked = TRUE - to_chat(user, " You re-enable the locking modules.") - return - else - add_fingerprint(user) - localopened = !localopened - if(localopened) - update_icon_opening() - else - update_icon_closing() -/obj/structure/closet/fireaxecabinet/attack_hand(mob/user as mob) + operate_panel() + return + + if(smashed) + return + + if(ismultitool(I)) + if(localopened) + operate_panel() + return + + to_chat(user, span_warning("Resetting circuitry...")) + playsound(user, 'sound/machines/lockenable.ogg', 50, TRUE) + if(!do_after_once(user, 2 SECONDS * I.toolspeed, target = src)) + return + + locked = TRUE + to_chat(user, span_caution("You re-enable the locking modules.")) + return + + operate_panel() + + +/obj/structure/closet/fireaxecabinet/attack_hand(mob/user) if(locked) - to_chat(user, "The cabinet won't budge!") + to_chat(user, span_warning("The cabinet won't budge!")) return - if(localopened) - if(fireaxe) - add_fingerprint(user) - fireaxe.forceMove_turf() - user.put_in_hands(fireaxe, ignore_anim = FALSE) - to_chat(user, "You take \the [fireaxe] from the [src].") - fireaxe = null - add_fingerprint(user) - update_icon() - else - if(smashed) - return - else - add_fingerprint(user) - localopened = !localopened - if(localopened) - update_icon_opening() - else - update_icon_closing() + if(localopened && fireaxe) + fireaxe.forceMove_turf() + user.put_in_hands(fireaxe, ignore_anim = FALSE) + to_chat(user, span_notice("You take [fireaxe] from [src].")) + has_axe = "empty" + fireaxe = null - else add_fingerprint(user) - localopened = !localopened //I'm pretty sure we don't need an if(smashed) in here. In case I'm wrong and it fucks up teh cabinet, **MARKER**. -Agouri - if(localopened) - update_icon_opening() - else - update_icon_closing() + update_icon(UPDATE_ICON_STATE) + return + + if(smashed) + return -/obj/structure/closet/fireaxecabinet/attack_tk(mob/user as mob) + operate_panel() + + +/obj/structure/closet/fireaxecabinet/attack_tk(mob/user) if(localopened && fireaxe) fireaxe.forceMove(loc) - to_chat(user, "You telekinetically remove \the [fireaxe].") + to_chat(user, span_notice("You telekinetically remove \the [fireaxe].")) + has_axe = "empty" fireaxe = null - update_icon() + update_icon(UPDATE_ICON_STATE) return attack_hand(user) -/obj/structure/closet/fireaxecabinet/verb/toggle_openness() //nice name, huh? HUH?! -Erro //YEAH -Agouri - set name = "Open/Close" - set category = "Object" - if(isrobot(usr) || locked || smashed) - if(locked) - to_chat(usr, "The cabinet won't budge!") - else if(smashed) - to_chat(usr, "The protective glass is broken!") +/obj/structure/closet/fireaxecabinet/attack_ai(mob/user) + if(smashed) + to_chat(user, span_warning("The security of the cabinet is compromised.")) return - localopened = !localopened - update_icon() + locked = !locked + if(locked) + to_chat(user, span_warning("Cabinet locked.")) + else + to_chat(user, span_notice("Cabinet unlocked.")) -/obj/structure/closet/fireaxecabinet/verb/remove_fire_axe() - set name = "Remove Fire Axe" - set category = "Object" - if(isrobot(usr)) +/obj/structure/closet/fireaxecabinet/proc/operate_panel() + if(operating) return + operating = TRUE + localopened = !localopened + do_animate() + operating = FALSE - if(localopened) - if(fireaxe) - fireaxe.forceMove_turf() - usr.put_in_hands(fireaxe, ignore_anim = FALSE) - to_chat(usr, "You take \the [fireaxe] from the [src].") - fireaxe = null - else - to_chat(usr, "The [src] is empty.") - else - to_chat(usr, "The [src] is closed.") - update_icon() -/obj/structure/closet/fireaxecabinet/attack_ai(mob/user as mob) - if(smashed) - to_chat(user, "The security of the cabinet is compromised.") - return +/obj/structure/closet/fireaxecabinet/proc/do_animate() + if(!localopened) + flick("fireaxe_[has_axe]_closing", src) else - locked = !locked - if(locked) - to_chat(user, "Cabinet locked.") - else - to_chat(user, "Cabinet unlocked.") + flick("fireaxe_[has_axe]_opening", src) + sleep(1 SECONDS) + update_icon(UPDATE_ICON_STATE) -/obj/structure/closet/fireaxecabinet/proc/update_icon_opening() - var/hasaxe = fireaxe != null - icon_state = "fireaxe[hasaxe][localopened][hitstaken][smashed]opening" - spawn(10) - update_icon() -/obj/structure/closet/fireaxecabinet/proc/update_icon_closing() - var/hasaxe = fireaxe != null - icon_state = "fireaxe[hasaxe][localopened][hitstaken][smashed]closing" - spawn(10) - update_icon() +/obj/structure/closet/fireaxecabinet/update_icon_state() + if(localopened && !smashed) + icon_state = "fireaxe_[has_axe]_open" + else + icon_state = "fireaxe_[has_axe]_[hitstaken]hits" -/obj/structure/closet/fireaxecabinet/update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers - var/hasaxe = fireaxe != null - icon_state = "fireaxe[hasaxe][localopened][hitstaken][smashed]" /obj/structure/closet/fireaxecabinet/open() return + /obj/structure/closet/fireaxecabinet/close() return + /obj/structure/closet/fireaxecabinet/welder_act(mob/user, obj/item/I) //A bastion of sanity in a sea of madness return -/obj/structure/closet/fireaxecabinet/Destroy() - if(!obj_integrity) - if(fireaxe) - fireaxe.forceMove(loc) - fireaxe = null - else - QDEL_NULL(fireaxe) - return ..() + //mining "fireaxe" /obj/structure/fishingrodcabinet @@ -240,42 +210,45 @@ anchored = TRUE var/obj/item/twohanded/fishingrod/olreliable //what the fuck? -/obj/structure/fishingrodcabinet/Initialize() + +/obj/structure/fishingrodcabinet/Initialize(mapload) . = ..() - if(!olreliable) - olreliable = new(src) - update_icon() + olreliable = new(src) + update_icon(UPDATE_OVERLAYS) + -/obj/structure/fishingrodcabinet/update_icon() +/obj/structure/fishingrodcabinet/update_overlays() . = ..() - cut_overlays() if(olreliable) - add_overlay("rod") + . += "rod" -/obj/structure/fishingrodcabinet/attackby(var/obj/item/O as obj, var/mob/living/user as mob) - if(istype(O, /obj/item/twohanded/fishingrod)) - var/obj/item/twohanded/fishingrod/R = O - if(R.wielded) - to_chat(user, "Unwield \the [R] first.") - return - if(!user.drop_item_ground(R)) - to_chat(user, "\The [R] stays stuck to your hands!") - return - add_fingerprint(user) - olreliable = R - contents += R - to_chat(user, "You place \the [R] back in the [name].") - update_icon() +/obj/structure/fishingrodcabinet/attackby(obj/item/I, mob/living/user) + if(!istype(I, /obj/item/twohanded/fishingrod)) + return ..() + var/obj/item/twohanded/fishingrod/rod = I + if(HAS_TRAIT(rod, TRAIT_WIELDED)) + to_chat(user, span_warning("Unwield [rod] first.")) + return + if(!user.drop_transfer_item_to_loc(rod, src)) + to_chat(user, span_warning("[rod] stays stuck to your hands!")) + return -/obj/structure/fishingrodcabinet/attack_hand(mob/user as mob) - if(olreliable) - add_fingerprint(user) - olreliable.forceMove_turf() - user.put_in_hands(olreliable, ignore_anim = FALSE) - to_chat(user, "You take \the [olreliable] from the [src].") - olreliable = null + olreliable = rod + to_chat(user, span_notice("You place [rod] back in [src].")) + update_icon(UPDATE_OVERLAYS) + + + +/obj/structure/fishingrodcabinet/attack_hand(mob/user) + if(!olreliable) + return ..() + + add_fingerprint(user) + olreliable.forceMove_turf() + user.put_in_hands(olreliable, ignore_anim = FALSE) + to_chat(user, span_notice("You take [olreliable] from [src].")) + olreliable = null + update_icon(UPDATE_OVERLAYS) - add_fingerprint(user) - update_icon() diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 426764dc1b4..c0fc2f9d336 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -13,23 +13,17 @@ name = "strange closet" desc = "It looks alien!" icon_state = "acloset" - icon_closed = "acloset" - icon_opened = "aclosetopen" /obj/structure/closet/gimmick name = "administrative supply closet" desc = "It's a storage unit for things that have no right being here." icon_state = "syndicate1" - icon_closed = "syndicate1" - icon_opened = "syndicate1open" - anchored = 0 + anchored = FALSE /obj/structure/closet/gimmick/russian name = "russian surplus closet" desc = "It's a storage unit for Russian standard-issue surplus." icon_state = "syndicate1" - icon_closed = "syndicate1" - icon_opened = "syndicate1open" /obj/structure/closet/gimmick/russian/populate_contents() new /obj/item/clothing/head/ushanka(src) @@ -48,8 +42,6 @@ name = "tacticool gear closet" desc = "It's a storage unit for Tacticool gear." icon_state = "syndicate1" - icon_closed = "syndicate1" - icon_opened = "syndicate1open" /obj/structure/closet/gimmick/tacticool/populate_contents() new /obj/item/clothing/glasses/eyepatch(src) @@ -72,9 +64,7 @@ name = "\improper Thunderdome closet" desc = "Everything you need!" icon_state = "syndicate" - icon_closed = "syndicate" - icon_opened = "syndicateopen" - anchored = 1 + anchored = TRUE /obj/structure/closet/thunderdome/tdred name = "red-team Thunderdome closet" @@ -102,8 +92,6 @@ /obj/structure/closet/thunderdome/tdgreen name = "green-team Thunderdome closet" icon_state = "syndicate1" - icon_closed = "syndicate1" - icon_opened = "syndicate1open" /obj/structure/closet/thunderdome/tdgreen/populate_contents() new /obj/item/clothing/suit/armor/tdome/green(src) diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm index fcd763292e6..5665c22e234 100644 --- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm +++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm @@ -2,8 +2,6 @@ /obj/structure/closet/malf/suits desc = "It's a storage unit for operational gear." icon_state = "syndicate" - icon_closed = "syndicate" - icon_opened = "syndicateopen" /obj/structure/closet/malf/suits/populate_contents() new /obj/item/tank/jetpack/void(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm index e1b48bf48c7..cf71573a99b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm @@ -3,7 +3,7 @@ name = "depot supply closet" desc = "" locked = 0 - anchored = 1 + anchored = TRUE req_access = list() max_integrity = 250 icon_state = "secure" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index ab676f2564b..834f1565aa7 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -43,7 +43,7 @@ /obj/structure/closet/secure_closet/freezer/meat/populate_contents() for(var/i in 1 to 4) - new /obj/item/reagent_containers/food/snacks/meat/monkey(src) + new /obj/item/reagent_containers/food/snacks/meat/humanoid/monkey(src) /obj/structure/closet/secure_closet/freezer/meat/open req_access = null diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index 4f662b78086..bed6882aab6 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -2,43 +2,35 @@ name = "gun cabinet" req_access = list(ACCESS_ARMORY) icon = 'icons/obj/guncabinet.dmi' - icon_state = "base" + icon_state = "guncabinet" -/obj/structure/closet/secure_closet/guncabinet/toggle() - ..() - update_icon() -/obj/structure/closet/secure_closet/guncabinet/update_icon() - overlays.Cut() - if(opened) - overlays += icon(icon,"door_open") - else - var/lazors = 0 - var/shottas = 0 - for(var/obj/item/gun/G in contents) - if(istype(G, /obj/item/gun/energy)) - lazors++ - if(istype(G, /obj/item/gun/projectile/)) - shottas++ - if(lazors || shottas) - for(var/i = 0 to 2) - var/image/gun = image(icon(src.icon)) +/obj/structure/closet/secure_closet/guncabinet/Initialize(mapload) + . = ..() + // we need to update our guns inside, after closet is filled + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), UPDATE_OVERLAYS), 1 SECONDS) - if(lazors > 0 && (shottas <= 0 || prob(50))) - lazors-- - gun.icon_state = "laser" - else if(shottas > 0) - shottas-- - gun.icon_state = "projectile" - gun.pixel_x = i*4 - overlays += gun +/obj/structure/closet/secure_closet/guncabinet/apply_contents_overlays() + . = ..() - overlays += icon(src.icon,"door") + var/lazors = 0 + var/shottas = 0 + for(var/thing in contents) + if(istype(thing, /obj/item/gun/energy)) + lazors++ + if(istype(thing, /obj/item/gun/projectile)) + shottas++ + + if(lazors || shottas) + for(var/i = 1 to 2) + var/choise = "" + if(lazors > 0 && (shottas <= 0 || prob(50))) + lazors-- + choise = "laser" + else if(shottas > 0) + shottas-- + choise = "projectile" + if(choise) + . += image(icon, icon_state = choise, pixel_x = i * 4) - if(broken) - overlays += icon(src.icon,"door_broken") - else if(locked) - overlays += icon(src.icon,"door_locked") - else - overlays += icon(src.icon,"door") diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 93fc4230675..782447a1683 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -185,7 +185,7 @@ overlay_locked = "m_locked" overlay_locker = "m_locker" overlay_unlocked = "m_unlocked" - anchored = 1 + anchored = TRUE density = 0 wall_mounted = 1 req_access = list(ACCESS_MEDICAL) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 9822f33c632..491ad76e1e9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -1,47 +1,63 @@ +#define CLOSET_BREAKOUT_TIME (2 MINUTES) + /obj/structure/closet/secure_closet name = "secure locker" desc = "It's an immobile card-locked storage unit." icon = 'icons/obj/closet.dmi' icon_state = "secure" - density = 1 - opened = 0 - locked = 1 - broken = 0 + density = TRUE + opened = FALSE + locked = TRUE + broken = FALSE can_be_emaged = TRUE max_integrity = 250 armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80) damage_deflection = 20 - wall_mounted = 0 //never solid (You can always pass over it) + wall_mounted = FALSE //never solid (You can always pass over it) /obj/structure/closet/secure_closet/can_open() - if(!..()) - return 0 if(locked) - return 0 + return FALSE return ..() /obj/structure/closet/secure_closet/close() - if(..()) - if(broken) - update_icon() - return 1 - else - return 0 + . = ..() + if(. && broken) + update_icon() + /obj/structure/closet/secure_closet/emp_act(severity) - for(var/obj/O in src) - O.emp_act(severity) + for(var/obj/object in src) + object.emp_act(severity) + + if(broken || opened) + return + + if(prob(50 / severity)) + locked = !locked + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS) + + if(prob(20 / severity)) + if(locked) + req_access = list() + req_access += pick(get_all_accesses()) + return + open() + + +/obj/structure/closet/secure_closet/emag_act(mob/user) if(!broken) - if(prob(50/severity)) - locked = !locked - update_icon() - if(prob(20/severity) && !opened) - if(!locked) - open() - else - req_access = list() - req_access += pick(get_all_accesses()) - ..() + add_attack_logs(user, src, "emagged") + broken = TRUE + locked = FALSE + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance), UPDATE_ICON|UPDATE_DESC), 1 SECONDS) + if(user) + to_chat(user, "You break the lock on [src].") + /obj/structure/closet/secure_closet/proc/togglelock(mob/living/user) if(!istype(user) || user.incapacitated()) @@ -71,15 +87,6 @@ if(Adjacent(user)) togglelock(user) -/obj/structure/closet/secure_closet/emag_act(mob/user) - if(!broken) - add_attack_logs(user, src, "emagged") - broken = TRUE - locked = FALSE - overlays += overlay_sparking - addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS) - if(user) - to_chat(user, "You break the lock on \the [src].") /obj/structure/closet/secure_closet/attack_hand(mob/user) add_fingerprint(user) @@ -102,60 +109,75 @@ else to_chat(usr, "This mob type can't use this verb.") -/obj/structure/closet/secure_closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) - ..() - if(!opened) - //overlays += overlay_locker //uncomment if you want to add locker overlay to all secure closets - if(!broken) - if(locked) - overlays += overlay_locked - else - overlays += overlay_unlocked - -/obj/structure/closet/secure_closet/container_resist(var/mob/living/L) - var/breakout_time = 2 //2 minutes by default + +/obj/structure/closet/secure_closet/update_overlays() + . = ..() + if(!opened && !broken) + if(locked) + . += overlay_locked + else + . += overlay_unlocked + + +/obj/structure/closet/secure_closet/update_desc(updates = ALL) + . = ..() + if(broken) + desc = "It appears to be broken." + else + desc = initial(desc) + + +/obj/structure/closet/secure_closet/container_resist(mob/living/user) if(opened) - if(L.loc == src) - L.forceMove(get_turf(src)) // Let's just be safe here + if(user.loc == src) + user.forceMove(get_turf(src)) // Let's just be safe here return //Door's open... wait, why are you in it's contents then? + if(!locked && !welded) return //It's a secure closet, but isn't locked. Easily escapable from, no need to 'resist' //okay, so the closet is either welded or locked... resist!!! - to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") - for(var/mob/O in viewers(src)) - O.show_message("The [src] begins to shake violently!", 1) - - - spawn(0) - if(do_after(usr,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds - if(!src || !L || L.stat != CONSCIOUS || L.loc != src || opened) //closet/user destroyed OR user dead/unconcious OR user no longer in closet OR closet opened - return - - //Perform the same set of checks as above for weld and lock status to determine if there is even still a point in 'resisting'... - if(!locked && !welded) - return - - //Well then break it! - desc = "It appears to be broken." - flick_overlay_view(image(icon=icon, icon_state=overlay_sparking), 1 SECONDS) - sleep(10) - flick_overlay_view(image(icon=icon, icon_state=overlay_sparking), 1 SECONDS) - sleep(10) - broken = 1 - locked = 0 - welded = 0 - update_icon() - to_chat(usr, "You successfully break out!") - for(var/mob/O in viewers(L.loc)) - O.show_message("\the [usr] successfully broke out of \the [src]!", 1) - if(istype(loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace) - var/obj/structure/bigDelivery/BD = loc - BD.attack_hand(usr) - if(isobj(loc)) - var/obj/loc_as_obj = loc - loc_as_obj.container_resist(L) - open() + visible_message( + span_danger("[src] begins to shake violently!"), + span_warning("You lean on the back of [src] and start pushing the door open. (this will take about [CLOSET_BREAKOUT_TIME / 10] minutes.)") + ) + INVOKE_ASYNC(src, PROC_REF(resist_async), user) + + +/obj/structure/closet/secure_closet/proc/resist_async(mob/living/user) + if(!do_after(user, CLOSET_BREAKOUT_TIME, target = src)) + return + + //closet/user destroyed OR user dead/unconcious OR user no longer in closet OR closet opened + if(!src || !user || user.incapacitated() || user.loc != src || opened) + return + + //Perform the same set of checks as above for weld and lock status to determine if there is even still a point in 'resisting'... + if(!locked && !welded) + return + + //Well then break it! + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS) + broken = TRUE + locked = FALSE + welded = FALSE + update_appearance(UPDATE_ICON|UPDATE_DESC) + visible_message( + span_danger("[user] successfully broke out of [src]!"), + span_warning("You successfully break out!"), + ) + + if(istype(loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace) + var/obj/structure/bigDelivery/BD = loc + BD.attack_hand(user) + + if(isobj(loc)) + var/obj/loc_as_obj = loc + loc_as_obj.container_resist(user) + + open() + /obj/structure/closet/secure_closet/screwdriver_act(mob/living/user, obj/item/I) . = ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 5ce2ef9270e..c2f23dad71b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -38,35 +38,6 @@ new /obj/item/clothing/accessory/medal/service(src) new /obj/item/storage/garmentbag/hop(src) -/*/obj/structure/closet/secure_closet/hop2 //dont realy need this because of garment bag - name = "head of personnel's attire" - req_access = list(ACCESS_HOP) - icon_state = "hopsecure1" - icon_closed = "hopsecure" - icon_locked = "hopsecure1" - icon_opened = "hopsecureopen" - icon_broken = "hopsecurebroken" - icon_off = "hopsecureoff" - -/obj/structure/closet/secure_closet/hop2/populate_contents() - new /obj/item/clothing/neck/mantle/head_of_personnel(src) - new /obj/item/clothing/neck/cloak/head_of_personnel(src) - new /obj/item/clothing/under/dress/dress_hr(src) - new /obj/item/clothing/under/lawyer/female(src) - new /obj/item/clothing/under/lawyer/black(src) - new /obj/item/clothing/under/lawyer/red(src) - new /obj/item/clothing/under/lawyer/oldman(src) - new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/shoes/black(src) - new /obj/item/clothing/shoes/leather(src) - new /obj/item/clothing/shoes/white(src) - new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src) - new /obj/item/clothing/under/rank/head_of_personnel_alt(src) - new /obj/item/clothing/under/rank/head_of_personnel_f(src) - new /obj/item/clothing/suit/hop_jacket(src) - new /obj/item/clothing/suit/hop_jacket/female(src) -*/ - /obj/structure/closet/secure_closet/hos name = "head of security's locker" req_access = list(ACCESS_HOS) diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index bb2509c6423..434ee88e4c8 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -4,8 +4,9 @@ icon = 'icons/obj/statue.dmi' icon_state = "human_male" density = 1 - anchored = 1 + anchored = TRUE max_integrity = 0 //destroying the statue kills the mob within + no_overlays = TRUE var/intialTox = 0 //these are here to keep the mob from taking damage from things that logically wouldn't affect a rock var/intialFire = 0 //it's a little sloppy I know but it was this or the GODMODE flag. Lesser of two evils. var/intialBrute = 0 @@ -17,7 +18,7 @@ if(ishuman(L) || iscorgi(L)) if(L.buckled) L.buckled = 0 - L.anchored = 0 + L.anchored = FALSE L.forceMove(src) ADD_TRAIT(L, TRAIT_MUTE, "statue") max_integrity = L.health + 100 //stoning damaged mobs will result in easier to shatter statues @@ -94,7 +95,7 @@ /obj/structure/closet/statue/welder_act() return -/obj/structure/closet/statue/MouseDrop_T() +/obj/structure/closet/statue/MouseDrop_T(atom/dropping, mob/user, params) return /obj/structure/closet/statue/relaymove() @@ -106,7 +107,7 @@ /obj/structure/closet/statue/verb_toggleopen() return -/obj/structure/closet/statue/update_icon() +/obj/structure/closet/statue/update_icon_state() return /obj/structure/closet/statue/proc/shatter(mob/user) diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index ab5070d0871..90d830553c4 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -2,8 +2,6 @@ name = "armoury closet" desc = "Why is this here?" icon_state = "syndicate" - icon_closed = "syndicate" - icon_opened = "syndicateopen" /obj/structure/closet/syndicate/personal diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index dc3a1aacb38..a557800d9b0 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -16,8 +16,6 @@ name = "emergency closet" desc = "It's a storage unit for emergency breathmasks and o2 tanks." icon_state = "emergency" - icon_closed = "emergency" - icon_opened = "emergencyopen" /obj/structure/closet/emcloset/anchored anchored = TRUE @@ -67,8 +65,6 @@ name = "fire-safety closet" desc = "It's a storage unit for fire-fighting supplies." icon_state = "firecloset" - icon_closed = "firecloset" - icon_opened = "fireclosetopen" /obj/structure/closet/firecloset/populate_contents() new /obj/item/extinguisher(src) @@ -93,8 +89,6 @@ name = "tool closet" desc = "It's a storage unit for tools." icon_state = "toolcloset" - icon_closed = "toolcloset" - icon_opened = "toolclosetopen" /obj/structure/closet/toolcloset/populate_contents() if(prob(40)) @@ -149,8 +143,6 @@ name = "\improper EOD closet" desc = "It's a storage unit for explosion-protective suits." icon_state = "bombsuit" - icon_closed = "bombsuit" - icon_opened = "bombsuitopen" /obj/structure/closet/bombcloset/populate_contents() new /obj/item/clothing/suit/bomb_suit( src ) @@ -163,8 +155,6 @@ name = "\improper EOD closet" desc = "It's a storage unit for explosion-protective suits." icon_state = "bombsuitsec" - icon_closed = "bombsuitsec" - icon_opened = "bombsuitsecopen" /obj/structure/closet/bombclosetsecurity/populate_contents() new /obj/item/clothing/suit/bomb_suit/security( src ) @@ -179,9 +169,7 @@ name = "fire-safety closet" desc = "It's a storage unit for fire-fighting supplies." icon_state = "hydrant" - icon_closed = "hydrant" - icon_opened = "hydrant_open" - anchored = 1 + anchored = TRUE density = 0 wall_mounted = 1 @@ -200,7 +188,7 @@ name = "first-aid closet" desc = "It's wall-mounted storage unit for first aid supplies." icon_state = "medical_wall" - anchored = 1 + anchored = TRUE density = 0 wall_mounted = 1 diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 4eb7efc4da1..06c801cad14 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -3,8 +3,6 @@ desc = "A rectangular steel crate." icon = 'icons/obj/crates.dmi' icon_state = "crate" - icon_opened = "crateopen" - icon_closed = "crate" climbable = TRUE open_sound = 'sound/machines/crate_open.ogg' close_sound = 'sound/machines/crate_close.ogg' @@ -15,11 +13,17 @@ // A list of beacon names that the crate will announce the arrival of, when delivered. var/list/announce_beacons = list() -/obj/structure/closet/crate/update_icon() - //..() is not needed here because of different overlay handling logic for crates - overlays.Cut() + +/obj/structure/closet/crate/update_icon_state() + icon_state = "[initial(icon_state)][opened ? "open" : ""]" + + +/obj/structure/closet/crate/update_overlays() + // . = ..() is not needed here because of different overlay handling logic for crates + . = list() if(manifest) - overlays += "manifest" + . += "manifest" + /obj/structure/closet/crate/can_open() return TRUE @@ -53,8 +57,9 @@ O.forceMove(loc) for(var/mob/M in src) //Mobs M.forceMove(loc) - icon_state = icon_opened + opened = TRUE + update_icon() if(climbable) structure_shaken() @@ -80,8 +85,8 @@ O.forceMove(src) itemcount++ - icon_state = icon_closed opened = FALSE + update_icon() return TRUE @@ -162,12 +167,11 @@ desc = "A secure crate." name = "Secure crate" icon_state = "securecrate" - icon_opened = "securecrateopen" - icon_closed = "securecrate" - var/redlight = "securecrater" - var/greenlight = "securecrateg" - var/sparks = "securecratesparks" - var/emag = "securecrateemag" + overlay_locked = "securecrater" + overlay_unlocked = "securecrateg" + overlay_sparking = "securecratesparks" + /// Overlay for crate with broken lock + var/overlay_broken = "securecrateemag" max_integrity = 500 armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80) damage_deflection = 25 @@ -176,17 +180,16 @@ locked = TRUE can_be_emaged = TRUE -/obj/structure/closet/crate/secure/update_icon() - ..() - overlays.Cut() - if(manifest) - overlays += "manifest" + +/obj/structure/closet/crate/secure/update_overlays() + . = ..() if(locked) - overlays += redlight - else if(broken) - overlays += emag + . += overlay_locked + else if(broken && overlay_broken) + . += overlay_broken else - overlays += greenlight + . += overlay_unlocked + /obj/structure/closet/crate/secure/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1) if(prob(tamperproof) && damage_amount >= DAMAGE_PRECISION) @@ -204,9 +207,16 @@ explosion(get_turf(src), 0, 1, 5, 5, cause = src) qdel(src) + /obj/structure/closet/crate/secure/can_open() return !locked + +/obj/structure/closet/crate/secure/AltClick(mob/living/user) + if(iscarbon(user) && !user.incapacitated() && Adjacent(user)) + togglelock(user) + + /obj/structure/closet/crate/secure/proc/togglelock(mob/user) if(opened) to_chat(user, "Close the crate first.") @@ -222,6 +232,7 @@ else to_chat(user, "Access Denied") + /obj/structure/closet/crate/secure/verb/verb_togglelock() set src in oview(1) // One square distance set category = null @@ -236,6 +247,7 @@ else to_chat(usr, "This mob type can't use this verb.") + /obj/structure/closet/crate/secure/attack_hand(mob/user) if(manifest) add_fingerprint(user) @@ -253,99 +265,74 @@ else toggle(user, by_hand = TRUE) + /obj/structure/closet/crate/secure/closed_item_click(mob/user) togglelock(user) + /obj/structure/closet/crate/secure/emag_act(mob/user) if(locked) add_attack_logs(user, src, "emagged") - overlays += sparks - spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface* - playsound(src.loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - src.locked = 0 - src.broken = 1 - update_icon() + locked = FALSE + broken = TRUE + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS) if(user) - to_chat(user, "You unlock \the [src].") + to_chat(user, span_notice("You unlock [src].")) + /obj/structure/closet/crate/secure/emp_act(severity) - for(var/obj/O in src) - O.emp_act(severity) - if(!broken && !opened && prob(50/severity)) - if(!locked) - src.locked = 1 + for(var/obj/object in src) + object.emp_act(severity) + + if(broken || opened) + return + + if(prob(50 / severity)) + locked = !locked + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS) + + if(prob(20 / severity)) + if(locked) + req_access = list() + req_access += pick(get_all_accesses()) else - overlays += sparks - spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface* - playsound(src.loc, 'sound/effects/sparks4.ogg', 75, TRUE) - src.locked = 0 - update_icon() - if(!opened && prob(20/severity)) - if(!locked) open() - else - src.req_access = list() - src.req_access += pick(get_all_accesses()) - ..() + /obj/structure/closet/crate/plastic name = "plastic crate" desc = "A rectangular plastic crate." icon_state = "plasticcrate" - icon_opened = "plasticcrateopen" - icon_closed = "plasticcrate" /obj/structure/closet/crate/internals desc = "A internals crate." name = "internals crate" icon_state = "o2crate" - icon_opened = "o2crateopen" - icon_closed = "o2crate" /obj/structure/closet/crate/trashcart desc = "A heavy, metal trashcart with wheels." name = "trash Cart" icon_state = "trashcart" - icon_opened = "trashcartopen" - icon_closed = "trashcart" pull_push_speed_modifier = 1 /obj/structure/closet/crate/trashcart/gibs desc = "A heavy, metal trashcart with wheels. You better don't ask." name = "trash cart with gibs" icon_state = "trashcartgib" - icon_opened = "trashcartgibopen" - icon_closed = "trashcartgib" - -/*these aren't needed anymore -/obj/structure/closet/crate/hat - desc = "A crate filled with Valuable Collector's Hats!." - name = "Hat Crate" - icon_state = "crate" - icon_opened = "crateopen" - icon_closed = "crate" - -/obj/structure/closet/crate/contraband - name = "Poster crate" - desc = "A random assortment of posters manufactured by providers NOT listed under Nanotrasen's whitelist." - icon_state = "crate" - icon_opened = "crateopen" - icon_closed = "crate" -*/ /obj/structure/closet/crate/medical desc = "A medical crate." name = "medical crate" icon_state = "medicalcrate" - icon_opened = "medicalcrateopen" - icon_closed = "medicalcrate" /obj/structure/closet/crate/rcd desc = "A crate for the storage of the RCD." name = "\improper RCD crate" icon_state = "crate" - icon_opened = "crateopen" - icon_closed = "crate" /obj/structure/closet/crate/rcd/populate_contents() new /obj/item/rcd_ammo(src) @@ -357,8 +344,6 @@ desc = "A freezer." name = "Freezer" icon_state = "freezer" - icon_opened = "freezeropen" - icon_closed = "freezer" var/target_temp = T0C - 40 var/cooling_power = 40 @@ -384,8 +369,6 @@ desc = "A large can, looks like a bin to me." name = "garbage can" icon_state = "largebin" - icon_opened = "largebinopen" - icon_closed = "largebin" anchored = TRUE /obj/structure/closet/crate/can/wrench_act(mob/user, obj/item/I) @@ -398,8 +381,6 @@ desc = "A crate with a radiation sign on it." name = "radioactive gear crate" icon_state = "radiation" - icon_opened = "radiationopen" - icon_closed = "radiation" /obj/structure/closet/crate/radiation/populate_contents() new /obj/item/clothing/suit/radiation(src) @@ -415,58 +396,46 @@ desc = "A secure weapons crate." name = "weapons crate" icon_state = "weaponcrate" - icon_opened = "weaponcrateopen" - icon_closed = "weaponcrate" /obj/structure/closet/crate/secure/plasma desc = "A secure plasma crate." name = "plasma crate" icon_state = "plasmacrate" - icon_opened = "plasmacrateopen" - icon_closed = "plasmacrate" /obj/structure/closet/crate/secure/gear desc = "A secure gear crate." name = "gear crate" icon_state = "secgearcrate" - icon_opened = "secgearcrateopen" - icon_closed = "secgearcrate" /obj/structure/closet/crate/secure/hydrosec desc = "A crate with a lock on it, painted in the scheme of the station's botanists." name = "secure hydroponics crate" icon_state = "hydrosecurecrate" - icon_opened = "hydrosecurecrateopen" - icon_closed = "hydrosecurecrate" /obj/structure/closet/crate/secure/bin desc = "A secure bin." name = "secure bin" icon_state = "largebins" - icon_opened = "largebinsopen" - icon_closed = "largebins" - redlight = "largebinr" - greenlight = "largebing" - sparks = "largebinsparks" - emag = "largebinemag" + overlay_locked = "largebinr" + overlay_unlocked = "largebing" + overlay_sparking = "largebinsparks" + overlay_broken = "largebinemag" /obj/structure/closet/crate/large name = "large crate" desc = "A hefty metal crate." icon_state = "largemetal" - icon_opened = "largemetalopen" - icon_closed = "largemetal" integrity_failure = 0 //Makes the crate break when integrity reaches 0, instead of opening and becoming an invisible sprite. /obj/structure/closet/crate/large/close() . = ..() if(.)//we can hold up to one large item - var/found = 0 + var/found = FALSE for(var/obj/structure/S in src.loc) if(S == src) continue if(!S.anchored) - found = 1 + found = TRUE S.forceMove(src) break if(!found) @@ -479,10 +448,9 @@ name = "large crate" desc = "A hefty metal crate with an electronic locking system." icon_state = "largemetal" - icon_opened = "largemetalopen" - icon_closed = "largemetal" - redlight = "largemetalr" - greenlight = "largemetalg" + overlay_locked = "largemetalr" + overlay_unlocked = "largemetalg" + overlay_broken = "" /obj/structure/closet/crate/secure/large/close() . = ..() @@ -505,15 +473,11 @@ /obj/structure/closet/crate/secure/large/reinforced desc = "A hefty, reinforced metal crate with an electronic locking system." icon_state = "largermetal" - icon_opened = "largermetalopen" - icon_closed = "largermetal" /obj/structure/closet/crate/hydroponics name = "hydroponics crate" desc = "All you need to destroy those pesky weeds and pests." icon_state = "hydrocrate" - icon_opened = "hydrocrateopen" - icon_closed = "hydrocrate" /obj/structure/closet/crate/hydroponics/prespawned //This exists so the prespawned hydro crates spawn with their contents. @@ -539,36 +503,26 @@ name = "science crate" desc = "A science crate." icon_state = "scicrate" - icon_opened = "scicrateopen" - icon_closed = "scicrate" /obj/structure/closet/crate/secure/scisec name = "secure science crate" desc = "A crate with a lock on it, painted in the scheme of the station's scientists." icon_state = "scisecurecrate" - icon_opened = "scisecurecrateopen" - icon_closed = "scisecurecrate" /obj/structure/closet/crate/engineering name = "engineering crate" desc = "An engineering crate." icon_state = "engicrate" - icon_opened = "engicrateopen" - icon_closed = "engicrate" /obj/structure/closet/crate/secure/engineering name = "secure engineering crate" desc = "A crate with a lock on it, painted in the scheme of the station's engineers." icon_state = "engisecurecrate" - icon_opened = "engisecurecrateopen" - icon_closed = "engisecurecrate" /obj/structure/closet/crate/engineering/electrical name = "electrical engineering crate" desc = "An electrical engineering crate." icon_state = "electricalcrate" - icon_opened = "electricalcrateopen" - icon_closed = "electricalcrate" /obj/structure/closet/crate/tape/populate_contents() if(prob(10)) @@ -578,8 +532,6 @@ name = "secure biohazard crate" desc = "An protected biohazard crate." icon_state = "biohazard" - icon_opened = "biohazardopen" - icon_closed = "biohazard" //crates of gear in the free golem ship /obj/structure/closet/crate/golemgear/populate_contents() @@ -594,19 +546,14 @@ //syndie crates by Furukai /obj/structure/closet/crate/syndicate - desc = "Definitely a property of an evil corporation!" icon_state = "syndiecrate" - icon_opened = "syndiecrateopen" - icon_closed = "syndiecrate" material_drop = /obj/item/stack/sheet/mineral/plastitanium /obj/structure/closet/crate/secure/syndicate name = "Secure suspicious crate" desc = "Definitely a property of an evil corporation! And it has a hardened lock! And a microphone?" icon_state = "syndiesecurecrate" - icon_opened = "syndiesecurecrateopen" - icon_closed = "syndiesecurecrate" material_drop = /obj/item/stack/sheet/mineral/plastitanium can_be_emaged = FALSE diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index 6c4bf01ee6a..cf15893c72c 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -2,8 +2,6 @@ name = "critter crate" desc = "A crate designed for safe transport of animals. Only openable from the outside." icon_state = "critter" - icon_opened = "critteropen" - icon_closed = "critter" open_sound = 'sound/machines/wooden_closet_open.ogg' close_sound = 'sound/machines/wooden_closet_close.ogg' var/already_opened = 0 diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 9d670424371..bc7103b462a 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -6,17 +6,14 @@ density = 1 var/obj/item/paper/manifest/manifest -/obj/structure/largecrate/Initialize(mapload) - . = ..() - update_icon() -/obj/structure/largecrate/update_icon() - ..() - overlays.Cut() +/obj/structure/largecrate/update_overlays() + . = ..() if(manifest) - overlays += "manifest" + . += "manifest" -/obj/structure/largecrate/attack_hand(mob/user as mob) + +/obj/structure/largecrate/attack_hand(mob/user) if(manifest) add_fingerprint(user) to_chat(user, "You tear the manifest off of the crate.") @@ -25,18 +22,18 @@ if(ishuman(user)) user.put_in_hands(manifest, ignore_anim = FALSE) manifest = null - update_icon() - return - else - to_chat(user, "You need a crowbar to pry this open!") + update_icon(UPDATE_OVERLAYS) return -/obj/structure/largecrate/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) + to_chat(user, "You need a crowbar to pry this open!") + + +/obj/structure/largecrate/attackby(obj/item/W, mob/user, params) + if(W.tool_behaviour == TOOL_CROWBAR) if(manifest) manifest.forceMove(loc) manifest = null - update_icon() + update_icon(UPDATE_OVERLAYS) new /obj/item/stack/sheet/wood(src) var/turf/T = get_turf(src) for(var/O in contents) @@ -56,8 +53,8 @@ /obj/structure/largecrate/lisa icon_state = "lisacrate" -/obj/structure/largecrate/lisa/attackby(obj/item/W as obj, mob/user as mob) //ugly but oh well - if(istype(W, /obj/item/crowbar)) +/obj/structure/largecrate/lisa/attackby(obj/item/W, mob/user) //ugly but oh well + if(W.tool_behaviour == TOOL_CROWBAR) new /mob/living/simple_animal/pet/dog/corgi/Lisa(loc) return ..() @@ -65,8 +62,8 @@ name = "cow crate" icon_state = "lisacrate" -/obj/structure/largecrate/cow/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) +/obj/structure/largecrate/cow/attackby(obj/item/W, mob/user, params) + if(W.tool_behaviour == TOOL_CROWBAR) new /mob/living/simple_animal/cow(loc) return ..() @@ -74,8 +71,8 @@ name = "goat crate" icon_state = "lisacrate" -/obj/structure/largecrate/goat/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) +/obj/structure/largecrate/goat/attackby(obj/item/W, mob/user, params) + if(W.tool_behaviour == TOOL_CROWBAR) new /mob/living/simple_animal/hostile/retaliate/goat(loc) return ..() @@ -83,8 +80,8 @@ name = "chicken crate" icon_state = "lisacrate" -/obj/structure/largecrate/chick/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) +/obj/structure/largecrate/chick/attackby(obj/item/W, mob/user, params) + if(W.tool_behaviour == TOOL_CROWBAR) var/num = rand(4, 6) for(var/i = 0, i < num, i++) new /mob/living/simple_animal/chick(loc) @@ -94,7 +91,7 @@ name = "cat crate" icon_state = "lisacrate" -/obj/structure/largecrate/cat/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/crowbar)) +/obj/structure/largecrate/cat/attackby(obj/item/W, mob/user, params) + if(W.tool_behaviour == TOOL_CROWBAR) new /mob/living/simple_animal/pet/cat(loc) return ..() diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm index 4a2f9a7ed88..c127b629719 100644 --- a/code/game/objects/structures/crates_lockers/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/walllocker.dm @@ -6,15 +6,13 @@ name = "wall locker" icon = 'icons/obj/walllocker.dmi' icon_state = "wall-locker" - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE + ignore_density_closed = TRUE + no_overlays = TRUE icon_closed = "wall-locker" icon_opened = "wall-lockeropen" -/obj/structure/closet/walllocker/close() - ..() - density = 0 //It's a locker in a wall, you aren't going to be walking into it. - /obj/structure/closet/walllocker/emerglocker name = "emergency locker" desc = "A wall mounted locker with emergency supplies" @@ -22,6 +20,7 @@ icon_closed = "emerg" icon_opened = "emergopen" + /obj/structure/closet/walllocker/emerglocker/populate_contents() new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/tank/internals/emergency_oxygen(src) diff --git a/code/game/objects/structures/delta_statue.dm b/code/game/objects/structures/delta_statue.dm index 6c329b44a3b..c02c97501a3 100644 --- a/code/game/objects/structures/delta_statue.dm +++ b/code/game/objects/structures/delta_statue.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/delta_statue.dmi' icon_state = "" density = 1 - anchored = 1 + anchored = TRUE max_integrity = 500 /obj/structure/delta_statue/nw diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm index 9f0e20f4d52..dd65b68fde1 100644 --- a/code/game/objects/structures/depot.dm +++ b/code/game/objects/structures/depot.dm @@ -4,7 +4,7 @@ desc = "" icon = 'icons/obj/device.dmi' icon_state = "powersink1" - anchored = 1 + anchored = TRUE max_integrity = 50 var/area/syndicate_depot/core/depotarea var/has_overloaded = FALSE @@ -74,7 +74,7 @@ icon_state = "energy_ball" pixel_x = -32 pixel_y = -32 - anchored = 1 + anchored = TRUE var/cycles = 0 var/beepsound = 'sound/items/timer.ogg' var/deliberate = FALSE @@ -88,7 +88,7 @@ if(istype(depotarea)) if(!depotarea.used_self_destruct) depotarea.used_self_destruct = TRUE // Silences all further alerts from this point onwards. - depotarea.updateicon() + depotarea.update_state() depotarea.shields_down() else log_debug("[src] at [x],[y],[z] failed depotarea istype check during Initialize()! Either it was spawned outside the depot area (bad idea), or a bug is happening.") @@ -105,7 +105,7 @@ depotarea = get_area(src) if(istype(depotarea)) depotarea.destroyed = TRUE - depotarea.updateicon() + depotarea.update_state() for(var/obj/structure/closet/L in range(30, T)) for(var/obj/O in L) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 198344cf275..4813c2a3e13 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -22,8 +22,7 @@ /obj/structure/door_assembly/Initialize(mapload) . = ..() - update_icon() - update_name() + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) /obj/structure/door_assembly/Destroy() QDEL_NULL(electronics) @@ -142,8 +141,7 @@ to_chat(user, "You cannot add [S] to [src]!") else return ..() - update_name() - update_icon() + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) /obj/structure/door_assembly/crowbar_act(mob/user, obj/item/I) if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) @@ -164,8 +162,7 @@ ae = electronics electronics = null ae.forceMove(loc) - update_icon() - update_name() + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) /obj/structure/door_assembly/screwdriver_act(mob/user, obj/item/I) if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) @@ -199,7 +196,7 @@ electronics.forceMove(door) electronics = null qdel(src) - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/door_assembly/wirecutter_act(mob/user, obj/item/I) if(state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) @@ -213,7 +210,7 @@ to_chat(user, "You cut the wires from the airlock assembly.") new/obj/item/stack/cable_coil(get_turf(user), 1) state = AIRLOCK_ASSEMBLY_NEEDS_WIRES - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/door_assembly/wrench_act(mob/user, obj/item/I) if(state != AIRLOCK_ASSEMBLY_NEEDS_WIRES) @@ -266,17 +263,19 @@ return to_chat(user, "You disassemble the airlock assembly.") deconstruct(TRUE) - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/structure/door_assembly/update_icon() - overlays.Cut() + +/obj/structure/door_assembly/update_overlays() + . = ..() if(!glass) - overlays += get_airlock_overlay("fill_construction", icon) + . += get_airlock_overlay("fill_construction", icon) else if(glass) - overlays += get_airlock_overlay("glass_construction", overlays_file) - overlays += get_airlock_overlay("panel_c[state+1]", overlays_file) + . += get_airlock_overlay("glass_construction", overlays_file) + . += get_airlock_overlay("panel_c[state+1]", overlays_file) -/obj/structure/door_assembly/update_name() + +/obj/structure/door_assembly/update_name(updates = ALL) . = ..() name = "" switch(state) @@ -289,6 +288,7 @@ name = "near finished " name += "[heat_proof_finished ? "heat-proofed " : ""][glass ? "window " : ""][base_name] assembly" + /obj/structure/door_assembly/proc/transfer_assembly_vars(obj/structure/door_assembly/source, obj/structure/door_assembly/target, previous = FALSE) target.glass = source.glass target.heat_proof_finished = source.heat_proof_finished @@ -300,8 +300,7 @@ if(electronics) target.electronics = source.electronics source.electronics.forceMove(target) - target.update_icon() - target.update_name() + target.update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) qdel(source) /obj/structure/door_assembly/deconstruct(disassembled = TRUE) diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index 04899537e55..b8f20a99dc9 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -173,7 +173,7 @@ . = ..() icon = SSticker.cultdat?.airlock_runed_icon_file overlays_file = SSticker.cultdat?.airlock_runed_overlays_file - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/door_assembly/door_assembly_cult_fake name = "cult airlock assembly" @@ -187,7 +187,7 @@ . = ..() icon = SSticker.cultdat?.airlock_runed_icon_file overlays_file = SSticker.cultdat?.airlock_runed_overlays_file - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/door_assembly/door_assembly_cult/unruned icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi' @@ -199,7 +199,7 @@ . = ..() icon = SSticker.cultdat?.airlock_unruned_icon_file overlays_file = SSticker.cultdat?.airlock_unruned_overlays_file - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/door_assembly/door_assembly_clock name = "clock airlock assembly" diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index 5fcd58bb734..8f0b992ad4d 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "dresser" density = 1 - anchored = 1 + anchored = TRUE /obj/structure/dresser/attack_hand(mob/user as mob) if(!Adjacent(user))//no tele-grooming diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 491ce2f5523..cd532bf025c 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -4,13 +4,15 @@ icon_state = "echair0" item_chair = null anchored = TRUE - var/obj/item/assembly/shock_kit/part = null - var/last_time = 1.0 - var/delay_time = 50 + var/obj/item/assembly/shock_kit/part + var/last_time = 0 + var/delay_time = 5 SECONDS + var/shocking = FALSE + /obj/structure/chair/e_chair/Initialize(mapload, obj/item/assembly/shock_kit/sk) . = ..() - overlays += image('icons/obj/chairs.dmi', src, "echair_over", MOB_LAYER + 1, dir) + update_icon(UPDATE_OVERLAYS) if(sk) part = sk @@ -25,64 +27,96 @@ part.part1 = part1 part.part2 = part2 -/obj/structure/chair/e_chair/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/wrench)) - var/obj/structure/chair/C = new /obj/structure/chair(loc) - transfer_fingerprints_to(C) - playsound(loc, W.usesound, 50, 1) - C.dir = dir - part.loc = loc + +/obj/structure/chair/e_chair/Destroy() + if(part) + QDEL_NULL(part) + return ..() + + +/obj/structure/chair/e_chair/rotate() + if(..()) + update_icon(UPDATE_OVERLAYS) + + +/obj/structure/chair/e_chair/update_icon_state() + icon_state = "echair[shocking]" + + +/obj/structure/chair/e_chair/update_overlays() + . = ..() + . += image(icon, icon_state = "echair_over", layer = ABOVE_MOB_LAYER, dir = src.dir) + if(shocking) + . += image(icon, icon_state = "echair_shock", layer = ABOVE_MOB_LAYER) + + +/obj/structure/chair/e_chair/attackby(obj/item/W, mob/user, params) + if(W.tool_behaviour == TOOL_WRENCH) + var/obj/structure/chair/chair = new (loc) + transfer_fingerprints_to(chair) + playsound(loc, W.usesound, 50, TRUE) + chair.dir = dir + part.forceMove(loc) part.master = null part = null qdel(src) return return ..() + +/obj/structure/chair/e_chair/examine(mob/user) + . = ..() + . += span_warning("You can Alt-Shift-Click [src] to activate it.") + + +/obj/structure/chair/e_chair/AltShiftClick(mob/living/user) + if(!Adjacent(user)) + return ..() + shock(user) + + /obj/structure/chair/e_chair/verb/activate_e_chair() set name = "Activate Electric Chair" set category = "Object" set src in oview(1) - if(usr.stat || !usr.canmove || usr.restrained()) - return - if(last_time + delay_time > world.time) - to_chat(usr, "\The [src] is not ready yet!") - return - to_chat(usr, "You activate \the [src].") - shock() -/obj/structure/chair/e_chair/rotate() - ..() - overlays.Cut() - overlays += image('icons/obj/chairs.dmi', src, "echair_over", MOB_LAYER + 1, dir) //there's probably a better way of handling this, but eh. -Pete + shock(usr) -/obj/structure/chair/e_chair/proc/shock() - if(last_time + delay_time > world.time) - return - last_time = world.time - icon_state = "echair1" - spawn(delay_time) - icon_state = "echair0" +/obj/structure/chair/e_chair/proc/shock(mob/living/user) + if(isliving(user) && (user.incapacitated() || user.restrained())) + return // special power handling - var/area/A = get_area(src) - if(!isarea(A)) + var/area/our_area = get_area(src) + if(!our_area || !our_area.powered(EQUIP)) return - if(!A.powered(EQUIP)) + + if(last_time + delay_time > world.time) + if(user) + to_chat(user, span_warning("[src] is not ready yet!")) return - A.use_power(5000, EQUIP) - var/light = A.power_light - A.updateicon() + last_time = world.time + our_area.use_power(5000, EQUIP) + our_area.update_icon(UPDATE_ICON_STATE) + + if(user) + to_chat(user, span_notice("You activate [src].")) - flick("echair_shock", src) + shocking = TRUE + update_icon() do_sparks(12, 1, src) - visible_message("The electric chair went off!", "You hear a deep sharp shock!") + visible_message(span_danger("The electric chair went off!")) + addtimer(CALLBACK(src, PROC_REF(reset_echair)), delay_time, TIMER_DELETE_ME) + if(has_buckled_mobs()) - for(var/m in buckled_mobs) - var/mob/living/buckled_mob = m + for(var/mob/living/buckled_mob as anything in buckled_mobs) buckled_mob.electrocute_act(110, src, 1) - to_chat(buckled_mob, "You feel a deep shock course through your body!") - spawn(1) - buckled_mob.electrocute_act(110, src, 1) - A.power_light = light - A.updateicon() + to_chat(buckled_mob, span_userdanger("You feel a deep shock course through your body!")) + addtimer(CALLBACK(buckled_mob, TYPE_PROC_REF(/mob/living, electrocute_act), 110, src, 1), 0.1 SECONDS, TIMER_DELETE_ME) + + +/obj/structure/chair/e_chair/proc/reset_echair() + shocking = FALSE + update_icon() + diff --git a/code/game/objects/structures/engicart.dm b/code/game/objects/structures/engicart.dm index 9de1ce1c470..fba6f2a5f5b 100644 --- a/code/game/objects/structures/engicart.dm +++ b/code/game/objects/structures/engicart.dm @@ -3,7 +3,7 @@ desc = "A cart for storing engineering items." icon = 'icons/obj/engicart.dmi' icon_state = "cart" - anchored = 0 + anchored = FALSE density = 1 pull_push_speed_modifier = 1 var/obj/item/stack/sheet/glass/myglass = null @@ -38,7 +38,7 @@ add_fingerprint(user) put_in_cart(I, user) myglass=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/stack/sheet/metal)) @@ -46,7 +46,7 @@ add_fingerprint(user) put_in_cart(I, user) mymetal=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/stack/sheet/plasteel)) @@ -54,7 +54,7 @@ add_fingerprint(user) put_in_cart(I, user) myplasteel=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/flashlight)) @@ -62,7 +62,7 @@ add_fingerprint(user) put_in_cart(I, user) myflashlight=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/storage/toolbox/mechanical)) @@ -70,7 +70,7 @@ add_fingerprint(user) put_in_cart(I, user) mybluetoolbox=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/storage/toolbox/electrical)) @@ -78,7 +78,7 @@ add_fingerprint(user) put_in_cart(I, user) myyellowtoolbox=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) else if(istype(I, /obj/item/storage/toolbox)) @@ -86,10 +86,10 @@ add_fingerprint(user) put_in_cart(I, user) myredtoolbox=I - update_icon() + update_icon(UPDATE_OVERLAYS) else to_chat(user, fail_msg) - else if(istype(I, /obj/item/wrench)) + else if(I.tool_behaviour == TOOL_WRENCH) add_fingerprint(user) if(!anchored && !isinspace()) playsound(src.loc, I.usesound, 50, 1) @@ -97,14 +97,14 @@ "[user] tightens \the [src]'s casters.", \ " You have tightened \the [src]'s casters.", \ "You hear ratchet.") - anchored = 1 + anchored = TRUE else if(anchored) playsound(src.loc, I.usesound, 50, 1) user.visible_message( \ "[user] loosens \the [src]'s casters.", \ " You have loosened \the [src]'s casters.", \ "You hear ratchet.") - anchored = 0 + anchored = FALSE else to_chat(usr, "You cannot interface your modules [src]!") @@ -178,22 +178,24 @@ to_chat(user, "You take [myyellowtoolbox] from [src].") myyellowtoolbox = null - update_icon() + update_icon(UPDATE_OVERLAYS) updateUsrDialog() -/obj/structure/engineeringcart/update_icon() - overlays.Cut() + +/obj/structure/engineeringcart/update_overlays() + . = ..() if(myglass) - overlays += "cart_glass" + . += "cart_glass" if(mymetal) - overlays += "cart_metal" + . += "cart_metal" if(myplasteel) - overlays += "cart_plasteel" + . += "cart_plasteel" if(myflashlight) - overlays += "cart_flashlight" + . += "cart_flashlight" if(mybluetoolbox) - overlays += "cart_bluetoolbox" + . += "cart_bluetoolbox" if(myredtoolbox) - overlays += "cart_redtoolbox" + . += "cart_redtoolbox" if(myyellowtoolbox) - overlays += "cart_yellowtoolbox" + . += "cart_yellowtoolbox" + diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 20c58523d17..550aea991cd 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -8,7 +8,7 @@ desc = "A small wall mounted cabinet designed to hold a fire extinguisher." icon = 'icons/obj/closet.dmi' icon_state = "extinguisher_closed" - anchored = 1 + anchored = TRUE density = 0 max_integrity = 200 integrity_failure = 50 @@ -29,6 +29,7 @@ has_extinguisher = new/obj/item/extinguisher/mini(src) else has_extinguisher = new/obj/item/extinguisher(src) + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/examine(mob/user) . = ..() @@ -44,7 +45,7 @@ return playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/Destroy() QDEL_NULL(has_extinguisher) @@ -58,7 +59,7 @@ /obj/structure/extinguisher_cabinet/handle_atom_del(atom/A) if(A == has_extinguisher) has_extinguisher = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user, params) if(isrobot(user) || isalien(user)) @@ -69,18 +70,18 @@ return add_fingerprint(user) has_extinguisher = O - update_icon() + update_icon(UPDATE_ICON_STATE) to_chat(user, "You place [O] in [src].") return TRUE else playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) else if(user.a_intent != INTENT_HARM) add_fingerprint(user) playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) else return ..() @@ -123,7 +124,7 @@ else playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/attack_tk(mob/user) if(has_extinguisher) @@ -136,7 +137,7 @@ else playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/obj_break(damage_flag) if(!broken && !(flags & NODECONSTRUCT)) @@ -145,7 +146,7 @@ if(has_extinguisher) has_extinguisher.forceMove(loc) has_extinguisher = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/extinguisher_cabinet/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT)) @@ -155,7 +156,7 @@ has_extinguisher = null qdel(src) -/obj/structure/extinguisher_cabinet/update_icon() +/obj/structure/extinguisher_cabinet/update_icon_state() if(!opened) icon_state = "extinguisher_closed" return diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 2847d2f54af..4eb87c6d37b 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -45,13 +45,14 @@ var/healthpercent = (obj_integrity/max_integrity) * 100 switch(healthpercent) if(100) - return "It looks fully intact." + . = "It looks fully intact." if(70 to 99) - return "It looks slightly damaged." + . = "It looks slightly damaged." if(40 to 70) - return "It looks moderately damaged." + . = "It looks moderately damaged." if(0 to 40) - return "It looks heavily damaged." + . = "It looks heavily damaged." + . += "
Using a lit welding tool on this item will allow you to slice through it, eventually removing the outer layer." /obj/structure/falsewall/ratvar_act() new /obj/structure/falsewall/brass(loc) @@ -73,31 +74,31 @@ . = ..() toggle(user) + /obj/structure/falsewall/proc/toggle(mob/user) if(opening) return - - opening = 1 + opening = TRUE if(density) add_fingerprint(user) do_the_flick() - sleep(4) - density = 0 - set_opacity(0) - update_icon(0) + sleep(0.4 SECONDS) + density = FALSE + set_opacity(FALSE) else var/srcturf = get_turf(src) for(var/mob/living/obstacle in srcturf) //Stop people from using this as a shield - opening = 0 + opening = FALSE return add_fingerprint(user) do_the_flick() - density = 1 - sleep(4) - set_opacity(1) - update_icon() - air_update_turf(1) - opening = 0 + density = TRUE + sleep(0.4 SECONDS) + set_opacity(TRUE) + air_update_turf(TRUE) + opening = FALSE + update_icon(UPDATE_ICON_STATE) + /obj/structure/falsewall/proc/do_the_flick() if(density) @@ -107,7 +108,8 @@ else flick("fwall_closing", src) -/obj/structure/falsewall/update_icon() + +/obj/structure/falsewall/update_icon_state() if(density) icon_state = initial(icon_state) smooth = SMOOTH_TRUE @@ -115,6 +117,7 @@ else icon_state = "fwall_open" + /obj/structure/falsewall/proc/ChangeToWall(delete = TRUE) var/turf/T = get_turf(src) T.ChangeTurf(walltype) @@ -132,7 +135,7 @@ if(T.density) to_chat(user, "[src] is blocked!") return - if(istype(W, /obj/item/screwdriver)) + if(W.tool_behaviour == TOOL_SCREWDRIVER) if(!istype(T, /turf/simulated/floor)) to_chat(user, "[src] bolts must be tightened on the floor!") return diff --git a/code/game/objects/structures/firepit.dm b/code/game/objects/structures/firepit.dm index 075c83e7033..f3f48243f0a 100644 --- a/code/game/objects/structures/firepit.dm +++ b/code/game/objects/structures/firepit.dm @@ -2,7 +2,7 @@ name = "firepit" desc = "Warm and toasty." icon = 'icons/obj/fireplace.dmi' - icon_state = "firepit-active" + icon_state = "firepit" density = FALSE anchored = TRUE max_integrity = 50 @@ -10,9 +10,6 @@ var/lighter // Who lit the thing var/fire_stack_strength = 5 -/obj/structure/firepit/Initialize(mapload) - . = ..() - update_icon() /obj/structure/firepit/attack_hand(mob/living/user) if(active) @@ -31,18 +28,26 @@ else W.fire_act() -/obj/structure/firepit/update_icon() - . = ..() + +/obj/structure/firepit/proc/adjust_light() if(active) set_light(4, ,"#ffb366") - icon_state = "firepit-active" else set_light(0) + + +/obj/structure/firepit/update_icon_state() + if(active) + icon_state = "firepit-active" + else icon_state = "firepit" + /obj/structure/firepit/proc/toggleFirepit() active = !active - update_icon() + update_icon(UPDATE_ICON_STATE) + adjust_light() + /obj/structure/firepit/extinguish() . = ..() diff --git a/code/game/objects/structures/fireplace.dm b/code/game/objects/structures/fireplace.dm index 10a5bf70a74..948020d288b 100644 --- a/code/game/objects/structures/fireplace.dm +++ b/code/game/objects/structures/fireplace.dm @@ -69,10 +69,15 @@ else . = ..() -/obj/structure/fireplace/update_icon() + +/obj/structure/fireplace/update_desc(updates = ALL) + . = ..() + desc = lit ? "A large stone brick fireplace, warm and cozy." : initial(desc) + + +/obj/structure/fireplace/update_overlays() . = ..() - overlays.Cut() if(!lit) return @@ -81,17 +86,18 @@ switch(burn_time_remaining()) if(0 to 500) firepower = "fireplace_fire0" - if(500 to 1000) + if(501 to 1000) firepower = "fireplace_fire1" - if(1000 to 1500) + if(1001 to 1500) firepower = "fireplace_fire2" - if(1500 to 2000) + if(1501 to 2000) firepower = "fireplace_fire3" - if(2000 to MAXIMUM_BURN_TIMER) + if(2001 to MAXIMUM_BURN_TIMER) firepower = "fireplace_fire4" - overlays += icon('icons/obj/fireplace.dmi', "[firepower]") - overlays += icon('icons/obj/fireplace.dmi', "fireplace_glow") + . += "[firepower]" + . += "fireplace_glow" + /obj/structure/fireplace/proc/adjust_light() if(!lit) @@ -101,15 +107,16 @@ switch(burn_time_remaining()) if(0 to 500) set_light(1, ,"#ffb366") - if(500 to 1000) + if(501 to 1000) set_light(2, ,"#ffb366") - if(1000 to 1500) + if(1001 to 1500) set_light(3, ,"#ffb366") - if(1500 to 2000) + if(1501 to 2000) set_light(4, ,"#ffb366") - if(2000 to MAXIMUM_BURN_TIMER) + if(2001 to MAXIMUM_BURN_TIMER) set_light(6, ,"#ffb366") + /obj/structure/fireplace/process(seconds_per_tick) if(!lit) return @@ -120,9 +127,10 @@ playsound(src, 'sound/effects/comfyfire.ogg',40,FALSE, FALSE, TRUE) var/turf/T = get_turf(src) T.hotspot_expose(700, 2.5 * seconds_per_tick) - update_icon() + update_icon(UPDATE_OVERLAYS) adjust_light() + /obj/structure/fireplace/extinguish() . = ..() if(lit) @@ -131,6 +139,7 @@ put_out() adjust_fuel_timer(fuel) + /obj/structure/fireplace/proc/adjust_fuel_timer(amount) if(lit) flame_expiry_timer += amount @@ -139,25 +148,27 @@ else fuel_added = clamp(fuel_added + amount, 0, MAXIMUM_BURN_TIMER) + /obj/structure/fireplace/proc/burn_time_remaining() if(lit) return max(0, flame_expiry_timer - world.time) else return max(0, fuel_added) + /obj/structure/fireplace/proc/ignite() lit = TRUE - desc = "A large stone brick fireplace, warm and cozy." flame_expiry_timer = world.time + fuel_added fuel_added = 0 - update_icon() + update_appearance(UPDATE_OVERLAYS|UPDATE_DESC) adjust_light() + /obj/structure/fireplace/proc/put_out() lit = FALSE - update_icon() + update_appearance(UPDATE_OVERLAYS|UPDATE_DESC) adjust_light() - desc = initial(desc) + #undef LOG_BURN_TIMER #undef PAPER_BURN_TIMER diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index e259b83049f..44f3844f07c 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -5,7 +5,7 @@ //trees /obj/structure/flora/tree name = "tree" - anchored = 1 + anchored = TRUE density = 1 pixel_x = -16 layer = 9 @@ -65,7 +65,7 @@ /obj/structure/flora/grass name = "grass" icon = 'icons/obj/flora/snowflora.dmi' - anchored = 1 + anchored = TRUE max_integrity = 15 /obj/structure/flora/grass/brown @@ -96,7 +96,7 @@ name = "bush" icon = 'icons/obj/flora/snowflora.dmi' icon_state = "snowbush1" - anchored = 1 + anchored = TRUE max_integrity = 15 /obj/structure/flora/bush/Initialize(mapload) @@ -109,7 +109,7 @@ name = "bush" icon = 'icons/obj/flora/ausflora.dmi' icon_state = "firstbush_1" - anchored = 1 + anchored = TRUE max_integrity = 15 /obj/structure/flora/ausbushes/Initialize(mapload) @@ -227,7 +227,7 @@ icon = 'icons/obj/flora/plants.dmi' icon_state = "plant-1" flags = NO_PIXEL_RANDOM_DROP - anchored = 0 + anchored = FALSE layer = ABOVE_MOB_LAYER w_class = WEIGHT_CLASS_HUGE force = 10 @@ -321,7 +321,7 @@ icon_state = "rock1" icon = 'icons/obj/flora/rocks.dmi' resistance_flags = FIRE_PROOF - anchored = 1 + anchored = TRUE /obj/structure/flora/rock/Initialize(mapload) . = ..() @@ -370,7 +370,7 @@ name = "corn stalk" icon = 'icons/obj/flora/plants.dmi' icon_state = "cornstalk1" - anchored = 0 + anchored = FALSE layer = 5 /obj/structure/flora/corn_stalk/alt_1 @@ -398,7 +398,7 @@ icon = 'icons/obj/flora/plants.dmi' icon_state = "bush1" density = 1 - anchored = 1 + anchored = TRUE layer = 3.2 var/indestructable = 0 var/stump = 0 diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index 4fbe7ef4542..66f7b6e1792 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -11,7 +11,7 @@ var/deconstructible = TRUE /obj/structure/fluff/attackby(obj/item/I, mob/living/user, params) - if(istype(I, /obj/item/wrench) && deconstructible) + if(I.tool_behaviour == TOOL_WRENCH && deconstructible) user.visible_message("[user] starts disassembling [src]...", "You start disassembling [src]...") playsound(loc, I.usesound, 50, 1) if(do_after(src, 50 * I.toolspeed * gettoolspeedmod(user), target = src)) diff --git a/code/game/objects/structures/foodcart.dm b/code/game/objects/structures/foodcart.dm index 24d051e6b89..0abbccffb8d 100644 --- a/code/game/objects/structures/foodcart.dm +++ b/code/game/objects/structures/foodcart.dm @@ -3,7 +3,7 @@ desc = "A cart for transporting food and drinks." icon = 'icons/obj/foodcart.dmi' icon_state = "cart" - anchored = 0 + anchored = FALSE density = 1 pull_push_speed_modifier = 1 //Food slots @@ -39,7 +39,6 @@ add_fingerprint(user) put_in_cart(I, user) food_slots[s]=I - update_icon() success = 1 break if(!success) @@ -51,12 +50,11 @@ add_fingerprint(user) put_in_cart(I, user) drink_slots[s]=I - update_icon() success = 1 break if(!success) to_chat(user, fail_msg) - else if(istype(I, /obj/item/wrench)) + else if(I.tool_behaviour == TOOL_WRENCH) add_fingerprint(user) if(!anchored && !isinspace()) playsound(src.loc, I.usesound, 50, 1) @@ -64,14 +62,14 @@ "[user] tightens \the [src]'s casters.", \ " You have tightened \the [src]'s casters.", \ "You hear ratchet.") - anchored = 1 + anchored = TRUE else if(anchored) playsound(src.loc, I.usesound, 50, 1) user.visible_message( \ "[user] loosens \the [src]'s casters.", \ " You have loosened \the [src]'s casters.", \ "You hear ratchet.") - anchored = 0 + anchored = FALSE else to_chat(usr, "You cannot interface your modules [src]!") @@ -198,7 +196,6 @@ to_chat(user, "You take [drink] from [src].") drink_slots[6] = null - update_icon() //Not really needed without overlays, but keeping just in case updateUsrDialog() /obj/structure/foodcart/deconstruct(disassembled = TRUE) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index b4505000959..157d28d38cd 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -1,7 +1,7 @@ /obj/structure/girder name = "girder" icon_state = "girder" - anchored = 1 + anchored = TRUE density = 1 layer = BELOW_OBJ_LAYER var/state = GIRDER_NORMAL @@ -439,7 +439,7 @@ /obj/structure/girder/displaced name = "displaced girder" icon_state = "displaced" - anchored = 0 + anchored = FALSE state = GIRDER_DISPLACED girderpasschance = 25 max_integrity = 120 diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 2a7cbe1ffc7..a8c693301b8 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -43,9 +43,6 @@ //height=42 icon='icons/obj/fence-ns.dmi' -/obj/structure/grille/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration) - . = ..() - update_icon() /obj/structure/grille/examine(mob/user) . = ..() diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index c1fbb87d958..9106bf66cb6 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -2,15 +2,18 @@ #define GUILLOTINE_DECAP_MIN_SHARP 7 // Minimum amount of sharpness for decapitation. Any less and it will just deal brute damage #define GUILLOTINE_ANIMATION_LENGTH 9 // How many deciseconds the animation is #define GUILLOTINE_BLADE_RAISED 1 -#define GUILLOTINE_BLADE_MOVING 2 -#define GUILLOTINE_BLADE_DROPPED 3 -#define GUILLOTINE_BLADE_SHARPENING 4 +#define GUILLOTINE_BLADE_RAISING 2 +#define GUILLOTINE_BLADE_DROPPING 3 +#define GUILLOTINE_BLADE_DROPPED 4 +#define GUILLOTINE_BLADE_SHARPENING 5 + #define GUILLOTINE_HEAD_OFFSET 16 // How much we need to move the player to center their head #define GUILLOTINE_LAYER_DIFF 1.2 // How much to increase/decrease a head when it's buckled/unbuckled #define GUILLOTINE_ACTIVATE_DELAY 30 // Delay for executing someone #define GUILLOTINE_WRENCH_DELAY 10 -#define GUILLOTINE_ACTION_INUSE 5 -#define GUILLOTINE_ACTION_WRENCH 6 + +#define GUILLOTINE_ACTION_INUSE 1 +#define GUILLOTINE_ACTION_WRENCH 2 /obj/structure/guillotine name = "guillotine" @@ -26,7 +29,7 @@ var/blade_sharpness = GUILLOTINE_BLADE_MAX_SHARP // How sharp the blade is var/kill_count = 0 var/force_clap = FALSE //You WILL clap if I want you to - var/current_action = 0 // What's currently happening to the guillotine + var/current_action = NONE// What's currently happening to the guillotine /obj/structure/guillotine/Initialize(mapload) LAZYINITLIST(buckled_mobs) @@ -51,6 +54,31 @@ msg += "
" msg += "Someone appears to be strapped in. You can help them out, or you can harm them by activating the guillotine." . += "[msg]" + + +/obj/structure/guillotine/update_icon_state() + switch(blade_status) + if(GUILLOTINE_BLADE_DROPPED) + icon_state = "guillotine" + if(GUILLOTINE_BLADE_RAISED) + icon_state = "guillotine_raised" + if(GUILLOTINE_BLADE_RAISING) + icon_state = "guillotine_raise" + if(GUILLOTINE_BLADE_DROPPING) + icon_state = "guillotine_drop" + + +/obj/structure/guillotine/update_overlays() + . = ..() + switch(kill_count) + if(1) + . += mutable_appearance(icon, "guillotine_bloody_overlay") + if(2) + . += mutable_appearance(icon, "guillotine_bloodier_overlay") + if(3 to INFINITY) + . += mutable_appearance(icon, "guillotine_bloodiest_overlay") + + /obj/structure/guillotine/attack_hand(mob/user) // Currently being used by something @@ -58,12 +86,12 @@ return switch(blade_status) - if(GUILLOTINE_BLADE_MOVING) + if(GUILLOTINE_BLADE_RAISING, GUILLOTINE_BLADE_DROPPING) return if(GUILLOTINE_BLADE_DROPPED) add_fingerprint(user) - blade_status = GUILLOTINE_BLADE_MOVING - icon_state = "guillotine_raise" + blade_status = GUILLOTINE_BLADE_RAISING + update_icon(UPDATE_ICON_STATE) addtimer(CALLBACK(src, PROC_REF(raise_blade)), GUILLOTINE_ANIMATION_LENGTH) return if(GUILLOTINE_BLADE_RAISED) @@ -75,26 +103,28 @@ if(do_after(user, GUILLOTINE_ACTIVATE_DELAY, target = src) && blade_status == GUILLOTINE_BLADE_RAISED) add_fingerprint(user) - current_action = 0 - blade_status = GUILLOTINE_BLADE_MOVING - icon_state = "guillotine_drop" + current_action = NONE + blade_status = GUILLOTINE_BLADE_DROPPING + update_icon(UPDATE_ICON_STATE) playsound(src, 'sound/items/unsheath.ogg', 100, 1) addtimer(CALLBACK(src, PROC_REF(drop_blade), user), GUILLOTINE_ANIMATION_LENGTH - 2) // Minus two so we play the sound and decap faster else - current_action = 0 + current_action = NONE else add_fingerprint(user) unbuckle_all_mobs() else add_fingerprint(user) - blade_status = GUILLOTINE_BLADE_MOVING - icon_state = "guillotine_drop" + blade_status = GUILLOTINE_BLADE_DROPPING + update_icon(UPDATE_ICON_STATE) playsound(src, 'sound/items/unsheath.ogg', 100, 1) addtimer(CALLBACK(src, PROC_REF(drop_blade)), GUILLOTINE_ANIMATION_LENGTH) + /obj/structure/guillotine/proc/raise_blade() blade_status = GUILLOTINE_BLADE_RAISED - icon_state = "guillotine_raised" + update_icon(UPDATE_ICON_STATE) + /obj/structure/guillotine/proc/drop_blade(mob/user) if(has_buckled_mobs() && blade_sharpness) @@ -102,14 +132,14 @@ if(!H) blade_status = GUILLOTINE_BLADE_DROPPED - icon_state = "guillotine" + update_icon(UPDATE_ICON_STATE) return var/obj/item/organ/external/head/head = H.get_organ(BODY_ZONE_HEAD) if(QDELETED(head)) blade_status = GUILLOTINE_BLADE_DROPPED - icon_state = "guillotine" + update_icon(UPDATE_ICON_STATE) return playsound(src, 'sound/weapons/bladeslice.ogg', 100, 1) @@ -118,18 +148,8 @@ add_attack_logs(user, H, "beheaded with [src]") H.regenerate_icons() unbuckle_all_mobs() - kill_count += 1 - - var/blood_overlay = "bloody" - - if(kill_count == 2) - blood_overlay = "bloodier" - else if(kill_count > 2) - blood_overlay = "bloodiest" - - blood_overlay = "guillotine_" + blood_overlay + "_overlay" - overlays.Cut() - overlays += mutable_appearance(icon, blood_overlay) + kill_count++ + update_icon(UPDATE_OVERLAYS) if(force_clap) // The crowd is pleased @@ -147,7 +167,7 @@ blade_sharpness -= 1 blade_status = GUILLOTINE_BLADE_DROPPED - icon_state = "guillotine" + update_icon(UPDATE_ICON_STATE) /obj/structure/guillotine/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/whetstone)) @@ -185,13 +205,13 @@ return current_action = GUILLOTINE_ACTION_WRENCH if(!I.use_tool(src, user, GUILLOTINE_WRENCH_DELAY, volume = I.tool_volume)) - current_action = 0 + current_action = NONE return if(has_buckled_mobs()) to_chat(user, "Can't unfasten, someone's strapped in!") return - current_action = 0 + current_action = NONE to_chat(user, "You [anchored ? "un" : ""]secure [src].") anchored = !anchored playsound(src, 'sound/items/deconstruct.ogg', 50, 1) @@ -244,7 +264,8 @@ #undef GUILLOTINE_DECAP_MIN_SHARP #undef GUILLOTINE_ANIMATION_LENGTH #undef GUILLOTINE_BLADE_RAISED -#undef GUILLOTINE_BLADE_MOVING +#undef GUILLOTINE_BLADE_RAISING +#undef GUILLOTINE_BLADE_DROPPING #undef GUILLOTINE_BLADE_DROPPED #undef GUILLOTINE_BLADE_SHARPENING #undef GUILLOTINE_HEAD_OFFSET diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index a13532d1f0f..5dc13e56008 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -15,9 +15,9 @@ /obj/structure/inflatable name = "inflatable wall" desc = "An inflated membrane. Do not puncture." - density = 1 - anchored = 1 - opacity = 0 + density = TRUE + anchored = TRUE + opacity = FALSE max_integrity = 50 icon = 'icons/obj/inflatable.dmi' icon_state = "wall" @@ -39,20 +39,30 @@ else return FALSE + /obj/structure/inflatable/CanAtmosPass(turf/T) return !density -/obj/structure/inflatable/attack_hand(mob/user as mob) + +/obj/structure/inflatable/attackby(obj/item/I, mob/living/user, params) + if(I.sharp || is_type_in_typecache(I, GLOB.pointed_types)) + user.do_attack_animation(src, used_item = I) + deconstruct(FALSE) + return FALSE + return ..() + +/obj/structure/inflatable/attack_hand(mob/user) add_fingerprint(user) /obj/structure/inflatable/AltClick(mob/living/user) - if(!istype(user) || user.incapacitated() || user.restrained()) + if(!istype(user) || user.incapacitated()) to_chat(user, "You can't do that right now!") return if(!Adjacent(user)) return deconstruct(TRUE) + /obj/structure/inflatable/deconstruct(disassembled = TRUE) playsound(loc, 'sound/machines/hiss.ogg', 75, 1) if(!disassembled) @@ -62,17 +72,20 @@ qdel(src) else visible_message("[src] slowly deflates.") - spawn(50) - var/obj/item/inflatable/R = new intact(loc) - transfer_fingerprints_to(R) - qdel(src) + addtimer(CALLBACK(src, PROC_REF(deflate)), 5 SECONDS) + + +/obj/structure/inflatable/proc/deflate() + var/obj/item/inflatable/R = new intact(loc) + transfer_fingerprints_to(R) + qdel(src) /obj/structure/inflatable/verb/hand_deflate() set name = "Deflate" set category = "Object" set src in oview(1) - if(usr.stat || usr.restrained()) + if(usr.incapacitated()) return deconstruct(TRUE) @@ -93,27 +106,24 @@ /obj/structure/inflatable/door //Based on mineral door code name = "inflatable door" - density = 1 - anchored = 1 - opacity = 0 - icon = 'icons/obj/inflatable.dmi' icon_state = "door_closed" + opacity = TRUE torn = /obj/item/inflatable/door/torn intact = /obj/item/inflatable/door - var/state = 0 //closed, 1 == open - var/isSwitchingStates = 0 + var/state_closed = TRUE + var/is_operating = FALSE -/obj/structure/inflatable/door/attack_ai(mob/user as mob) //those aren't machinery, they're just big fucking slabs of a mineral +/obj/structure/inflatable/door/attack_ai(mob/user) //those aren't machinery, they're just big fucking slabs of a mineral if(isAI(user)) //so the AI can't open it return else if(isrobot(user)) //but cyborgs can if(get_dist(user,src) <= 1) //not remotely though - return TryToSwitchState(user) + return try_to_operate(user) -/obj/structure/inflatable/door/attack_hand(mob/user as mob) - return TryToSwitchState(user) +/obj/structure/inflatable/door/attack_hand(mob/user) + return try_to_operate(user) /obj/structure/inflatable/door/CanPass(atom/movable/mover, turf/target, height=0) if(istype(mover) && mover.checkpass(PASS_OTHER_THINGS)) @@ -125,59 +135,45 @@ /obj/structure/inflatable/door/CanAtmosPass(turf/T) return !density -/obj/structure/inflatable/door/proc/TryToSwitchState(atom/user) - if(isSwitchingStates) + +/obj/structure/inflatable/door/proc/try_to_operate(atom/user) + if(is_operating) return if(ismob(user)) var/mob/M = user - if(world.time - user.last_bumped <= 60) - return //NOTE do we really need that? if(M.client) if(iscarbon(M)) var/mob/living/carbon/C = M if(!C.handcuffed) - add_fingerprint(user) - SwitchState() + operate() else - add_fingerprint(user) - SwitchState() - else if(istype(user, /obj/mecha)) - SwitchState() - -/obj/structure/inflatable/door/proc/SwitchState() - if(state) - Close() - else - Open() - air_update_turf(1) - -/obj/structure/inflatable/door/proc/Open() - isSwitchingStates = 1 - //playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 100, 1) - flick("door_opening",src) - sleep(10) - density = 0 - opacity = 0 - state = 1 - update_icon() - isSwitchingStates = 0 - -/obj/structure/inflatable/door/proc/Close() - isSwitchingStates = 1 - //playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 100, 1) - flick("door_closing",src) - sleep(10) - density = 1 - opacity = 0 - state = 0 - update_icon() - isSwitchingStates = 0 - -/obj/structure/inflatable/door/update_icon() - if(state) - icon_state = "door_open" + operate() + else if(ismecha(user)) + operate() + + +/obj/structure/inflatable/door/proc/operate() + is_operating = TRUE + if(state_closed) + flick("door_opening", src) else - icon_state = "door_closed" + flick("door_closing", src) + + sleep(1 SECONDS) + if(QDELETED(src)) + return + + state_closed = !state_closed + density = state_closed + set_opacity(state_closed) + update_icon(UPDATE_ICON_STATE) + air_update_turf(TRUE) + is_operating = FALSE + + +/obj/structure/inflatable/door/update_icon_state() + icon_state = "door_[state_closed ? "closed" : "open"]" + /obj/item/inflatable/torn name = "torn inflatable wall" @@ -206,6 +202,7 @@ item_state = "syringe_kit" max_combined_w_class = 21 w_class = WEIGHT_CLASS_NORMAL + can_hold = list(/obj/item/inflatable) /obj/item/storage/briefcase/inflatable/populate_contents() new /obj/item/inflatable/door(src) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index dc2567bc6a7..ced660b34c8 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -5,8 +5,8 @@ desc = "This is the alpha and omega of sanitation." icon = 'icons/obj/janitor.dmi' icon_state = "cart" - anchored = 0 - density = 1 + anchored = FALSE + density = TRUE container_type = OPENCONTAINER pull_push_speed_modifier = 1 //copypaste sorry @@ -32,14 +32,16 @@ QDEL_NULL(myreplacer) return ..() + /obj/structure/janitorialcart/proc/put_in_cart(obj/item/I, mob/user) user.drop_transfer_item_to_loc(I, src) updateUsrDialog() to_chat(user, "You put [I] into [src].") - return + update_icon(UPDATE_OVERLAYS) + /obj/structure/janitorialcart/on_reagent_change() - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/janitorialcart/attackby(obj/item/I, mob/user, params) var/fail_msg = "There is already one of those in [src]." @@ -66,9 +68,8 @@ else if(istype(I, /obj/item/reagent_containers/spray/cleaner)) if(!myspray) add_fingerprint(user) - put_in_cart(I, user) myspray=I - update_icon() + put_in_cart(I, user) else to_chat(user, fail_msg) else if(istype(I, /obj/item/lightreplacer)) @@ -81,19 +82,18 @@ else if(istype(I, /obj/item/caution)) if(signs < max_signs) add_fingerprint(user) - put_in_cart(I, user) signs++ - update_icon() + put_in_cart(I, user) else to_chat(user, "[src] can't hold any more signs.") - else if(istype(I, /obj/item/crowbar)) + else if(I.tool_behaviour == TOOL_CROWBAR) user.visible_message("[user] begins to empty the contents of [src].") if(do_after(user, 30 * I.toolspeed * gettoolspeedmod(user), target = src)) add_fingerprint(user) to_chat(usr, "You empty the contents of [src]'s bucket onto the floor.") reagents.reaction(src.loc) src.reagents.clear_reagents() - else if(istype(I, /obj/item/wrench)) + else if(I.tool_behaviour == TOOL_WRENCH) add_fingerprint(user) if(!anchored && !isinspace()) playsound(src.loc, I.usesound, 50, 1) @@ -101,14 +101,14 @@ "[user] tightens \the [src]'s casters.", \ " You have tightened \the [src]'s casters.", \ "You hear ratchet.") - anchored = 1 + anchored = TRUE else if(anchored) playsound(src.loc, I.usesound, 50, 1) user.visible_message( \ "[user] loosens \the [src]'s casters.", \ " You have loosened \the [src]'s casters.", \ "You hear ratchet.") - anchored = 0 + anchored = FALSE else if(mybag) add_fingerprint(user) mybag.attackby(I, user, params) @@ -176,26 +176,26 @@ WARNING("Signs ([signs]) didn't match contents") signs = 0 - update_icon() + update_icon(UPDATE_OVERLAYS) updateUsrDialog() -/obj/structure/janitorialcart/update_icon() - overlays = null +/obj/structure/janitorialcart/update_overlays() + . = ..() if(mybag) - overlays += "cart_garbage" + . += "cart_garbage" if(mymop) - overlays += "cart_mop" + . += "cart_mop" if(myspray) - overlays += "cart_spray" + . += "cart_spray" if(myreplacer) - overlays += "cart_replacer" + . += "cart_replacer" if(signs) - overlays += "cart_sign[signs]" + . += "cart_sign[signs]" if(reagents.total_volume > 0) var/image/reagentsImage = image(icon,src,"cart_reagents0") reagentsImage.alpha = 150 - switch((reagents.total_volume/reagents.maximum_volume)*100) + switch((reagents.total_volume / reagents.maximum_volume) * 100) if(1 to 25) reagentsImage.icon_state = "cart_reagents1" if(26 to 50) @@ -205,4 +205,5 @@ if(76 to 100) reagentsImage.icon_state = "cart_reagents4" reagentsImage.icon += mix_color_from_reagents(reagents.reagent_list) - add_overlay(reagentsImage) + . += reagentsImage + diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 0245e372f36..58764470efb 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -7,18 +7,18 @@ icon_state = "spikeframe" desc = "The frame of a meat spike." density = 1 - anchored = 0 + anchored = FALSE max_integrity = 200 /obj/structure/kitchenspike_frame/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/wrench)) + if(I.tool_behaviour == TOOL_WRENCH) add_fingerprint(user) if(anchored) to_chat(user, "You unwrench [src] from the floor.") - anchored = 0 + anchored = FALSE else to_chat(user, "You wrench [src] into place.") - anchored = 1 + anchored = TRUE else if(istype(I, /obj/item/stack/rods)) var/obj/item/stack/rods/R = I if(R.get_amount() >= 4) @@ -38,7 +38,7 @@ icon_state = "spike" desc = "A spike for collecting meat from animals." density = 1 - anchored = 1 + anchored = TRUE buckle_lying = FALSE can_buckle = TRUE max_integrity = 250 @@ -53,7 +53,7 @@ ..() /obj/structure/kitchenspike/attackby(obj/item/grab/G, mob/user) - if(istype(G, /obj/item/crowbar)) + if(G.tool_behaviour == TOOL_CROWBAR) if(!has_buckled_mobs()) playsound(loc, G.usesound, 100, 1) if(do_after(user, 20 * G.toolspeed * gettoolspeedmod(user), target = src)) diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index cb093c9521a..de42568a598 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -14,11 +14,11 @@ if (up) src.up = up up.down = src - up.update_icon() + up.update_icon(UPDATE_ICON_STATE) if (down) src.down = down down.up = src - down.update_icon() + down.update_icon(UPDATE_ICON_STATE) return INITIALIZE_HINT_LATELOAD /obj/structure/ladder/Destroy(force) @@ -35,7 +35,7 @@ for(var/obj/structure/ladder/L in locate(T.x, T.y, T.z - 1)) down = L L.up = src // Don't waste effort looping the other way - L.update_icon() + L.update_icon(UPDATE_ICON_STATE) break if(!up) for (var/obj/structure/ladder/L in locate(T.x, T.y, T.z + 1)) @@ -44,7 +44,7 @@ L.update_icon() break - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/ladder/proc/disconnect() if(up && up.down == src) @@ -55,7 +55,7 @@ down.update_icon() up = down = null -/obj/structure/ladder/update_icon() +/obj/structure/ladder/update_icon_state() if(up && down) icon_state = "ladder11" @@ -153,7 +153,7 @@ /obj/structure/ladder/unbreakable/LateInitialize() // Override the parent to find ladders based on being height-linked if(!id || (up && down)) - update_icon() + update_icon(UPDATE_ICON_STATE) return for(var/O in GLOB.ladders) @@ -163,17 +163,17 @@ if(!down && L.height == height - 1) down = L L.up = src - L.update_icon() + L.update_icon(UPDATE_ICON_STATE) if (up) break // break if both our connections are filled else if(!up && L.height == height + 1) up = L L.down = src - L.update_icon() + L.update_icon(UPDATE_ICON_STATE) if (down) break // break if both our connections are filled - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/ladder/unbreakable/dive_point/buoy name = "diving point buoy" @@ -198,5 +198,5 @@ . = ..() set_light(light_range, light_power) //magical glowing anchor -/obj/structure/ladder/unbreakable/dive_point/update_icon() +/obj/structure/ladder/unbreakable/dive_point/update_icon_state() return diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 542a5a367a9..79b596c0c99 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -2,7 +2,7 @@ /obj/structure/mineral_door name = "metal door" density = 1 - anchored = 1 + anchored = TRUE opacity = 1 icon = 'icons/obj/doors/mineral_doors.dmi' @@ -98,7 +98,7 @@ opacity = 0 state = 1 air_update_turf(1) - update_icon() + update_icon(UPDATE_ICON_STATE) isSwitchingStates = 0 if(close_delay != -1) @@ -119,15 +119,17 @@ opacity = 1 state = 0 air_update_turf(1) - update_icon() + update_icon(UPDATE_ICON_STATE) isSwitchingStates = 0 -/obj/structure/mineral_door/update_icon() + +/obj/structure/mineral_door/update_icon_state() if(state) icon_state = "[initial_state]open" else icon_state = initial_state + /obj/structure/mineral_door/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pickaxe)) var/obj/item/pickaxe/digTool = W diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index f69dc79ffae..d60b3ab5c1e 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "mirror" density = 0 - anchored = 1 + anchored = TRUE max_integrity = 200 integrity_failure = 100 flags_2 = CHECK_RICOCHET_2 diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index 290068b0e2e..6e83e2bd56b 100644 --- a/code/game/objects/structures/misc.dm +++ b/code/game/objects/structures/misc.dm @@ -8,7 +8,7 @@ /obj/structure/signpost icon = 'icons/obj/stationobjs.dmi' icon_state = "signpost" - anchored = 1 + anchored = TRUE density = 1 /obj/structure/signpost/attack_hand(mob/user as mob) @@ -20,7 +20,7 @@ desc = "What?" icon = 'icons/obj/stationobjs.dmi' icon_state = "signpost2" - anchored = 1 + anchored = TRUE density = 0 /obj/structure/respawner @@ -45,7 +45,7 @@ desc = "A structure that draws ethereal attention when active. Use an empty hand to activate." icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "anomaly_crystal" - anchored = 1 + anchored = TRUE density = 1 var/active = FALSE var/ghost_alert_delay = 30 SECONDS diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 62a3c559d0b..653e180cc23 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -26,37 +26,40 @@ if(in_range(user, src)) . += "[bicon(src)] [src] contains [reagents.total_volume] units of water left." -/obj/structure/mopbucket/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/mopbucket/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/mop)) - var/obj/item/mop/m = W - if(m.reagents.total_volume < m.reagents.maximum_volume) + var/obj/item/mop/mop = W + if(mop.reagents.total_volume < mop.reagents.maximum_volume) add_fingerprint(user) - m.wet_mop(src, user) + mop.wet_mop(src, user) return if(!mymop) add_fingerprint(user) - m.janicart_insert(user, src) + mop.mopbucket_insert(user, src) return to_chat(user, "Theres already a mop in the mopbucket.") return return ..() + /obj/structure/mopbucket/proc/put_in_cart(obj/item/mop/I, mob/user) user.drop_transfer_item_to_loc(I, src) to_chat(user, "You put [I] into [src].") - return + update_icon(UPDATE_OVERLAYS) + /obj/structure/mopbucket/on_reagent_change() - update_icon() + update_icon(UPDATE_OVERLAYS) -/obj/structure/mopbucket/update_icon() - overlays.Cut() + +/obj/structure/mopbucket/update_overlays() + . = ..() if(mymop) - overlays += image(icon,"mopbucket_mop") + . += "mopbucket_mop" if(reagents.total_volume > 0) var/image/reagentsImage = image(icon, src, "mopbucket_reagents0") reagentsImage.alpha = 150 - switch((reagents.total_volume/reagents.maximum_volume)*100) + switch((reagents.total_volume / reagents.maximum_volume) * 100) if(1 to 25) reagentsImage.icon_state = "mopbucket_reagents1" if(26 to 50) @@ -66,7 +69,8 @@ if(76 to 100) reagentsImage.icon_state = "mopbucket_reagents4" reagentsImage.icon += mix_color_from_reagents(reagents.reagent_list) - add_overlay(reagentsImage) + . += reagentsImage + /obj/structure/mopbucket/attack_hand(mob/living/user) . = ..() @@ -75,5 +79,5 @@ user.put_in_hands(mymop, ignore_anim = FALSE) to_chat(user, "You take [mymop] from [src].") mymop = null - update_icon() - return + update_icon(UPDATE_OVERLAYS) + diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 4d05534d468..6e4f862393c 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "nboard" density = 0 - anchored = 1 + anchored = TRUE max_integrity = 150 var/notices = 0 @@ -25,6 +25,7 @@ break . += image(src.icon, icon_state = "[src.icon_state][I]") + //attaching papers!! /obj/structure/noticeboard/attackby(obj/item/item, mob/user, params) if(istype(item, /obj/item/paper)) diff --git a/code/game/objects/structures/pit.dm b/code/game/objects/structures/pit.dm index 99b778479b3..9b6ca752a84 100644 --- a/code/game/objects/structures/pit.dm +++ b/code/game/objects/structures/pit.dm @@ -45,9 +45,11 @@ return ..() -/obj/structure/pit/update_icon() + +/obj/structure/pit/update_icon_state() icon_state = "pit[open][icon_floor_type]" + /obj/structure/pit/Initialize(mapload) . = ..() if(mapload && !open) @@ -64,12 +66,13 @@ icon_floor_type = "sand" if(istype(loc, /turf/simulated/floor/grass)) icon_floor_type = "mud" - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/pit/proc/take_contents() var/itemcount = 0 for(var/atom/movable/A in loc) - if(A.density || A.anchored || A == src || open) continue + if(A.density || A.anchored || A == src || open) + continue A.forceMove(src) itemcount += 1 if(itemcount >= storage_capacity) @@ -87,7 +90,7 @@ if(istype(A, /obj/structure/closet)) for(var/mob/living/carbon/M in A.contents) M.update_tint() - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/pit/proc/close(var/user) name = "mound" @@ -108,7 +111,7 @@ if(istype(A, /obj/structure/closet)) for(var/mob/living/carbon/M in A.contents) M.overlay_fullscreen("tint", /obj/screen/fullscreen/blind) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/pit/remove_air(amount) return 0 diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index a5bd33c304f..6b4ad0d2721 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "plasticflaps" density = 0 - anchored = 1 + anchored = TRUE layer = 4 armor = list(melee = 100, bullet = 80, laser = 80, energy = 100, bomb = 50, bio = 100, rad = 100, fire = 50, acid = 50) var/state = PLASTIC_FLAPS_NORMAL diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index a93cb5e7cca..c39bf139cd5 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/stock_parts.dmi' icon_state = "box_0" desc = "A frame to create a reflector.\nUse 5 sheets of glass to create a 1 way reflector.\nUse 10 sheets of reinforced glass to create a 2 way reflector.\nUse 1 diamond to create a reflector cube." - anchored = 0 + anchored = FALSE density = 1 layer = 3 var/finished = 0 diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 06cd6627178..f2f64492a6e 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -112,7 +112,8 @@ GLOBAL_LIST_EMPTY(safes) /obj/structure/safe/examine_status(mob/user) return -/obj/structure/safe/update_icon() + +/obj/structure/safe/update_icon_state() if(open) if(broken) icon_state = "[initial(icon_state)]-open-broken" @@ -124,17 +125,15 @@ GLOBAL_LIST_EMPTY(safes) else icon_state = initial(icon_state) - var/list/overlays_to_cut = list(drill_overlay) - if(!drill_timer) - overlays_to_cut += progress_bar - - cut_overlay(overlays_to_cut) +/obj/structure/safe/update_overlays() + . = ..() if(istype(drill, /obj/item/thermal_drill)) var/drill_icon = istype(drill, /obj/item/thermal_drill/diamond_drill) ? "d" : "h" var/state = "[initial(icon_state)]_[drill_icon]-drill-[drill_timer ? "on" : "off"]" drill_overlay = image(icon = 'icons/effects/drill.dmi', icon_state = state, pixel_x = drill_x_offset, pixel_y = drill_y_offset) - add_overlay(drill_overlay) + . += drill_overlay + /obj/structure/safe/attack_ghost(mob/user) if(..() || drill) @@ -376,7 +375,7 @@ GLOBAL_LIST_EMPTY(safes) hide(T.intact) /obj/structure/safe/floor/hide(intact) - invisibility = intact ? INVISIBILITY_ABSTRACT : 0 + invisibility = intact ? INVISIBILITY_MAXIMUM : 0 /** * # Safe Internals diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index c841de19414..40e72b92172 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -1,12 +1,32 @@ /obj/structure/sign icon = 'icons/obj/decals.dmi' - anchored = 1 + anchored = TRUE opacity = 0 density = 0 layer = 3.5 max_integrity = 100 + blocks_emissive = EMISSIVE_BLOCK_GENERIC + var/does_emissive = FALSE armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + +/obj/structure/sign/Initialize(mapload) + . = ..() + if(does_emissive) + update_icon(UPDATE_OVERLAYS) + set_light(1, LIGHTING_MINIMUM_POWER) + + +/obj/structure/sign/update_overlays() + . = ..() + + underlays.Cut() + if(!does_emissive) + return + + underlays += emissive_appearance(icon,"[icon_state]_lightmask") + + /obj/structure/sign/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) @@ -17,6 +37,7 @@ if(BURN) playsound(loc, 'sound/items/welder.ogg', 80, TRUE) + /obj/structure/sign/screwdriver_act(mob/user, obj/item/I) if(istype(src, /obj/structure/sign/double)) return @@ -42,33 +63,36 @@ resistance_flags = FLAMMABLE var/sign_state = "" -/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob) //construction - if(istype(tool, /obj/item/screwdriver) && isturf(user.loc)) - var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel") - if(direction == "Cancel") - return - if(QDELETED(src)) - return - var/obj/structure/sign/S = new(user.loc) - switch(direction) - if("North") - S.pixel_y = 32 - if("East") - S.pixel_x = 32 - if("South") - S.pixel_y = -32 - if("West") - S.pixel_x = -32 - else - return - S.name = name - S.desc = desc - S.icon_state = sign_state - src.transfer_fingerprints_to(S) - to_chat(user, "You fasten \the [S] with your [tool].") - qdel(src) - else - return ..() + +/obj/item/sign/screwdriver_act(mob/living/user, obj/item/I) + if(!isturf(loc)) + return + + var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel") + if(direction == "Cancel") + return TRUE // These gotta be true or we stab the sign + if(QDELETED(src)) + return TRUE // Unsure about this, but stabbing something that doesnt exist seems like a bad idea + + var/obj/structure/sign/sign = new(loc) + switch(direction) + if("North") + sign.pixel_y = 32 + if("East") + sign.pixel_x = 32 + if("South") + sign.pixel_y = -32 + if("West") + sign.pixel_x = -32 + else + return TRUE // We dont want to stab it or place it, so we return + sign.name = name + sign.desc = desc + sign.icon_state = sign_state + to_chat(user, span_notice("You fasten [sign] with your [I].")) + qdel(src) + return TRUE + /obj/structure/sign/double/map name = "station map" @@ -212,11 +236,15 @@ name = "\improper barber shop sign" desc = "A spinning sign indicating a barbershop is near." icon_state = "barber" + does_emissive = TRUE + blocks_emissive = FALSE /obj/structure/sign/chinese name = "\improper chinese restaurant sign" desc = "A glowing dragon invites you in." icon_state = "chinese" + does_emissive = TRUE + blocks_emissive = FALSE /obj/structure/sign/science name = "\improper SCIENCE!" diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index e72f4760089..cd241fec97b 100644 --- a/code/game/objects/structures/spirit_board.dm +++ b/code/game/objects/structures/spirit_board.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "spirit_board" density = 1 - anchored = 1 + anchored = TRUE var/used = FALSE var/cooldown = 0 var/planchette = "А" diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 8ad8842a508..ca64315fbcb 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/statue.dmi' icon_state = "" density = 1 - anchored = 0 + anchored = FALSE max_integrity = 100 var/oreAmount = 5 var/material_drop_type = /obj/item/stack/sheet/metal @@ -376,7 +376,7 @@ icon = 'icons/obj/statuelarge.dmi' icon_state = "frank" max_integrity = 2000 - anchored = 1 + anchored = TRUE layer = EDGED_TURF_LAYER /obj/structure/statue/dude @@ -385,7 +385,7 @@ icon = 'icons/obj/statuelarge.dmi' icon_state = "dude" max_integrity = 2000 - anchored = 1 + anchored = TRUE layer = EDGED_TURF_LAYER /obj/structure/statue/death @@ -394,7 +394,7 @@ icon = 'icons/obj/statuebig.dmi' icon_state = "death" max_integrity = 2000 - anchored = 1 + anchored = TRUE bound_width = 64 layer = EDGED_TURF_LAYER @@ -404,20 +404,16 @@ icon = 'icons/obj/statuebig.dmi' icon_state = "unknown" max_integrity = 2000 - anchored = 1 + anchored = TRUE bound_width = 64 var/lit = 0 layer = EDGED_TURF_LAYER -/obj/structure/statue/unknown/Destroy() - return ..() -/obj/structure/statue/unknown/update_icon() - if(lit) - lit = 1 - icon_state = "unknown_lit" - else - icon_state = "unknown" +/obj/structure/statue/unknown/update_icon_state() + icon_state = "unknown[lit ? "_lit" : ""]" + + /obj/structure/statue/unknown/attackby(obj/item/W, mob/user, params) if(is_hot(W)) @@ -425,29 +421,33 @@ return return ..() + /obj/structure/statue/unknown/welder_act(mob/user, obj/item/I) . = TRUE if(I.tool_use_check(user, 0)) light(span_notice("[user] casually lights the [name] with [I], what a badass.")) + /obj/structure/statue/unknown/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) if(!lit) light() return ..() + /obj/structure/statue/unknown/proc/light(show_message) if(!lit) - lit = 1 + lit = TRUE if(show_message) usr.visible_message(show_message) set_light(CANDLE_LUM) - update_icon() + update_icon(UPDATE_ICON_STATE) + /obj/structure/statue/unknown/attack_hand(mob/user) if(lit) user.visible_message(span_notice("[user] snuffs out [src].")) - lit = 0 - update_icon() + lit = FALSE + update_icon(UPDATE_ICON_STATE) set_light(0) //////////////////////////////// diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index eaeabd374a5..5f44986b557 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -149,16 +149,18 @@ forceMove(RH) RH.held = src -/obj/structure/bed/roller/MouseDrop(over_object, src_location, over_location) - ..() - if(over_object == usr && Adjacent(usr) && (in_range(src, usr) || usr.contents.Find(src))) - if(!ishuman(usr) || usr.incapacitated()) - return - if(has_buckled_mobs()) - return 0 - usr.visible_message("[usr] collapses \the [name].", "You collapse \the [name].") + +/obj/structure/bed/roller/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) + if(!has_buckled_mobs() && over_object == usr && ishuman(usr) && !usr.incapacitated() && usr.Adjacent(src)) + usr.visible_message( + span_notice("[usr] collapses [src]."), + span_notice("You collapse [src]."), + ) new folded(get_turf(src)) qdel(src) + return FALSE + return ..() + /obj/item/roller/holo name = "holo stretcher" diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index c7895e40f5c..2723eb5c760 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -73,11 +73,9 @@ new buildstacktype(loc, buildstackamount) ..() -/obj/structure/chair/MouseDrop(over_object, src_location, over_location) - . = ..() - if(over_object == usr && Adjacent(usr)) - if(!item_chair || has_buckled_mobs() || anchored) - return + +/obj/structure/chair/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params) + if(over_object == usr && ishuman(usr) && item_chair && !anchored && !has_buckled_mobs() && usr.Adjacent(src)) if(usr.incapacitated()) to_chat(usr, span_warning("You can't do that right now!")) return @@ -87,13 +85,18 @@ if(usr.get_active_hand() && usr.get_inactive_hand()) to_chat(usr, span_warning("You try to grab the chair, but your hands are already full!")) return - if(!ishuman(usr)) - return - usr.visible_message(span_notice("[usr] grabs \the [src]."), span_notice("You grab \the [src].")) - var/C = new item_chair(drop_location()) - usr.put_in_hands(C, ignore_anim = FALSE) - transfer_fingerprints_to(C) + usr.visible_message( + span_notice("[usr] grabs [src]."), + span_notice("You grab [src]."), + ) + var/new_chair = new item_chair(drop_location()) + transfer_fingerprints_to(new_chair) + usr.put_in_hands(new_chair, ignore_anim = FALSE) qdel(src) + return FALSE + + return ..() + /obj/structure/chair/attack_tk(mob/user) if(!anchored || has_buckled_mobs() || !isturf(user.loc)) @@ -101,53 +104,65 @@ else rotate() + /obj/structure/chair/proc/handle_rotation(direction) handle_layer() if(has_buckled_mobs()) - for(var/m in buckled_mobs) - var/mob/living/buckled_mob = m + for(var/mob/living/buckled_mob as anything in buckled_mobs) buckled_mob.setDir(direction) + /obj/structure/chair/proc/handle_layer() if(has_buckled_mobs() && dir == NORTH) layer = ABOVE_MOB_LAYER else layer = OBJ_LAYER + /obj/structure/chair/post_buckle_mob(mob/living/M) . = ..() handle_layer() + /obj/structure/chair/post_unbuckle_mob() . = ..() handle_layer() + /obj/structure/chair/setDir(newdir) ..() handle_rotation(newdir) -/obj/structure/chair/verb/rotate() - set name = "Rotate Chair" - set category = "Object" - set src in oview(1) - if(CONFIG_GET(flag/ghost_interaction)) - add_fingerprint(usr) - setDir(turn(dir, 90)) - handle_rotation() - return +/obj/structure/chair/examine(mob/user) + . = ..() + . += span_info("You can Alt-Click [src] to rotate it.") - if(usr.incapacitated()) - return - add_fingerprint(usr) +/obj/structure/chair/proc/rotate(mob/living/user) + if(user) + if(isobserver(user)) + if(!CONFIG_GET(flag/ghost_interaction)) + return FALSE + else if(!isliving(user) || user.incapacitated() || !Adjacent(user)) + return FALSE + setDir(turn(dir, 90)) handle_rotation() + return TRUE + + +/obj/structure/chair/AltClick(mob/living/user) + rotate(user) + + +/obj/structure/chair/verb/rotate_chair() + set name = "Rotate Chair" + set category = "Object" + set src in oview(1) + + rotate(usr) -/obj/structure/chair/AltClick(mob/user) - if(!Adjacent(user)) - return - rotate() // CHAIR TYPES @@ -288,7 +303,7 @@ anchored = TRUE item_chair = null comfort = 0.6 - var/image/armrest = null + var/mutable_appearance/armrest /obj/structure/chair/sofa/Initialize(mapload) armrest = GetArmrest() diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 186ec4ea419..9364329513e 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -34,52 +34,72 @@ var/buildstackamount = 1 var/framestackamount = 2 var/deconstruction_ready = TRUE - var/flipped = 0 + var/flip_sound = 'sound/machines/wooden_closet_close.ogg' + var/flipped = FALSE + /// Can this table be flipped? + var/can_be_flipped = TRUE + /obj/structure/table/Initialize(mapload) . = ..() if(flipped) - update_icon() + update_icon(UPDATE_ICON_STATE) + /obj/structure/table/examine(mob/user) . = ..() . += deconstruction_hints(user) + if(can_be_flipped) + if(flipped) + . += span_info("Alt-Shift-Click to right the table again.") + else + . += span_info("Alt-Shift-Click to flip over the table.") + /obj/structure/table/proc/deconstruction_hints(mob/user) return "The top is screwed on, but the main bolts are also visible." -/obj/structure/table/update_icon() + +/obj/structure/table/update_icon(updates = ALL) + . = ..() + update_smoothing() + + +/obj/structure/table/update_icon_state() if(smooth && !flipped) icon_state = "" - queue_smooth(src) - queue_smooth_neighbors(src) if(flipped) - clear_smooth_overlays() - var/type = 0 var/subtype = null for(var/direction in list(turn(dir,90), turn(dir,-90)) ) - var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,direction)) - if(T && T.flipped) + var/obj/structure/table/other_table = locate(/obj/structure/table,get_step(src,direction)) + if(other_table?.flipped) type++ if(type == 1) subtype = direction == turn(dir,90) ? "-" : "+" var/base = "table" if(istype(src, /obj/structure/table/wood)) base = "wood" - if(istype(src, /obj/structure/table/reinforced)) + else if(istype(src, /obj/structure/table/reinforced)) base = "rtable" - if(istype(src, /obj/structure/table/wood/poker)) + else if(istype(src, /obj/structure/table/wood/poker)) base = "poker" - if(istype(src, /obj/structure/table/wood/fancy)) + else if(istype(src, /obj/structure/table/wood/fancy)) base = "fancy" - if(istype(src, /obj/structure/table/wood/fancy/black)) + else if(istype(src, /obj/structure/table/wood/fancy/black)) base = "fancyblack" - icon_state = "[base]flip[type][type == 1 ? subtype : ""]" - return 1 + +/obj/structure/table/proc/update_smoothing() + if(smooth) + queue_smooth(src) + queue_smooth_neighbors(src) + + if(flipped) + clear_smooth_overlays() + /obj/structure/table/narsie_act() new /obj/structure/table/wood(loc) @@ -117,28 +137,29 @@ var/mob/living/user = AM clumse_stuff(user) + /obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0) if(height == 0) - return 1 + return TRUE if(istype(mover,/obj/item/projectile)) - return (check_cover(mover,target)) + return check_cover(mover,target) if(ismob(mover)) - var/mob/M = mover + var/mob/living/M = mover if(M.flying) - return 1 + return TRUE if(istype(mover) && mover.checkpass(PASSTABLE)) - return 1 + return TRUE if(mover.throwing) - return 1 + return TRUE + if(length(get_atoms_of_type(get_turf(mover), /obj/structure/table) - mover)) + var/obj/structure/table/other_table = locate(/obj/structure/table) in get_turf(mover) + if(!other_table.flipped) + return TRUE if(flipped) if(get_dir(loc, target) == dir) return !density - else - return 1 - var/obj/structure/table/S = locate(/obj/structure/table) in get_turf(mover) - if(S?.flipped == 0) - return 1 - return 0 + return TRUE + return FALSE /obj/structure/table/CanPathfindPass(obj/item/card/id/ID, dir, caller, no_id = FALSE) @@ -157,53 +178,48 @@ * * from - Where the projectile is located. */ /obj/structure/table/proc/check_cover(obj/item/projectile/P, turf/from) - var/turf/cover = flipped ? get_turf(src) : get_step(loc, get_dir(from, loc)) - if(get_dist(P.starting, loc) <= 1) //Tables won't help you if people are THIS close - return 1 - if(get_turf(P.original) == cover) - var/chance = 20 - if(ismob(P.original)) - var/mob/M = P.original - if(M.lying) - chance += 20 //Lying down lets you catch less bullets - if(flipped) - if(get_dir(loc, from) == dir) //Flipped tables catch mroe bullets - chance += 20 - else - return 1 //But only from one side - if(prob(chance)) - obj_integrity -= P.damage/2 - if(obj_integrity > 0) - visible_message("[P] hits \the [src]!") - return 0 - else - visible_message("[src] breaks down!") - deconstruct(FALSE) - return 1 - return 1 - -/obj/structure/table/CheckExit(atom/movable/O, turf/target) - if(istype(O) && O.checkpass(PASSTABLE)) - return 1 - if(flipped) - if(get_dir(loc, target) == dir) - return !density - else - return 1 - return 1 + . = TRUE -/obj/structure/table/MouseDrop_T(obj/O, mob/user) - ..() - if((!( istype(O, /obj/item) ) || user.get_active_hand() != O)) - return + if(!flipped) + return . + + if(in_range(P.starting, loc)) // Tables won't help you if people are THIS close + return . + + var/proj_dir = get_dir(from, loc) + var/block_dir = get_dir(get_step(loc, dir), loc) + var/full_protection = (proj_dir & block_dir) + var/half_protection = ((proj_dir == get_clockwise_dir(block_dir)) || (proj_dir == get_anticlockwise_dir(block_dir))) + + if(!full_protection && !half_protection) // Back/side shots may pass + return . + + if(prob(half_protection ? 40 : 60)) + return FALSE // Blocked + + +/obj/structure/table/CheckExit(atom/movable/mover, turf/target) + if(istype(mover) && mover.checkpass(PASSTABLE)) + return TRUE + if(flipped && get_dir(loc, target) == dir) + return !density + return TRUE + + +/obj/structure/table/MouseDrop_T(obj/dropping, mob/user, params) + if(..()) + return TRUE + if(!isitem(dropping) || user.get_active_hand() != dropping) + return FALSE if(isrobot(user)) - return - if(!user.drop_from_active_hand()) - return - if(O.loc != src.loc) + return FALSE + if(!user.drop_item_ground(dropping)) + return FALSE + if(dropping.loc != loc) add_fingerprint(user) - step(O, get_dir(O, src)) - return + step(dropping, get_dir(dropping, src)) + return TRUE + /obj/structure/table/proc/tablepush(obj/item/grab/G, mob/user) if(HAS_TRAIT(user, TRAIT_PACIFISM) || GLOB.pacifism_after_gt) @@ -232,6 +248,7 @@ return TRUE qdel(G) + /obj/structure/table/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/grab)) add_fingerprint(user) @@ -269,6 +286,7 @@ deconstruct(TRUE) TOOL_DISMANTLE_SUCCESS_MESSAGE + /obj/structure/table/wrench_act(mob/user, obj/item/I) if(flags & NODECONSTRUCT) return @@ -282,6 +300,7 @@ deconstruct(TRUE, 1) TOOL_DISMANTLE_SUCCESS_MESSAGE + /obj/structure/table/deconstruct(disassembled = TRUE, wrench_disassembly = 0) if(!(flags & NODECONSTRUCT)) var/turf/T = get_turf(src) @@ -292,119 +311,113 @@ new framestack(T, framestackamount) qdel(src) + /obj/structure/table/proc/straight_table_check(direction) - var/obj/structure/table/T - for(var/angle in list(-90,90)) - T = locate() in get_step(loc,turn(direction,angle)) - if(T && !T.flipped) - return 0 - T = locate() in get_step(loc,direction) - if(!T || T.flipped) - return 1 - if(istype(T,/obj/structure/table/reinforced/)) - if(!T.deconstruction_ready) - return 0 - return T.straight_table_check(direction) + var/obj/structure/table/check_table + for(var/angle in list(-90, 90)) + check_table = locate() in get_step(loc, turn(direction, angle)) + if(check_table && !check_table.flipped) + return FALSE + check_table = locate() in get_step(loc, direction) + if(!check_table || check_table.flipped) + return TRUE + if(istype(check_table, /obj/structure/table/reinforced) && !check_table.deconstruction_ready) + return FALSE + return check_table.straight_table_check(direction) -/obj/structure/table/verb/do_flip() - set name = "Flip table" - set desc = "Flips a non-reinforced table" - set category = null - set src in oview(1) - if(!can_touch(usr) || ismouse(usr)) - return +/obj/structure/table/AltShiftClick(mob/user) + actual_flip(user) - if(!flip(get_cardinal_dir(usr,src))) - to_chat(usr, "It won't budge.") - return - add_fingerprint(usr) - usr.visible_message("[usr] flips \the [src]!") +/obj/structure/table/verb/do_flip() + set name = "Flip/Unflip table" + set desc = "Flips or unflips a table" + set category = null + set src in oview(1) + actual_flip(usr) - if(climbable) - structure_shaken() - return +/obj/structure/table/proc/actual_flip(mob/living/user) + if(!can_be_flipped || !can_touch(user)) + return FALSE -/obj/structure/table/proc/do_put() - set name = "Put table back" - set desc = "Puts flipped table back" - set category = "Object" - set src in oview(1) + if(!flipped) + if(!flip(get_cardinal_dir(user, src))) + to_chat(user, span_notice("It won't budge.")) + return - if(!can_touch(usr) || ismouse(usr)) - return + user.visible_message("[user] flips \the [src]!") - if(!unflip()) - to_chat(usr, "It won't budge.") - return + if(climbable) + structure_shaken() + else + if(!unflip()) + to_chat(user, span_notice("It won't budge.")) /obj/structure/table/proc/flip(direction) if(flipped) - return 0 + return FALSE - if( !straight_table_check(turn(direction,90)) || !straight_table_check(turn(direction,-90)) ) - return 0 - - verbs -=/obj/structure/table/verb/do_flip - verbs +=/obj/structure/table/proc/do_put + if(!straight_table_check(turn(direction,90)) || !straight_table_check(turn(direction,-90))) + return FALSE var/list/targets = list(get_step(src,dir),get_step(src,turn(dir, 45)),get_step(src,turn(dir, -45))) - for(var/atom/movable/A in get_turf(src)) - if(!A.anchored) - spawn(0) - A.throw_at(pick(targets),1,1) + for(var/atom/movable/thing in get_turf(src)) + if(!thing.anchored) + INVOKE_ASYNC(thing, TYPE_PROC_REF(/atom/movable, throw_at), pick(targets), 1, 1) dir = direction if(dir != NORTH) layer = 5 - flipped = 1 + flipped = TRUE smooth = SMOOTH_FALSE flags |= ON_BORDER - for(var/D in list(turn(direction, 90), turn(direction, -90))) - if(locate(/obj/structure/table,get_step(src,D))) - var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,D)) - T.flip(direction) - update_icon() + playsound(loc, flip_sound, 100, TRUE) + + for(var/check_dir in list(turn(direction, 90), turn(direction, -90))) + var/obj/structure/table/other_table = locate(/obj/structure/table, get_step(src, check_dir)) + if(other_table) + other_table.flip(direction) + update_icon(UPDATE_ICON_STATE) creates_cover = FALSE if(isturf(loc)) REMOVE_TRAIT(loc, TRAIT_TURF_COVERED, UNIQUE_TRAIT_SOURCE(src)) - return 1 + return TRUE + /obj/structure/table/proc/unflip() if(!flipped) - return 0 + return FALSE - var/can_flip = 1 - for(var/mob/A in oview(src,0))//loc) - if(istype(A)) - can_flip = 0 + var/can_flip = TRUE + for(var/mob/check in oview(src, 0)) + can_flip = FALSE + break if(!can_flip) - return 0 - - verbs -=/obj/structure/table/proc/do_put - verbs +=/obj/structure/table/verb/do_flip + return FALSE layer = initial(layer) - flipped = 0 + flipped = FALSE smooth = initial(smooth) flags &= ~ON_BORDER - for(var/D in list(turn(dir, 90), turn(dir, -90))) - if(locate(/obj/structure/table,get_step(src,D))) - var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,D)) - T.unflip() + playsound(loc, flip_sound, 100, TRUE) + + for(var/check_dir in list(turn(dir, 90), turn(dir, -90))) + var/obj/structure/table/other_table = locate(/obj/structure/table, get_step(src, check_dir)) + if(other_table) + other_table.unflip() dir = initial(dir) - update_icon() + update_icon(UPDATE_ICON_STATE) creates_cover = TRUE if(isturf(loc)) ADD_TRAIT(loc, TRAIT_TURF_COVERED, UNIQUE_TRAIT_SOURCE(src)) - return 1 + return TRUE /* @@ -433,25 +446,30 @@ qdel(i) . = ..() + /obj/structure/table/glass/Crossed(atom/movable/AM, oldloc) . = ..() if(flags & NODECONSTRUCT) return if(!isliving(AM)) return + + var/mob/living/check = AM + if(check.incorporeal_move || check.flying || check.floating) + return + // Don't break if they're just flying past if(AM.throwing) addtimer(CALLBACK(src, PROC_REF(throw_check), AM), 5) else check_break(AM) + /obj/structure/table/glass/proc/throw_check(mob/living/M) if(M.loc == get_turf(src)) check_break(M) /obj/structure/table/glass/proc/check_break(mob/living/M) - if(M.flying || M.incorporeal_move) - return if(has_gravity(M) && M.mob_size > MOB_SIZE_SMALL) table_shatter(M) @@ -628,9 +646,8 @@ /obj/structure/table/reinforced/flip(direction) if(!deconstruction_ready) - return 0 - else - return ..() + return FALSE + return ..() /obj/structure/table/reinforced/welder_act(mob/user, obj/item/I) . = TRUE @@ -683,15 +700,15 @@ icon_state = "tray" buildstack = /obj/item/stack/sheet/mineral/titanium buildstackamount = 2 + can_be_flipped = FALSE var/list/typecache_can_hold = list(/mob, /obj/item) var/list/held_items = list() /obj/structure/table/tray/Initialize() . = ..() - verbs -= /obj/structure/table/verb/do_flip typecache_can_hold = typecacheof(typecache_can_hold) for(var/atom/movable/held in get_turf(src)) - if(is_type_in_typecache(held, typecache_can_hold)) + if(!held.anchored && held.move_resist != INFINITY && is_type_in_typecache(held, typecache_can_hold)) held_items += held.UID() /obj/structure/table/tray/Move(NewLoc, direct) @@ -717,10 +734,26 @@ continue held.forceMove(NewLoc) + +/obj/structure/table/tray/can_be_pulled(user, force, show_message) + var/atom/movable/puller = user + if(loc != puller.loc) + held_items -= puller.UID() + if(isliving(user)) + var/mob/living/M = user + if(M.UID() in held_items) + return FALSE + return ..() + + /obj/structure/table/tray/item_placed(atom/movable/item) . = ..() if(is_type_in_typecache(item, typecache_can_hold)) held_items += item.UID() + if(isliving(item)) + var/mob/living/M = item + if(M.pulling == src) + M.stop_pulling() /obj/structure/table/tray/deconstruct(disassembled = TRUE, wrench_disassembly = 0) if(!(flags & NODECONSTRUCT)) @@ -758,17 +791,17 @@ . = ..() . += "It's held together by a couple of bolts." + /obj/structure/rack/CanPass(atom/movable/mover, turf/target, height=0) if(height==0) - return 1 - if(density == 0) //Because broken racks -Agouri |TODO: SPRITE!| - return 1 + return TRUE + if(!density) //Because broken racks -Agouri |TODO: SPRITE!| + return TRUE if(istype(mover) && mover.checkpass(PASSTABLE)) - return 1 + return TRUE if(mover.throwing) - return 1 - else - return 0 + return TRUE + return FALSE /obj/structure/rack/CanPathfindPass(obj/item/card/id/ID, dir, caller, no_id = FALSE) @@ -778,23 +811,25 @@ . = . || mover.checkpass(PASSTABLE) -/obj/structure/rack/MouseDrop_T(obj/item/O, mob/user) - if((!(istype(O)) || user.get_active_hand() != O)) - return +/obj/structure/rack/MouseDrop_T(obj/item/dropping, mob/user, params) + . = FALSE + if((!isitem(dropping)) || user.get_active_hand() != dropping) + return . if(isrobot(user)) - return - if(O.loc != src.loc) - if(user.transfer_item_to_loc(O, src.loc)) - add_fingerprint(user) + return . + if(dropping.loc != loc && user.transfer_item_to_loc(dropping, src.loc)) + add_fingerprint(user) + return TRUE + -/obj/structure/rack/attackby(obj/item/W, mob/user, params) +/obj/structure/rack/attackby(obj/item/I, mob/user, params) if(isrobot(user)) return if(user.a_intent == INTENT_HARM) return ..() - if(!(W.flags & ABSTRACT)) - if(user.transfer_item_to_loc(W, src.loc)) - add_fingerprint(user) + if(!(I.flags & ABSTRACT) && user.transfer_item_to_loc(I, loc)) + add_fingerprint(user) + /obj/structure/rack/wrench_act(mob/user, obj/item/I) . = TRUE @@ -842,46 +877,45 @@ desc = "A gun rack for storing guns." icon_state = "gunrack" -/obj/structure/rack/gunrack/MouseDrop_T(obj/O, mob/user) - if(isrobot(user)) - return - if(!user.drop_from_active_hand()) - return - if(!(istype(O, /obj/item/gun))) - to_chat(user, "This item doesn't fit!") - return - if(O.loc != src.loc) - add_fingerprint(user) - var/obj/item/gun/our_gun = O - our_gun.reset_direction() - our_gun.place_on_rack() - our_gun.do_drop_animation(src) - our_gun.Move(loc) -/obj/structure/rack/gunrack/attackby(obj/item/W, mob/user, params) +/obj/structure/rack/gunrack/proc/place_gun(obj/item/gun/our_gun, mob/user, params) + . = FALSE if(!ishuman(user)) - return - if(user.a_intent == INTENT_HARM) - return ..() - if(!(istype(W, /obj/item/gun))) - to_chat(user, "This item doesn't fit!") - return - if(!(W.flags & ABSTRACT) && user.drop_from_active_hand()) + return . + if(!(istype(our_gun))) + to_chat(user, span_warning("This item doesn't fit!")) + return . + if(our_gun.flags & ABSTRACT) + return . + if(!user.drop_item_ground(our_gun)) + return . + if(our_gun.loc != loc) add_fingerprint(user) - var/obj/item/gun/our_gun = W + our_gun.reset_direction() our_gun.place_on_rack() our_gun.do_drop_animation(src) our_gun.Move(loc) var/list/click_params = params2list(params) //Center the icon where the user clicked. if(!click_params || !click_params["icon-x"] || !click_params["icon-y"]) - return + return . //Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf) - W.pixel_x = clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2) - W.pixel_y = 0 - else + our_gun.pixel_x = clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2) + our_gun.pixel_y = 0 + return TRUE + + +/obj/structure/rack/gunrack/MouseDrop_T(obj/item/gun/our_gun, mob/user, params) + return place_gun(our_gun, user, params) + + +/obj/structure/rack/gunrack/attackby(obj/item/I, mob/user, params) + if(!ishuman(user)) return - return + if(user.a_intent == INTENT_HARM) + return ..() + place_gun(I, user, params) + /obj/structure/rack/gunrack/wrench_act(mob/user, obj/item/I) . = TRUE @@ -889,13 +923,15 @@ return deconstruct(TRUE) + /obj/structure/rack/gunrack/Initialize(mapload) . = ..() - if(mapload) - for(var/obj/item/I in loc.contents) - if(istype(I, /obj/item/gun)) - var/obj/item/gun/to_place = I - to_place.place_on_rack() + if(!mapload) + return + + for(var/obj/item/gun/gun in loc) + gun.place_on_rack() + /obj/structure/rack/gunrack/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT)) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index e773b66baf2..8e33df0e985 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "dispenser" density = 1 - anchored = 1.0 + anchored = TRUE var/starting_oxygen_tanks = MAX_TANK_STORAGE // The starting amount of oxygen tanks the dispenser gets when it's spawned var/starting_plasma_tanks = MAX_TANK_STORAGE // Starting amount of plasma tanks var/list/stored_oxygen_tanks = list() // List of currently stored oxygen tanks @@ -21,7 +21,7 @@ /obj/structure/dispenser/Initialize(mapload) . = ..() initialize_tanks() - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/dispenser/Destroy() QDEL_LIST(stored_plasma_tanks) @@ -37,21 +37,23 @@ var/obj/item/tank/internals/oxygen/O = new(src) stored_oxygen_tanks.Add(O) -/obj/structure/dispenser/update_icon() - cut_overlays() + +/obj/structure/dispenser/update_overlays() + . = ..() var/oxy_tank_amount = LAZYLEN(stored_oxygen_tanks) switch(oxy_tank_amount) if(1 to 3) - overlays += "oxygen-[oxy_tank_amount]" + . += "oxygen-[oxy_tank_amount]" if(4 to INFINITY) - overlays += "oxygen-4" + . += "oxygen-4" var/pla_tank_amount = LAZYLEN(stored_plasma_tanks) switch(pla_tank_amount) if(1 to 4) - overlays += "plasma-[pla_tank_amount]" + . += "plasma-[pla_tank_amount]" if(5 to INFINITY) - overlays += "plasma-5" + . += "plasma-5" + /obj/structure/dispenser/attack_hand(mob/user) if(..()) @@ -100,14 +102,14 @@ try_insert_tank(user, stored_plasma_tanks, I) return - if(istype(I, /obj/item/wrench)) + if(I.tool_behaviour == TOOL_WRENCH) add_fingerprint(user) if(anchored) to_chat(user, "You lean down and unwrench [src].") - anchored = 0 + anchored = FALSE else to_chat(user, "You wrench [src] into place.") - anchored = 1 + anchored = TRUE return return ..() @@ -116,14 +118,14 @@ if(!LAZYLEN(tank_list)) return // There are no tanks left to withdraw. - var/obj/item/tank/internals/T = tank_list[1] - tank_list.Remove(T) + var/obj/item/tank/internals/tank = tank_list[1] + tank_list.Remove(tank) - T.forceMove_turf() - user.put_in_hands(T) + tank.forceMove_turf() + user.put_in_hands(tank, ignore_anim = FALSE) - to_chat(user, "You take [T] out of [src].") - update_icon() + to_chat(user, "You take [tank] out of [src].") + update_icon(UPDATE_OVERLAYS) /// Called when the user clicks on the dispenser with a tank. Tries to insert the tank into the dispenser, and updates the UI if successful. /obj/structure/dispenser/proc/try_insert_tank(mob/living/user, list/tank_list, obj/item/tank/T) @@ -137,7 +139,7 @@ add_fingerprint(user) tank_list.Add(T) - update_icon() + update_icon(UPDATE_OVERLAYS) to_chat(user, "You put [T] in [src].") SStgui.update_uis(src) diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 12e14dcf80d..7ebd461fd7e 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -1,15 +1,14 @@ #define CLOSE_DURATION 6 #define OPEN_DURATION 6 -#define LAUNCH_COOLDOWN 50 - - +#define LAUNCH_COOLDOWN 30 // A place where tube pods stop, and people can get in or out. -// Mappers: use "Generate Instances from Directions" for this -// one. +// Mappers: use "Generate Instances from Directions" for this one. /obj/structure/transit_tube/station name = "station tube station" + desc = "The lynchpin of the transit system." icon = 'icons/obj/pipes_and_stuff/not_atmos/transit_tube_station.dmi' - icon_state = "closed" + icon_state = "closed_station0" + base_icon_state = "station0" exit_delay = 1 enter_delay = 2 var/pod_moving = FALSE @@ -18,6 +17,8 @@ var/hatch_state = TRANSIT_TUBE_CLOSED var/list/disallowed_mobs = list(/mob/living/silicon/ai) + /// Direction by which you can board the tube + var/boarding_dir /obj/structure/transit_tube/station/Initialize(mapload) . = ..() @@ -27,26 +28,32 @@ STOP_PROCESSING(SSobj, src) return ..() -// Stations which will send the tube in the opposite direction after their stop. -/obj/structure/transit_tube/station/reverse - reverse_launch = TRUE +/obj/structure/transit_tube/station/init_tube_dirs() + // Tube station directions are simply 90 to either side of + // the exit. + switch(dir) + if(NORTH) + tube_dirs = list(EAST, WEST) + if(SOUTH) + tube_dirs = list(EAST, WEST) + if(EAST) + tube_dirs = list(NORTH, SOUTH) + if(WEST) + tube_dirs = list(NORTH, SOUTH) + boarding_dir = reverse_direction(dir) /obj/structure/transit_tube/station/should_stop_pod(pod, from_dir) return TRUE -/obj/structure/transit_tube/station/Bumped(atom/movable/moving_atom) - if(!pod_moving && hatch_state == TRANSIT_TUBE_OPEN && isliving(moving_atom) && !is_type_in_list(moving_atom, disallowed_mobs)) - var/failed = FALSE +/obj/structure/transit_tube/station/Bumped(mob/living/L) + if(!pod_moving && L.dir == boarding_dir && hatch_state == TRANSIT_TUBE_OPEN && isliving(L) && !is_type_in_list(L, disallowed_mobs)) for(var/obj/structure/transit_tube_pod/pod in loc) - if(pod.contents.len) - failed = TRUE - else if(!pod.moving && (pod.dir in directions())) - pod.move_into(moving_atom) + if(length(pod.contents)) + to_chat(L, "The pod is already occupied.") + return + if(!pod.moving && ((pod.dir in directions()) || (reverse_launch && (turn(pod.dir, 180) in directions())))) + pod.move_into(L) return - if(failed) - to_chat(moving_atom, "The pod is already occupied.") - - /obj/structure/transit_tube/station/attack_hand(mob/user) if(pod_moving) @@ -66,9 +73,7 @@ "You start emptying [pod]'s contents onto the floor.", "You hear a loud noise! As if somebody is throwing stuff on the floor!") if(!do_after(user, 20, target = pod)) return - add_fingerprint(user) for(var/atom/movable/AM in pod) - AM.add_fingerprint(user) pod.eject(AM) if(isliving(AM)) var/mob/living/L = AM @@ -82,7 +87,7 @@ if(ismob(G.affecting) && G.state >= GRAB_AGGRESSIVE) var/mob/living/GM = G.affecting for(var/obj/structure/transit_tube_pod/pod in loc) - pod.visible_message("[user] starts putting [GM] into the [pod]!") + pod.visible_message("[user] starts putting [GM] into [pod]!") if(do_after(user, 30, target = GM) && GM && G && G.affecting == GM) GM.add_fingerprint(user) GM.Weaken(10 SECONDS) @@ -92,31 +97,36 @@ /obj/structure/transit_tube/station/proc/open_hatch() if(hatch_state == TRANSIT_TUBE_CLOSED) - icon_state = "opening" + icon_state = "opening_[base_icon_state]" hatch_state = TRANSIT_TUBE_OPENING - addtimer(CALLBACK(src, PROC_REF(open_hatch_callback)), OPEN_DURATION) - -/obj/structure/transit_tube/station/proc/open_hatch_callback() - if(hatch_state == TRANSIT_TUBE_OPENING) - icon_state = "open" - hatch_state = TRANSIT_TUBE_OPEN - - + addtimer(CALLBACK(src, PROC_REF(finish_animation)), OPEN_DURATION) /obj/structure/transit_tube/station/proc/close_hatch() if(hatch_state == TRANSIT_TUBE_OPEN) - icon_state = "closing" + icon_state = "closing_[base_icon_state]" hatch_state = TRANSIT_TUBE_CLOSING - addtimer(CALLBACK(src, PROC_REF(close_hatch_calllback)), CLOSE_DURATION) + addtimer(CALLBACK(src, PROC_REF(finish_animation)), CLOSE_DURATION) -/obj/structure/transit_tube/station/proc/close_hatch_calllback() - if(hatch_state == TRANSIT_TUBE_CLOSING) - icon_state = "closed" - hatch_state = TRANSIT_TUBE_CLOSED +/obj/structure/transit_tube/station/proc/finish_animation() + switch(hatch_state) + if(TRANSIT_TUBE_OPENING) + icon_state = "open_[base_icon_state]" + hatch_state = TRANSIT_TUBE_OPEN + for(var/obj/structure/transit_tube_pod/pod in loc) + for(var/thing in pod) + if(ismob(thing)) + var/mob/mob_content = thing + if(mob_content.client && mob_content.stat < UNCONSCIOUS) + continue // Let the mobs with clients decide what they want to do themselves. + var/atom/movable/movable_content = thing + movable_content.forceMove(loc) //Everything else is moved out of. + if(TRANSIT_TUBE_CLOSING) + icon_state = "closed_[base_icon_state]" + hatch_state = TRANSIT_TUBE_CLOSED /obj/structure/transit_tube/station/proc/launch_pod() for(var/obj/structure/transit_tube_pod/pod in loc) - if(!pod.moving && (pod.dir in directions())) + if(!pod.moving && ((pod.dir in directions()) || (reverse_launch && (turn(pod.dir, 180) in directions())))) addtimer(CALLBACK(src, PROC_REF(launch_pod_callback), pod), 5) return @@ -135,7 +145,7 @@ if(!nexttube) pod.dir = turn(pod.dir, 180) - if(hatch_state == TRANSIT_TUBE_CLOSED && pod) + if(hatch_state == TRANSIT_TUBE_CLOSED && pod && pod.loc == loc) pod.follow_tube() pod_moving = FALSE @@ -146,6 +156,7 @@ /obj/structure/transit_tube/station/pod_stopped(obj/structure/transit_tube_pod/pod, from_dir) pod_moving = TRUE + pod.stop_following() addtimer(CALLBACK(src, PROC_REF(pod_stopped_callback), pod), 5) /obj/structure/transit_tube/station/proc/pod_stopped_callback(obj/structure/transit_tube_pod/pod) @@ -156,10 +167,99 @@ pod_moving = FALSE pod.mix_air() -// Tube station directions are simply 90 to either side of -// the exit. -/obj/structure/transit_tube/station/init_dirs() - tube_dirs = list(turn(dir, 90), turn(dir, -90)) +/obj/structure/transit_tube/station/flipped + icon_state = "closed_station1" + base_icon_state = "station1" + +/obj/structure/transit_tube/station/flipped/init_tube_dirs() + ..() + boarding_dir = dir + +// Stations which will send the tube in the opposite direction after their stop. +/obj/structure/transit_tube/station/reverse + icon_state = "closed_terminus0" + base_icon_state = "terminus0" + reverse_launch = TRUE + +/obj/structure/transit_tube/station/reverse/init_tube_dirs() + tube_dirs = list(turn(dir, -90)) + boarding_dir = reverse_direction(dir) + +/obj/structure/transit_tube/station/reverse/flipped + icon_state = "closed_terminus1" + base_icon_state = "terminus1" + +/obj/structure/transit_tube/station/reverse/flipped/init_tube_dirs() + ..() + boarding_dir = dir + +//special dispenser station, it creates a pod for you to enter when you bump into it. + +/obj/structure/transit_tube/station/dispenser + name = "station tube pod dispenser" + icon_state = "open_dispenser0" + desc = "The lynchpin of a GOOD transit system." + enter_delay = 1 + base_icon_state = "dispenser0" + hatch_state = TRANSIT_TUBE_OPEN + +/obj/structure/transit_tube/station/dispenser/examine(mob/user) + . = ..() + . += "This station will create a pod for you to ride, no need to wait for one." + . += "Any pods arriving at this station will be reclaimed." + +/obj/structure/transit_tube/station/dispenser/close_hatch() + . = ..() + return + +/obj/structure/transit_tube/station/dispenser/launch_pod() + for(var/obj/structure/transit_tube_pod/pod in loc) + if(!pod.moving) + pod_moving = TRUE + pod.follow_tube() + pod_moving = FALSE + return TRUE + return FALSE + +/obj/structure/transit_tube/station/dispenser/Bumped(mob/living/L) + if(!(istype(L) && L.dir == boarding_dir) || L.anchored) + return + if(isliving(L) && !is_type_in_list(L, disallowed_mobs)) + var/obj/structure/transit_tube_pod/dispensed/pod = new(loc) + L.visible_message("[pod] forms around [L].", "[pod] materializes around you.") + playsound(src, 'sound/weapons/emitter2.ogg', 50, TRUE) + pod.dir = turn(dir, -90) + pod.move_into(L) + launch_pod() + +/obj/structure/transit_tube/station/dispenser/pod_stopped(obj/structure/transit_tube_pod/pod) + playsound(src, 'sound/machines/ding.ogg', 50, TRUE) + qdel(pod) + +/obj/structure/transit_tube/station/dispenser/flipped + icon_state = "open_dispenser1" + base_icon_state = "dispenser1" + +/obj/structure/transit_tube/station/dispenser/flipped/init_tube_dirs() + ..() + boarding_dir = dir +/obj/structure/transit_tube/station/dispenser/reverse + reverse_launch = TRUE + icon_state = "open_terminusdispenser0" + base_icon_state = "terminusdispenser0" + +/obj/structure/transit_tube/station/dispenser/reverse/init_tube_dirs() + tube_dirs = list(turn(dir, 90)) + boarding_dir = reverse_direction(dir) + +/obj/structure/transit_tube/station/dispenser/reverse/flipped + icon_state = "open_terminusdispenser1" + base_icon_state = "terminusdispenser1" + +/obj/structure/transit_tube/station/dispenser/reverse/flipped/init_tube_dirs() + ..() + boarding_dir = dir + #undef CLOSE_DURATION #undef OPEN_DURATION diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm index 476ce469492..584c8136eeb 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube.dm @@ -4,38 +4,50 @@ // Mappers: you can use "Generate Instances from Icon-states" // to get the different pieces. /obj/structure/transit_tube + name = "transit tube" + desc = "A pneumatic tube that brings you from here to there." icon = 'icons/obj/pipes_and_stuff/not_atmos/transit_tube.dmi' - icon_state = "E-W" - density = 1 + icon_state = "straight" + density = TRUE layer = 3.1 - anchored = 1.0 + anchored = TRUE var/list/tube_dirs = null var/exit_delay = 1 var/enter_delay = 0 - // alldirs in global.dm is the same list of directions, but since - // the specific order matters to get a usable icon_state, it is - // copied here so that, in the unlikely case that alldirs is changed, - // this continues to work. - var/global/list/tube_dir_list = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) +/obj/structure/transit_tube/Initialize(mapload, new_direction) + . = ..() + if(new_direction) + setDir(new_direction) + // set up our appearance after the initialize in case someone's setting our direction afterwards + // (especially for things like admin spawning) + addtimer(CALLBACK(src, PROC_REF(setup_appearance)), 1) +/obj/structure/transit_tube/proc/setup_appearance() + init_tube_dirs() + update_appearance() + +/obj/structure/transit_tube/Destroy() + for(var/obj/structure/transit_tube_pod/P in loc) + P.empty_pod() + return ..() /obj/structure/transit_tube/CanPass(atom/movable/mover, turf/target) if(istype(mover) && mover.checkpass(PASSGLASS)) - return 1 + return TRUE return !density // When destroyed by explosions, properly handle contents. /obj/structure/transit_tube/ex_act(severity) switch(severity) - if(1.0) + if(EXPLODE_DEVASTATE) for(var/atom/movable/AM in contents) AM.loc = loc AM.ex_act(severity++) qdel(src) return - if(2.0) + if(EXPLODE_HEAVY) if(prob(50)) for(var/atom/movable/AM in contents) AM.loc = loc @@ -43,20 +55,12 @@ qdel(src) return - if(3.0) + if(EXPLODE_LIGHT) return - -/obj/structure/transit_tube/New(loc) - ..(loc) - - if(tube_dirs == null) - init_dirs() - - // Called to check if a pod should stop upon entering this tube. /obj/structure/transit_tube/proc/should_stop_pod(pod, from_dir) - return 0 + return FALSE // Called when a pod stops in this tube section. /obj/structure/transit_tube/proc/pod_stopped(pod, from_dir) @@ -69,27 +73,21 @@ /obj/structure/transit_tube/proc/directions() return tube_dirs - - /obj/structure/transit_tube/proc/has_entrance(from_dir) from_dir = turn(from_dir, 180) for(var/direction in directions()) if(direction == from_dir) - return 1 - - return 0 - + return TRUE + return FALSE /obj/structure/transit_tube/proc/has_exit(in_dir) for(var/direction in directions()) if(direction == in_dir) - return 1 - - return 0 - + return TRUE + return FALSE // Searches for an exit direction within 45 degrees of the // specified dir. Returns that direction, or 0 if none match. @@ -110,7 +108,6 @@ return near_dir - // Return how many BYOND ticks to wait before entering/exiting // the tube section. Default action is to return the value of // a var, which wouldn't need a proc, but it makes it possible @@ -122,194 +119,157 @@ /obj/structure/transit_tube/proc/enter_delay(pod, to_dir) return enter_delay +/obj/structure/transit_tube/proc/init_tube_dirs() + switch(dir) + if(NORTH, SOUTH) + tube_dirs = list(NORTH, SOUTH) + if(EAST, WEST) + tube_dirs = list(EAST, WEST) -// Parse the icon_state into a list of directions. -// This means that mappers can use Dream Maker's built in -// "Generate Instances from Icon-states" option to get all -// variations. Additionally, as a separate proc, sub-types -// can handle it more intelligently. -/obj/structure/transit_tube/proc/init_dirs() - if(icon_state == "auto") - // Additional delay, for map loading. - spawn(1) - init_dirs_automatic() - - else - tube_dirs = parse_dirs(icon_state) - - if(copytext(icon_state, 1, 3) == "D-" || findtextEx(icon_state, "Pass")) - density = 0 - - - - -// Initialize dirs by searching for tubes that do/might connect -// on nearby turfs. Create corner pieces if nessecary. -// Pick two directions, preferring tubes that already connect -// to loc, or other auto tubes if there aren't enough connections. -/obj/structure/transit_tube/proc/init_dirs_automatic() - var/list/connected = list() - var/list/connected_auto = list() - - for(var/direction in tube_dir_list) - var/location = get_step(loc, direction) - for(var/obj/structure/transit_tube/tube in location) - if(tube.directions() == null && tube.icon_state == "auto") - connected_auto += direction - break - - else if(turn(direction, 180) in tube.directions()) - connected += direction - break - - connected += connected_auto - - tube_dirs = select_automatic_dirs(connected) - - if(length(tube_dirs) == 2 && tube_dir_list.Find(tube_dirs[1]) > tube_dir_list.Find(tube_dirs[2])) - tube_dirs.Swap(1, 2) - - generate_automatic_corners(tube_dirs) - select_automatic_icon_state(tube_dirs) - - - -// Given a list of directions, look a pair that forms a 180 or -// 135 degree angle, and return a list containing the pair. -// If none exist, return list(connected[1], turn(connected[1], 180) -/obj/structure/transit_tube/proc/select_automatic_dirs(connected) - if(length(connected) < 1) - return list() - - for(var/i = 1, i <= length(connected), i++) - for(var/j = i + 1, j <= length(connected), j++) - var/d1 = connected[i] - var/d2 = connected[j] - - if(d1 == turn(d2, 135) || d1 == turn(d2, 180) || d1 == turn(d2, 225)) - return list(d1, d2) - - return list(connected[1], turn(connected[1], 180)) - - - -/obj/structure/transit_tube/proc/select_automatic_icon_state(directions) - if(length(directions) == 2) - icon_state = "[dir2text_short(directions[1])]-[dir2text_short(directions[2])]" - - - -// Look for diagonal directions, generate the decorative corners in each. -/obj/structure/transit_tube/proc/generate_automatic_corners(directions) - for(var/direction in directions) - if(direction == 5 || direction == 6 || direction == 9 || direction == 10) - if(direction & NORTH) - create_automatic_decorative_corner(get_step(loc, NORTH), direction ^ 3) - - else - create_automatic_decorative_corner(get_step(loc, SOUTH), direction ^ 3) - - if(direction & EAST) - create_automatic_decorative_corner(get_step(loc, EAST), direction ^ 12) - - else - create_automatic_decorative_corner(get_step(loc, WEST), direction ^ 12) - - - -// Generate a corner, if one doesn't exist for the direction on the turf. -/obj/structure/transit_tube/proc/create_automatic_decorative_corner(location, direction) - var/state = "D-[dir2text_short(direction)]" - - for(var/obj/structure/transit_tube/tube in location) - if(tube.icon_state == state) - return - - var/obj/structure/transit_tube/tube = new(location) - tube.icon_state = state - tube.init_dirs() - - - -// Uses a list() to cache return values. Since they should -// never be edited directly, all tubes with a certain -// icon_state can just reference the same list. In theory, -// reduces memory usage, and improves CPU cache usage. -// In reality, I don't know if that is quite how BYOND works, -// but it is probably safer to assume the existence of, and -// rely on, a sufficiently smart compiler/optimizer. -/obj/structure/transit_tube/proc/parse_dirs(text) - var/global/list/direction_table = list() - - if(text in direction_table) - return direction_table[text] - - var/list/split_text = splittext(text, "-") - - // If the first token is D, the icon_state represents - // a purely decorative tube, and doesn't actually - // connect to anything. - if(split_text[1] == "D") - direction_table[text] = list() - return null - - var/list/directions = list() - - for(var/text_part in split_text) - var/direction = text2dir_extended(text_part) - - if(direction > 0) - directions += direction - - direction_table[text] = directions - return directions - - - -// A copy of text2dir, extended to accept one and two letter -// directions, and to clearly return 0 otherwise. -/obj/structure/transit_tube/proc/text2dir_extended(direction) - switch(uppertext(direction)) - if("NORTH", "N") - return 1 - if("SOUTH", "S") - return 2 - if("EAST", "E") - return 4 - if("WEST", "W") - return 8 - if("NORTHEAST", "NE") - return 5 - if("NORTHWEST", "NW") - return 9 - if("SOUTHEAST", "SE") - return 6 - if("SOUTHWEST", "SW") - return 10 - else - return 0 - - - -// A copy of dir2text, which returns the short one or two letter -// directions used in tube icon states. -/obj/structure/transit_tube/proc/dir2text_short(direction) - switch(direction) - if(1) - return "N" - if(2) - return "S" - if(4) - return "E" - if(8) - return "W" - if(5) - return "NE" - if(6) - return "SE" - if(9) - return "NW" - if(10) - return "SW" +/obj/structure/transit_tube/update_overlays() + . = ..() + for(var/direction in directions()) + if(!IS_DIR_DIAGONAL(direction)) + . += create_tube_overlay(direction) + continue + if(!(direction & NORTH)) + continue + + . += create_tube_overlay(direction ^ (NORTH|SOUTH), NORTH) + if(direction & EAST) + . += create_tube_overlay(direction ^ (EAST|WEST), EAST) else + . += create_tube_overlay(direction ^ (EAST|WEST), WEST) + + +/obj/structure/transit_tube/proc/create_tube_overlay(direction, shift_dir) + // We use image() because a mutable appearance will have its dir mirror the parent which sort of fucks up what we're doing here + var/image/tube_overlay = image(icon, dir = direction) + if(shift_dir) + tube_overlay.icon_state = "decorative_diag" + switch(shift_dir) + if(NORTH) + tube_overlay.pixel_y = 32 + if(SOUTH) + tube_overlay.pixel_y = -32 + if(EAST) + tube_overlay.pixel_x = 32 + if(WEST) + tube_overlay.pixel_x = -32 + else + tube_overlay.icon_state = "decorative" + + tube_overlay.overlays += emissive_blocker(icon, tube_overlay.icon_state, src) + return tube_overlay + +//Some of these are mostly for mapping use +/obj/structure/transit_tube/horizontal + dir = WEST + +/obj/structure/transit_tube/diagonal + icon_state = "diagonal" + +/obj/structure/transit_tube/diagonal/init_tube_dirs() + switch(dir) + if(NORTH) + tube_dirs = list(NORTHEAST, SOUTHWEST) + if(SOUTH) + tube_dirs = list(NORTHEAST, SOUTHWEST) + if(EAST) + tube_dirs = list(NORTHWEST, SOUTHEAST) + if(WEST) + tube_dirs = list(NORTHWEST, SOUTHEAST) + +//mostly for mapping use +/obj/structure/transit_tube/diagonal/topleft + dir = WEST + +/obj/structure/transit_tube/diagonal/crossing + density = FALSE + icon_state = "diagonal_crossing" + +//mostly for mapping use +/obj/structure/transit_tube/diagonal/crossing/topleft + dir = WEST + + +/obj/structure/transit_tube/curved + icon_state = "curved0" + +/obj/structure/transit_tube/curved/init_tube_dirs() + switch(dir) + if(NORTH) + tube_dirs = list(NORTH, SOUTHWEST) + if(SOUTH) + tube_dirs = list(SOUTH, NORTHEAST) + if(EAST) + tube_dirs = list(EAST, NORTHWEST) + if(WEST) + tube_dirs = list(SOUTHEAST, WEST) + +/obj/structure/transit_tube/curved/flipped + icon_state = "curved1" + +/obj/structure/transit_tube/curved/flipped/init_tube_dirs() + switch(dir) + if(NORTH) + tube_dirs = list(NORTH, SOUTHEAST) + if(SOUTH) + tube_dirs = list(SOUTH, NORTHWEST) + if(EAST) + tube_dirs = list(EAST, SOUTHWEST) + if(WEST) + tube_dirs = list(NORTHEAST, WEST) + + +/obj/structure/transit_tube/junction + icon_state = "junction0" + +/obj/structure/transit_tube/junction/init_tube_dirs() + switch(dir) + if(NORTH) + tube_dirs = list(NORTH, SOUTHEAST, SOUTHWEST)//ending with the prefered direction + if(SOUTH) + tube_dirs = list(SOUTH, NORTHWEST, NORTHEAST) + if(EAST) + tube_dirs = list(EAST, SOUTHWEST, NORTHWEST) + if(WEST) + tube_dirs = list(WEST, NORTHEAST, SOUTHEAST) + +/obj/structure/transit_tube/junction/flipped + icon_state = "junction1" + +/obj/structure/transit_tube/junction/flipped/init_tube_dirs() + switch(dir) + if(NORTH) + tube_dirs = list(NORTH, SOUTHWEST, SOUTHEAST)//ending with the prefered direction + if(SOUTH) + tube_dirs = list(SOUTH, NORTHEAST, NORTHWEST) + if(EAST) + tube_dirs = list(EAST, NORTHWEST, SOUTHWEST) + if(WEST) + tube_dirs = list(WEST, SOUTHEAST, NORTHEAST) + + +/obj/structure/transit_tube/crossing + icon_state = "crossing" + density = FALSE + +//mostly for mapping use +/obj/structure/transit_tube/crossing/horizontal + dir = WEST + +// cosmetic "cap" for tubes. Note that tubes can't enter this. +/obj/structure/transit_tube/cap + icon_state = "cap" + +/obj/structure/transit_tube/cap/init_tube_dirs() + tube_dirs = list(turn(dir, 180)) // back the way we came + +/obj/structure/transit_tube/cap/has_entrance(from_dir) + return FALSE + +/obj/structure/transit_tube/cap/create_tube_overlay() + // cap sprites already have overlays return + diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 9ab4942cefd..bd368eb24f9 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -1,3 +1,6 @@ +#define MOVE_ANIMATION_STAGE_ONE 1 +#define MOVE_ANIMATION_STAGE_TWO 2 + /obj/structure/transit_tube_pod icon = 'icons/obj/pipes_and_stuff/not_atmos/transit_tube_pod.dmi' icon_state = "pod" @@ -6,21 +9,47 @@ density = TRUE var/moving = FALSE var/datum/gas_mixture/air_contents = new() - -/obj/structure/transit_tube_pod/New(loc) - ..(loc) + /// The tube we're currently traveling through + var/obj/structure/transit_tube/current_tube = null + /// The direction of our next transit from pipe to pipe. Stored between process calls here. + var/next_dir + /// The location of our next target tube. Stored same as above + var/next_loc + /// How long to wait when entering a new tube + var/enter_delay = 0 + /// How long to wait when exiting a new tube + var/exit_delay + /// The next time we'll be moving + COOLDOWN_DECLARE(move_cooldown) + /// The move animation mode for the next processing tick + var/current_move_anim_mode = MOVE_ANIMATION_STAGE_ONE + /// Icon state in use while we're occupied + var/occupied_icon_state = "pod_occupied" + +/obj/structure/transit_tube_pod/Initialize(mapload) + . = ..() + // Give auto tubes time to align before trying to start moving + spawn(5) air_contents.oxygen = MOLES_O2STANDARD * 2 air_contents.nitrogen = MOLES_N2STANDARD air_contents.temperature = T20C - // Give auto tubes time to align before trying to start moving - spawn(5) - follow_tube() + for(var/obj/structure/transit_tube/tube in loc) + setDir(pick(tube.directions())) + break + follow_tube() + +/obj/structure/transit_tube_pod/update_icon_state() + . = ..() + icon_state = length(contents) ? occupied_icon_state : initial(icon_state) + +/obj/structure/transit_tube_pod/proc/stop_following() + STOP_PROCESSING(SStransit_tube, src) /obj/structure/transit_tube_pod/Destroy() - for(var/atom/movable/AM in contents) - AM.forceMove(get_turf(src)) + empty_pod() + stop_following() return ..() /obj/structure/transit_tube_pod/Process_Spacemove() @@ -28,69 +57,115 @@ return TRUE else return ..() -/obj/structure/transit_tube_pod/proc/follow_tube(var/reverse_launch) +/obj/structure/transit_tube_pod/proc/empty_pod(atom/location) + if(!location) + location = get_turf(src) + for(var/atom/movable/M in contents) + M.forceMove(location) + update_appearance() + +/obj/structure/transit_tube_pod/crowbar_act(mob/living/user, obj/item/I) + . = ..() if(moving) return - moving = TRUE + if(length(contents)) + I.play_tool_sound(src) + user.visible_message("[user] pries [src] open.") + empty_pod() + +/obj/structure/transit_tube_pod/process() + ..() + + if(!COOLDOWN_FINISHED(src, move_cooldown)) + return + + var/move_result = move_animation(current_move_anim_mode) + if(isnull(move_result)) + if(isnull(current_tube) || (!(dir in current_tube.directions()) && !(reverse_direction(dir) in current_tube.directions()))) + outside_tube() + return PROCESS_KILL - spawn() - var/obj/structure/transit_tube/current_tube = null - var/next_dir - var/next_loc - var/last_delay = 0 - var/exit_delay + current_move_anim_mode = move_result - if(reverse_launch) - dir = turn(dir, 180) // Back it up +/obj/structure/transit_tube_pod/proc/outside_tube() + var/list/savedcontents = contents.Copy() + var/saveddir = dir + var/turf/destination = get_edge_target_turf(src, saveddir) + visible_message("[src] ejects its insides out!") + for(var/i in savedcontents) + var/atom/movable/AM = i + AM.throw_at(destination, rand(1, 3), 5) - for(var/obj/structure/transit_tube/tube in loc) - if(tube.has_exit(dir)) + +/obj/structure/transit_tube_pod/proc/move_animation(stage = MOVE_ANIMATION_STAGE_ONE) + if(stage == MOVE_ANIMATION_STAGE_ONE) + next_dir = current_tube.get_exit(dir) + + if(!next_dir) + moving = FALSE + density = TRUE + return + exit_delay = current_tube.exit_delay + next_loc = get_step(src, next_dir) + current_tube = null + for(var/obj/structure/transit_tube/tube in next_loc) + if(tube.has_entrance(next_dir)) current_tube = tube break - while(current_tube) - next_dir = current_tube.get_exit(dir) + if(isnull(current_tube)) + setDir(next_dir) + Move(get_step(loc, dir), dir) // Allow collisions when leaving the tubes. + moving = FALSE + density = TRUE + return - if(!next_dir) - break + enter_delay = current_tube.enter_delay(src, next_dir) + if(enter_delay > 0) + COOLDOWN_START(src, move_cooldown, enter_delay) + return MOVE_ANIMATION_STAGE_TWO - exit_delay = current_tube.exit_delay(src, dir) - last_delay += exit_delay + stage = MOVE_ANIMATION_STAGE_TWO - sleep(exit_delay) + if(stage == MOVE_ANIMATION_STAGE_TWO) + setDir(next_dir) + forceMove(next_loc) // When moving from one tube to another, skip collision and such. + density = current_tube.density - next_loc = get_step(loc, next_dir) + if(current_tube?.should_stop_pod(src, next_dir)) + current_tube.pod_stopped(src, dir) + else + COOLDOWN_START(src, move_cooldown, exit_delay) + return MOVE_ANIMATION_STAGE_ONE - current_tube = null - for(var/obj/structure/transit_tube/tube in next_loc) - if(tube.has_entrance(next_dir)) - current_tube = tube - break + density = TRUE + moving = FALSE - if(current_tube == null) - setDir(next_dir) - Move(get_step(loc, dir), dir) // Allow collisions when leaving the tubes. - break + return MOVE_ANIMATION_STAGE_ONE - last_delay = current_tube.enter_delay(src, next_dir) - sleep(last_delay) - setDir(next_dir) - forceMove(next_loc) // When moving from one tube to another, skip collision and such. - density = current_tube.density - if(current_tube && current_tube.should_stop_pod(src, next_dir)) - current_tube.pod_stopped(src, dir) - break +/obj/structure/transit_tube_pod/proc/follow_tube(reverse_launch) + if(moving) + return - density = TRUE + moving = TRUE - moving = FALSE + for(var/obj/structure/transit_tube/tube in loc) + if(tube.has_exit(dir)) + current_tube = tube + break + if(current_tube) + START_PROCESSING(SStransit_tube, src) + // move_animation(MOVE_ANIMATION_STAGE_ONE) + else + moving = FALSE // Should I return a copy here? If the caller edits or qdel()s the returned // datum, there might be problems if I don't... /obj/structure/transit_tube_pod/return_air() + RETURN_TYPE(/datum/gas_mixture) var/datum/gas_mixture/GM = new() GM.copy_from(air_contents) return GM @@ -152,9 +227,9 @@ if(!moving) for(var/obj/structure/transit_tube/station/station in loc) - if(dir in station.directions()) + if((dir in station.directions()) || (turn(dir, 180) in station.directions())) if(!station.pod_moving) - if(direction == station.dir) + if(direction == turn(station.boarding_dir, 180)) if(station.hatch_state == TRANSIT_TUBE_OPEN) eject(mob, direction) @@ -173,8 +248,8 @@ return /obj/structure/transit_tube_pod/proc/move_into(atom/movable/A) - icon_state = "pod_occupied" A.forceMove(src) + update_appearance() /obj/structure/transit_tube_pod/proc/eject_mindless(direction) for(var/atom/movable/A in contents) @@ -187,9 +262,24 @@ /obj/structure/transit_tube_pod/proc/eject(atom/movable/A, direction) - icon_state = "pod" A.forceMove(loc) + update_appearance() A.Move(get_step(loc, direction), direction) if(ismob(A)) var/mob/M = A M.reset_perspective(null) + + +/obj/structure/transit_tube_pod/dispensed + name = "temporary transit tube pod" + desc = "Gets you from here to there, and no further." + icon_state = "temppod" + occupied_icon_state = "temppod_occupied" + + +/obj/structure/transit_tube_pod/dispensed/outside_tube() + if(!QDELETED(src)) + qdel(src) + +#undef MOVE_ANIMATION_STAGE_TWO +#undef MOVE_ANIMATION_STAGE_ONE diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index d0769b4cd0a..27febace5d5 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "toilet00" density = 0 - anchored = 1 + anchored = TRUE var/open = 0 //if the lid is up var/cistern = 0 //if the cistern bit is open var/w_items = 0 //the combined w_class of all the items in the cistern @@ -52,7 +52,8 @@ open = !open update_icon() -/obj/structure/toilet/update_icon() + +/obj/structure/toilet/update_icon_state() icon_state = "toilet[open][cistern]" if(!anchored) pixel_x = 0 @@ -129,7 +130,7 @@ user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.") cistern = !cistern update_icon() - return + /obj/structure/toilet/wrench_act(mob/user, obj/item/I) . = TRUE @@ -156,19 +157,19 @@ if(!loc || !anchored) return user.visible_message("[user] disconnects [src]!", "You disconnect [src]!") - anchored = 0 + anchored = FALSE if("Connect") user.visible_message("[user] starts connecting [src].", "You begin connecting [src]...") if(I.use_tool(src, user, 40, volume = I.tool_volume)) if(!loc || anchored) return user.visible_message("[user] connects [src]!", "You connect [src]!") - anchored = 1 + anchored = TRUE if("Rotate") var/list/dir_choices = list("North" = NORTH, "East" = EAST, "South" = SOUTH, "West" = WEST) var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in dir_choices dir = dir_choices[selected] - update_icon() //is this necessary? probably not + update_icon() /obj/structure/toilet/proc/stash_goods(obj/item/I, mob/user) if(!I) @@ -217,7 +218,7 @@ desc = "Поговаривают, что 7 веков назад у каждого арабского шейха был такой унитаз." icon_state = "gold_toilet00" -/obj/structure/toilet/golden_toilet/update_icon() +/obj/structure/toilet/golden_toilet/update_icon_state() . = ..() icon_state = "gold_toilet[open][cistern]" @@ -226,7 +227,7 @@ desc = "Престижное седалище для престижной персоны. Судя по форме, был идеально подготовлен под седальное место Капитана." icon_state = "captain_toilet00" -/obj/structure/toilet/captain_toilet/update_icon() +/obj/structure/toilet/captain_toilet/update_icon_state() . = ..() icon_state = "captain_toilet[open][cistern]" @@ -236,7 +237,7 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "urinal" density = 0 - anchored = 1 + anchored = TRUE /obj/structure/urinal/attackby(obj/item/I, mob/user, params) @@ -268,7 +269,7 @@ if(!loc || !anchored) return user.visible_message("[user] disconnects [src]!", "You disconnect [src]!") - anchored = 0 + anchored = FALSE pixel_x = 0 pixel_y = 0 else @@ -277,25 +278,32 @@ if(!loc || anchored) return user.visible_message("[user] connects [src]!", "You connect [src]!") - anchored = 1 + anchored = TRUE pixel_x = 0 pixel_y = 32 + +#define SHOWER_FREEZING "freezing" +#define SHOWER_NORMAL "normal" +#define SHOWER_BOILING "boiling" + /obj/machinery/shower name = "shower" desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division." icon = 'icons/obj/watercloset.dmi' icon_state = "shower" - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE use_power = NO_POWER_USE - var/on = 0 - var/obj/effect/mist/mymist = null - var/ismist = 0 //needs a var so we can make it linger~ - var/watertemp = "normal" //freezing, normal, or boiling + ///Is the shower on or off? + var/on = FALSE + ///What temperature the shower reagents are set to. + var/current_temperature = SHOWER_NORMAL var/mobpresent = 0 //true if there is a mob on the shower's loc, this is to ease process() + ///What sound will be played on loop when the shower is on and pouring water. var/datum/looping_sound/showering/soundloop + /obj/machinery/shower/New(turf/T, newdir = SOUTH, building = FALSE) ..() soundloop = new(list(src), FALSE) @@ -310,9 +318,12 @@ pixel_y = -5 layer = FLY_LAYER + /obj/machinery/shower/Destroy() - QDEL_NULL(mymist) QDEL_NULL(soundloop) + var/obj/effect/mist/mist = locate() in loc + if(!QDELETED(mist)) + QDEL_IN(mist, 25 SECONDS) return ..() //add heat controls? when emagged, you can freeze to death in it? @@ -321,164 +332,176 @@ name = "mist" icon = 'icons/obj/watercloset.dmi' icon_state = "mist" - layer = MOB_LAYER + 1 - anchored = 1 + layer = FLY_LAYER + anchored = TRUE mouse_opacity = MOUSE_OPACITY_TRANSPARENT -/obj/machinery/shower/attack_hand(mob/M as mob) - add_fingerprint(M) + +/obj/machinery/shower/attack_hand(mob/user) on = !on update_icon() + handle_mist() + add_fingerprint(user) if(on) + START_PROCESSING(SSmachines, src) + process() soundloop.start() - if(M.loc == loc) - wash(M) - check_heat(M) - M.water_act(100, convertHeat(), src) - for(var/atom/movable/G in src.loc) - G.clean_blood() - G.water_act(100, convertHeat(), src) else soundloop.stop() + var/turf/simulated/source_turf = loc + if(istype(source_turf) && !source_turf.density) + source_turf.MakeSlippery(TURF_WET_WATER, 5 SECONDS) + /obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob, params) if(I.type == /obj/item/analyzer) add_fingerprint(user) - to_chat(user, "The water temperature seems to be [watertemp].") - if(on) - add_fingerprint(user) - I.water_act(100, convertHeat(), src) + to_chat(user, span_notice("The water temperature seems to be [current_temperature].")) return ..() + /obj/machinery/shower/wrench_act(mob/user, obj/item/I) - . = TRUE - if(!I.tool_use_check(user, 0)) - return - to_chat(user, "You begin to adjust the temperature valve with the [I].") - if(I.use_tool(src, user, 50, volume = I.tool_volume)) - switch(watertemp) - if("normal") - watertemp = "freezing" - if("freezing") - watertemp = "boiling" - if("boiling") - watertemp = "normal" - user.visible_message("[user] adjusts the shower with the [I].", "You adjust [src] to [watertemp].") - update_icon() //letsa update whenever we change the temperature, since the mist might need to change + to_chat(user, span_notice("You begin to adjust the temperature valve with [I].")) + if(I.use_tool(src, user, 5 SECONDS)) + switch(current_temperature) + if(SHOWER_NORMAL) + current_temperature = SHOWER_FREEZING + if(SHOWER_FREEZING) + current_temperature = SHOWER_BOILING + if(SHOWER_BOILING) + current_temperature = SHOWER_NORMAL + user.visible_message( + span_notice("[user] adjusts the shower with [I]."), + span_notice("You adjust [src] to [current_temperature] temperature."), + ) + add_hiddenprint(user) + handle_mist() + return TRUE + /obj/machinery/shower/welder_act(mob/user, obj/item/I) . = TRUE if(on) - to_chat(user, "Turn [src] off before you attempt to cut it loose.") + to_chat(user, span_warning("Turn [src] off before you attempt to cut it loose.")) return if(!I.tool_use_check(user, 0)) return - visible_message("[user] begins slicing [src] free...", "You begin slicing [src] free...", "You hear welding.") - if(I.use_tool(src, user, 40, volume = I.tool_volume)) - if(mymist) - qdel(mymist) - user.visible_message("[user] cuts [src] loose!", "You cut [src] loose!") - var/obj/item/mounted/shower/S = new /obj/item/mounted/shower(get_turf(user)) - transfer_fingerprints_to(S) + user.visible_message( + span_notice("[user] begins slicing [src] free..."), + span_notice("You begin slicing [src] free..."), + span_italics("You hear welding."), + ) + if(I.use_tool(src, user, 4 SECONDS, volume = I.tool_volume)) + user.visible_message( + span_notice("[user] cuts [src] loose!"), + span_notice("You cut [src] loose!>"), + ) + var/obj/item/mounted/shower/shower = new /obj/item/mounted/shower(get_turf(user)) + transfer_prints_to(shower, TRUE) qdel(src) -/obj/machinery/shower/update_icon() //this makes the shower mist up or clear mist (depending on water temperature) - overlays.Cut() //once it's been on for a while, in addition to handling the water overlay. - if(on) - overlays += image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir) - var/mist_time = 50 //5 seconds at normal temperature to build up mist - if(watertemp == "freezing") - mist_time = 70 //7 seconds on freezing temperature to disperse existing mist - if(watertemp == "boiling") - mist_time = 20 //2 seconds on boiling temperature to build up mist - addtimer(CALLBACK(src, PROC_REF(update_mist)), mist_time) - else - addtimer(CALLBACK(src, PROC_REF(update_mist)), 250) //25 seconds for mist to disperse after being turned off -/obj/machinery/shower/proc/update_mist() +/obj/machinery/shower/update_overlays() + . = ..() if(on) - if(watertemp == "freezing") - if(mymist) - qdel(mymist) - ismist = 0 - return - if(mymist) - return - ismist = 1 - mymist = new /obj/effect/mist(loc) - else - if(mymist) - qdel(mymist) - ismist = 0 + . += image(icon, icon_state = "water", layer = ABOVE_MOB_LAYER, dir = src.dir) -/obj/machinery/shower/Crossed(atom/movable/O, oldloc) - ..() - wash(O) - if(ismob(O)) - mobpresent += 1 - check_heat(O) - -/obj/machinery/shower/Uncrossed(atom/movable/O) - if(ismob(O)) - mobpresent -= 1 + +/obj/machinery/shower/proc/handle_mist() + // If there is no mist, and the shower was turned on (on a non-freezing temp): make mist in 5 seconds + // If there was already mist, and the shower was turned off (or made cold): remove the existing mist in 25 sec + var/obj/effect/mist/mist = locate() in loc + if(!mist && on && current_temperature != SHOWER_FREEZING) + addtimer(CALLBACK(src, PROC_REF(make_mist)), 5 SECONDS) + + if(mist && (!on || current_temperature == SHOWER_FREEZING)) + addtimer(CALLBACK(src, PROC_REF(clear_mist)), 25 SECONDS) + + +/obj/machinery/shower/proc/make_mist() + var/obj/effect/mist/mist = locate() in loc + if(!mist && on && current_temperature != SHOWER_FREEZING) + new /obj/effect/mist(loc) + + +/obj/machinery/shower/proc/clear_mist() + var/obj/effect/mist/mist = locate() in loc + if(mist && (!on || current_temperature == SHOWER_FREEZING)) + qdel(mist) + + +/obj/machinery/shower/Crossed(atom/movable/AM, oldloc) ..() + if(on) + wash(AM) + /obj/machinery/shower/proc/convertHeat() - switch(watertemp) - if("boiling") + switch(current_temperature) + if(SHOWER_BOILING) return 340.15 - if("normal") + if(SHOWER_NORMAL) return 310.15 - if("freezing") + if(SHOWER_FREEZING) return 230.15 + //Yes, showers are super powerful as far as washing goes. -/obj/machinery/shower/proc/wash(atom/movable/O as obj|mob) - if(!on) return +/obj/machinery/shower/proc/wash(atom/target) + if(!on) + return + + if(isitem(target)) + var/obj/item/item = target + item.extinguish() - if(istype(O, /obj/item)) - var/obj/item/I = O - I.extinguish() + target.water_act(100, convertHeat(), src) - O.water_act(100, convertHeat(), src) + if(isliving(target)) + var/mob/living/l_target = target + l_target.ExtinguishMob() + l_target.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily + to_chat(l_target, span_warning("You've been drenched in water!")) - if(isliving(O)) - var/mob/living/L = O - L.ExtinguishMob() - L.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily - to_chat(L, "You've been drenched in water!") - L.clean_blood() + target.clean_blood() - if(isturf(loc)) - var/turf/tile = loc - loc.clean_blood() - for(var/obj/effect/E in tile) - if(E.is_cleanable()) - qdel(E) /obj/machinery/shower/process() - if(!on || !mobpresent) - return - for(var/mob/living/carbon/C in loc) - if(prob(33)) - wash(C) //re-applies water and re-cleans mob while they remain under the shower, 33% chance per process to avoid message spam/quick death - check_heat(C) + if(on) + if(isturf(loc)) + var/turf/tile = loc + tile.water_act(100, convertHeat(), src) + tile.clean_blood() + for(var/obj/effect/effect in tile) + if(effect.is_cleanable()) + qdel(effect) + for(var/thing in loc) + wash(thing) + else + on = FALSE + soundloop.stop() + handle_mist() + update_icon(UPDATE_OVERLAYS) -/obj/machinery/shower/proc/check_heat(mob/M as mob) - if(!on || watertemp == "normal") + +/obj/machinery/shower/proc/check_heat(mob/M) + if(current_temperature == SHOWER_NORMAL) return if(iscarbon(M)) var/mob/living/carbon/C = M - if(watertemp == "freezing") + if(current_temperature == SHOWER_FREEZING) //C.bodytemperature = max(80, C.bodytemperature - 80) to_chat(C, "The water is freezing!") - return - if(watertemp == "boiling") + + else if(current_temperature == SHOWER_BOILING) //C.bodytemperature = min(500, C.bodytemperature + 35) C.adjustFireLoss(5) to_chat(C, "The water is searing!") - return + +#undef SHOWER_FREEZING +#undef SHOWER_NORMAL +#undef SHOWER_BOILING /obj/item/bikehorn/rubberducky @@ -502,7 +525,7 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "sink" desc = "A sink used for washing one's hands and face." - anchored = 1 + anchored = TRUE var/busy = 0 //Something's being washed at the moment var/can_move = 1 //if the sink can be disconnected and moved var/can_rotate = 1 //if the sink can be rotated to face alternate directions @@ -621,10 +644,9 @@ var/list/dir_choices = list("North" = NORTH, "East" = EAST, "South" = SOUTH, "West" = WEST) var/selected = input(user, "Select a direction for the connector.", "Connector Direction") in dir_choices dir = dir_choices[selected] - update_icon() //is this necessary? probably not + update_icon(UPDATE_ICON_STATE) -/obj/structure/sink/update_icon() - ..() +/obj/structure/sink/update_icon_state() layer = OBJ_LAYER if(!anchored) pixel_x = 0 @@ -741,9 +763,9 @@ if(do_after(user, 30, target = user)) user.visible_message("[user] finishes building a new [result_name]!", "You finish building a new [result_name]!") var/obj/structure/S = new result(T) - S.anchored = 0 + S.anchored = FALSE S.dir = user.dir - S.update_icon() + S.update_icon(UPDATE_ICON_STATE) user.temporarily_remove_item_from_inventory(src, force = TRUE) qdel(src) if(prob(50)) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 4a66c4326cd..0c4249e085c 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -50,7 +50,7 @@ setDir(ini_dir) move_update_air(T) -/obj/structure/windoor_assembly/update_icon() +/obj/structure/windoor_assembly/update_icon_state() var/temp_state = state if(temp_state == "03") temp_state = "02" @@ -162,7 +162,7 @@ add_fingerprint(user) //Update to reflect changes(if applicable) - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/windoor_assembly/crowbar_act(mob/user, obj/item/I) //Crowbar to complete the assembly, Step 7 complete. if(state != "03") @@ -228,7 +228,7 @@ state = "02" electronics.forceMove(loc) electronics = null - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/windoor_assembly/wirecutter_act(mob/user, obj/item/I) if(state != "02") @@ -243,7 +243,7 @@ new/obj/item/stack/cable_coil(get_turf(user), 1) state = "01" name = "[(src.secure) ? "secure" : ""] anchored windoor assembly" - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/windoor_assembly/wrench_act(mob/user, obj/item/I) if(state != "01") @@ -274,7 +274,7 @@ to_chat(user, "You loosen bolts on [src].") anchored = FALSE name = "[(src.secure) ? "secure" : ""] windoor assembly" - update_icon() + update_icon(UPDATE_ICON_STATE) /obj/structure/windoor_assembly/welder_act(mob/user, obj/item/I) if(state != "01") @@ -312,7 +312,7 @@ setDir(target_dir) ini_dir = dir - update_icon() + update_icon(UPDATE_ICON_STATE) return TRUE /obj/structure/windoor_assembly/AltClick(mob/user) @@ -339,5 +339,5 @@ facing = "l" to_chat(usr, "The windoor will now slide to the left.") - update_icon() - return + update_icon(UPDATE_ICON_STATE) + diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 1d8ea14736a..316cfc4afc9 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -44,7 +44,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", var/glass_type = /obj/item/stack/sheet/glass var/glass_amount = 1 var/cancolor = FALSE - var/image/crack_overlay + var/mutable_appearance/crack_overlay var/list/debris = list() var/real_explosion_block //ignore this, just use explosion_block var/breaksound = "shatter" @@ -325,6 +325,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", if(I.use_tool(src, user, 40, volume = I.tool_volume)) obj_integrity = max_integrity WELDER_REPAIR_SUCCESS_MESSAGE + update_icon(UPDATE_OVERLAYS) /obj/structure/window/proc/check_state(checked_state) if(state == checked_state) @@ -478,23 +479,25 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", //This proc is used to update the icons of nearby windows. /obj/structure/window/proc/update_nearby_icons() - update_icon() + update_icon(UPDATE_OVERLAYS) if(smooth) queue_smooth_neighbors(src) -/obj/structure/window/update_icon() - if(!QDELETED(src)) - if(!fulltile) - return - var/ratio = obj_integrity / max_integrity - ratio = CEILING(ratio*4, 1) * 25 - if(smooth) - queue_smooth(src) - overlays -= crack_overlay - if(ratio > 75) - return - crack_overlay = image('icons/obj/structures.dmi',"damage[ratio]",-(layer+0.1)) - overlays += crack_overlay +/obj/structure/window/update_overlays() + . = ..() + if(QDELETED(src) || !fulltile) + return + + var/ratio = obj_integrity / max_integrity + ratio = CEILING(ratio * 4, 1) * 25 + if(smooth) + queue_smooth(src) + if(ratio > 75) + return + + crack_overlay = mutable_appearance('icons/obj/structures.dmi', "damage[ratio]", -(layer + 0.01), appearance_flags = RESET_COLOR) + . += crack_overlay + /obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() @@ -596,35 +599,38 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", use_power(5) active = !active - update_icon() + update_icon(UPDATE_ICON_STATE) - for(var/obj/structure/window/reinforced/polarized/W in range(src,range)) - if(W.id == src.id || !W.id) - spawn(0) - W.toggle() - return - for(var/obj/machinery/door/airlock/G in range(src,range)) - if(G.id == src.id) - spawn(0) - if(G.glass) - G.airlock_material = null - G.glass = FALSE - G.update_icon() - if(G.density) - G.opacity = 1 - else - G.airlock_material = "glass" - G.glass = TRUE - G.update_icon() - G.opacity = 0 - return + for(var/obj/structure/window/reinforced/polarized/window in range(src,range)) + if(window.id == id || !window.id) + INVOKE_ASYNC(window, TYPE_PROC_REF(/obj/structure/window/reinforced/polarized, toggle)) -/obj/machinery/button/windowtint/power_change() - ..() + for(var/obj/machinery/door/airlock/airlock in range(src,range)) + if(airlock.id == id) + INVOKE_ASYNC(src, PROC_REF(async_update), airlock) + + +/obj/machinery/button/windowtint/proc/async_update(obj/machinery/door/airlock/airlock) + if(airlock.glass) + airlock.airlock_material = null + airlock.glass = FALSE + airlock.update_icon() + if(airlock.density) + airlock.set_opacity(TRUE) + else + airlock.airlock_material = "glass" + airlock.glass = TRUE + airlock.update_icon() + airlock.set_opacity(FALSE) + + +/obj/machinery/button/windowtint/power_change(forced = FALSE) + if(!..()) + return if(active && !powered(power_channel)) toggle_tint() -/obj/machinery/button/windowtint/update_icon() +/obj/machinery/button/windowtint/update_icon_state() icon_state = "light[active]" /obj/structure/window/plasmabasic @@ -900,7 +906,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", /obj/structure/window/reinforced/clockwork/ratvar_act() obj_integrity = max_integrity - update_icon() + update_icon(UPDATE_OVERLAYS) /obj/structure/window/reinforced/clockwork/narsie_act() take_damage(rand(25, 75), BRUTE) diff --git a/code/game/objects/structures/wryn.dm b/code/game/objects/structures/wryn.dm index 5afad33eac2..c10d16b84ae 100644 --- a/code/game/objects/structures/wryn.dm +++ b/code/game/objects/structures/wryn.dm @@ -68,41 +68,29 @@ plane = FLOOR_PLANE icon_state = "wax_floor" max_integrity = 10 + var/current_dir var/static/list/floorImageCache -/obj/structure/wryn/floor/proc/updateOverlays() - - overlays.Cut() - - if(!floorImageCache || !floorImageCache.len) - floorImageCache = list() - floorImageCache.len = 4 - floorImageCache["north"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_n", layer=2.11, pixel_y = -32) - floorImageCache["south"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_s", layer=2.11, pixel_y = 32) - floorImageCache["east"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_e", layer=2.11, pixel_x = -32) - floorImageCache["west"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_w", layer=2.11, pixel_x = 32) - - var/turf/N = get_step(src, NORTH) - var/turf/S = get_step(src, SOUTH) - var/turf/E = get_step(src, EAST) - var/turf/W = get_step(src, WEST) - if(!locate(/obj/structure/wryn) in N.contents) - if(istype(N, /turf/simulated/floor)) - overlays += floorImageCache["south"] - if(!locate(/obj/structure/wryn) in S.contents) - if(istype(S, /turf/simulated/floor)) - overlays += floorImageCache["north"] - if(!locate(/obj/structure/wryn) in E.contents) - if(istype(E, /turf/simulated/floor)) - overlays += floorImageCache["west"] - if(!locate(/obj/structure/wryn) in W.contents) - if(istype(W, /turf/simulated/floor)) - overlays += floorImageCache["east"] + +/obj/structure/wryn/floor/update_overlays() + . = ..() + for(var/check_dir in GLOB.cardinal) + var/turf/check = get_step(src, check_dir) + if(issimulatedturf(check) && !(locate(/obj/structure/wryn) in check)) + . += floorImageCache["[GetOppositeDir(check_dir)]"] /obj/structure/wryn/floor/proc/fullUpdateWeedOverlays() - for(var/obj/structure/wryn/floor/W in range(1,src)) - W.updateOverlays() + if(!length(floorImageCache)) + floorImageCache = list(4) + floorImageCache["[NORTH]"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_n", layer=2.11, pixel_y = -32) + floorImageCache["[SOUTH]"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_s", layer=2.11, pixel_y = 32) + floorImageCache["[EAST]"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_e", layer=2.11, pixel_x = -32) + floorImageCache["[WEST]"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_w", layer=2.11, pixel_x = 32) + + for(var/obj/structure/wryn/floor/floor in range(1,src)) + floor.update_icon(UPDATE_OVERLAYS) + /obj/structure/wryn/floor/New(pos) ..() diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index cd9196f7eed..dbcb598f793 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -11,7 +11,7 @@ name = "engine" icon = 'icons/turf/shuttle/misc.dmi' density = 1 - anchored = 1.0 + anchored = TRUE resistance_flags = INDESTRUCTIBLE // То что у нас двигатели ломаются от пары пуль - бред var/list/obj/structure/fillers = list() // Для коллизии более больших двигателей diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 6d15f484e9e..d7859121be4 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -3,6 +3,7 @@ name = "station" var/wet = 0 var/image/wet_overlay = null + var/mutable_appearance/melting_olay var/thermite = 0 oxygen = MOLES_O2STANDARD @@ -83,7 +84,7 @@ switch(src.wet) if(TURF_WET_WATER) if(!(M.slip("the wet floor", WATER_WEAKEN_TIME, tilesSlipped = 0, walkSafely = 1))) - M.inertia_dir = 0 + M.inertia_dir = NONE return if(TURF_WET_LUBE) //lube @@ -92,7 +93,7 @@ if(TURF_WET_ICE) // Ice if(M.slip("the icy floor", 4 SECONDS, tilesSlipped = 0, walkSafely = 0)) - M.inertia_dir = 0 + M.inertia_dir = NONE if(prob(5)) var/obj/item/organ/external/affected = M.get_organ(BODY_ZONE_HEAD) if(affected) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index b5c04cb2031..9f5842de11d 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -125,12 +125,11 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama /turf/simulated/floor/blob_act(obj/structure/blob/B) return -/turf/simulated/floor/update_icon() +/turf/simulated/floor/update_overlays() + . = ..() update_visuals() - overlays -= current_overlay if(current_overlay) - overlays.Add(current_overlay) - return 1 + . += current_overlay /turf/simulated/floor/proc/break_tile_to_plating() var/turf/simulated/floor/plating/T = make_plating(FALSE) diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index d44b6ecb80c..b3dcf69dee9 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -114,7 +114,7 @@ . = ..() update_icon() -/turf/simulated/floor/grass/update_icon() +/turf/simulated/floor/grass/update_icon_state() icon_state = "grass[pick("1","2","3","4")]" /turf/simulated/floor/grass/attackby(obj/item/C, mob/user, params) @@ -159,13 +159,13 @@ . = ..() update_icon() + /turf/simulated/floor/carpet/broken_states() return list("damaged") -/turf/simulated/floor/carpet/update_icon() - if(!..()) - return - dir = 0 //Prevents wrong smoothing + +/turf/simulated/floor/carpet/update_icon_state() + dir = NONE //Prevents wrong smoothing if(!broken && !burnt) if(smooth) queue_smooth(src) diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm index 58e2a708994..53418593002 100644 --- a/code/game/turfs/simulated/floor/indestructible.dm +++ b/code/game/turfs/simulated/floor/indestructible.dm @@ -274,7 +274,7 @@ icon = 'icons/turf/floors/seadrop-o.dmi' layer = MOB_LAYER + 0.1 smooth = SMOOTH_TRUE - anchored = 1 + anchored = TRUE canSmoothWith = list( /turf/simulated/floor/indestructible/beach/water/drop, /turf/simulated/floor/indestructible/beach/water/drop/dense, /turf/simulated/floor/indestructible/beach/water, /turf/simulated/floor/indestructible/beach/water/dense, diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index dfd63d5ea4c..40851bd4313 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -23,49 +23,52 @@ . = ..() update_icon() + /turf/simulated/floor/light/broken_states() return list("light_broken") -/turf/simulated/floor/light/update_icon() - ..() - if(on) - switch(state) - if(LIGHTFLOOR_ON) - icon_state = "light_on" - set_light(5, null,LIGHT_COLOR_LIGHTBLUE) - if(LIGHTFLOOR_WHITE) - icon_state = "light_on-w" - set_light(5, null,LIGHT_COLOR_WHITE) - if(LIGHTFLOOR_RED) - icon_state = "light_on-r" - set_light(5, null,LIGHT_COLOR_RED) - if(LIGHTFLOOR_GREEN) - icon_state = "light_on-g" - set_light(5, null,LIGHT_COLOR_PURE_GREEN) - if(LIGHTFLOOR_YELLOW) - icon_state = "light_on-y" - set_light(5, null,"#FFFF00") - if(LIGHTFLOOR_BLUE) - icon_state = "light_on-b" - set_light(5, null,LIGHT_COLOR_DARKBLUE) - if(LIGHTFLOOR_PURPLE) - icon_state = "light_on-p" - set_light(5, null,LIGHT_COLOR_PURPLE) - if(LIGHTFLOOR_GENERICCYCLE) - icon_state = "light_on-cycle_all" - set_light(5, null,LIGHT_COLOR_WHITE) - if(LIGHTFLOOR_CYCLEA) - icon_state = "light_on-dancefloor_A" - set_light(5,null,LIGHT_COLOR_RED) - if(LIGHTFLOOR_CYCLEB) - icon_state = "light_on-dancefloor_B" - set_light(5, null,LIGHT_COLOR_DARKBLUE) - else - icon_state = "light_off" - set_light(0) - else + +/turf/simulated/floor/light/update_icon_state() + if(!on) set_light(0) icon_state = "light_off" + return + + switch(state) + if(LIGHTFLOOR_ON) + icon_state = "light_on" + set_light(5, null,LIGHT_COLOR_LIGHTBLUE) + if(LIGHTFLOOR_WHITE) + icon_state = "light_on-w" + set_light(5, null,LIGHT_COLOR_WHITE) + if(LIGHTFLOOR_RED) + icon_state = "light_on-r" + set_light(5, null,LIGHT_COLOR_RED) + if(LIGHTFLOOR_GREEN) + icon_state = "light_on-g" + set_light(5, null,LIGHT_COLOR_PURE_GREEN) + if(LIGHTFLOOR_YELLOW) + icon_state = "light_on-y" + set_light(5, null,"#FFFF00") + if(LIGHTFLOOR_BLUE) + icon_state = "light_on-b" + set_light(5, null,LIGHT_COLOR_DARKBLUE) + if(LIGHTFLOOR_PURPLE) + icon_state = "light_on-p" + set_light(5, null,LIGHT_COLOR_PURPLE) + if(LIGHTFLOOR_GENERICCYCLE) + icon_state = "light_on-cycle_all" + set_light(5, null,LIGHT_COLOR_WHITE) + if(LIGHTFLOOR_CYCLEA) + icon_state = "light_on-dancefloor_A" + set_light(5,null,LIGHT_COLOR_RED) + if(LIGHTFLOOR_CYCLEB) + icon_state = "light_on-dancefloor_B" + set_light(5, null,LIGHT_COLOR_DARKBLUE) + else + icon_state = "light_off" + set_light(0) + /turf/simulated/floor/light/BeforeChange() set_light(0) diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm index dd3b20f0b17..4440de90854 100644 --- a/code/game/turfs/simulated/floor/mineral.dm +++ b/code/game/turfs/simulated/floor/mineral.dm @@ -17,12 +17,11 @@ /turf/simulated/floor/mineral/broken_states() return list("[initial(icon_state)]_dam") -/turf/simulated/floor/mineral/update_icon() - if(!..()) - return 0 - if(!broken && !burnt) - if(!(icon_state in icons)) - icon_state = initial(icon_state) + +/turf/simulated/floor/mineral/update_icon_state() + if(!broken && !burnt && !(icon_state in icons)) + icon_state = initial(icon_state) + //PLASMA /turf/simulated/floor/mineral/plasma diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index 99f943c53e4..366d9d2a12b 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -8,9 +8,7 @@ /turf/simulated/floor/plasteel/burnt_states() return list("floorscorched1", "floorscorched2") -/turf/simulated/floor/plasteel/update_icon() - if(!..()) - return 0 +/turf/simulated/floor/plasteel/update_icon_state() if(!broken && !burnt) icon_state = icon_regular_floor dir = floor_regular_dir diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 8896f455dda..a37d7d83633 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -32,9 +32,7 @@ . = ..() burn_tile() -/turf/simulated/floor/plating/update_icon() - if(!..()) - return +/turf/simulated/floor/plating/update_icon_state() if(!broken && !burnt) icon_state = icon_plating //Because asteroids are 'platings' too. @@ -191,7 +189,7 @@ /turf/simulated/floor/engine/attackby(obj/item/C, mob/user, params) if(!C || !user) return - if(istype(C, /obj/item/wrench)) + if(C.tool_behaviour == TOOL_WRENCH) to_chat(user, span_notice("You begin removing rods...")) playsound(src, C.usesound, 80, 1) if(do_after(user, 30 * C.toolspeed * gettoolspeedmod(user), target = src)) @@ -227,12 +225,20 @@ /turf/simulated/floor/engine/cult name = "engraved floor" icon_state = "cult" + var/holy = FALSE + /turf/simulated/floor/engine/cult/Initialize(mapload) . = ..() - if(SSticker.mode)//only do this if the round is going..otherwise..fucking asteroid.. - if(!icon_state == "holy") - icon_state = SSticker.cultdat.cult_floor_icon_state + update_icon(UPDATE_ICON_STATE) + + +/turf/simulated/floor/engine/cult/update_icon_state() + if(SSticker?.cultdat && !holy) + icon_state = SSticker.cultdat.cult_floor_icon_state + return + icon_state = initial(icon_state) + /turf/simulated/floor/engine/cult/narsie_act() return @@ -246,6 +252,7 @@ /turf/simulated/floor/engine/cult/holy icon_state = "holy" + holy = TRUE //air filled floors; used in atmos pressure chambers @@ -361,7 +368,7 @@ icon_state = "ironfoam" metal = MFOAM_IRON -/turf/simulated/floor/plating/metalfoam/update_icon() +/turf/simulated/floor/plating/metalfoam/update_icon_state() switch(metal) if(MFOAM_ALUMINUM) icon_state = "metalfoam" @@ -418,14 +425,6 @@ /turf/simulated/floor/plating/metalfoam/proc/smash() ChangeTurf(baseturf) -/turf/simulated/floor/plating/abductor - name = "alien floor" - icon_state = "alienpod1" - -/turf/simulated/floor/plating/abductor/Initialize(mapload) - . = ..() - icon_state = "alienpod[rand(1,9)]" - /turf/simulated/floor/plating/ice name = "ice sheet" desc = "A sheet of solid ice. Looks slippery." diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index 4c23b51b895..53f66b42a32 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -104,14 +104,16 @@ else update_icon() -/turf/simulated/mineral/update_icon() + +/turf/simulated/mineral/update_overlays() + . = ..() if(hardness != initial(hardness)) var/amount = hardness var/mutable_appearance/cracks = mutable_appearance('icons/turf/mining.dmi',"rock_cracks_[amount]",ON_EDGED_TURF_LAYER) var/matrix/M = new M.Translate(4,4) cracks.transform = M - add_overlay(cracks) + . += cracks /turf/simulated/mineral/attack_animal(mob/living/simple_animal/user) diff --git a/code/game/turfs/simulated/shuttle.dm b/code/game/turfs/simulated/shuttle.dm index 10c78c46610..5d010f0649c 100644 --- a/code/game/turfs/simulated/shuttle.dm +++ b/code/game/turfs/simulated/shuttle.dm @@ -61,7 +61,7 @@ /turf/simulated/wall/shuttle/try_decon(obj/item/I, mob/user, params) return -/turf/simulated/wall/shuttle/thermitemelt(mob/user as mob, speed) +/turf/simulated/wall/shuttle/thermitemelt(mob/user, time) return /turf/simulated/wall/shuttle/nodiagonal diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 07d46679d71..752889d54f8 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -25,6 +25,8 @@ thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall + var/melting = FALSE //TRUE if wall is currently being melted with thermite + var/can_dismantle_with_welder = TRUE var/hardness = 40 //lower numbers are harder. Used to determine the probability of a hulk smashing through. var/slicing_duration = 100 @@ -71,27 +73,25 @@ if(rotting) . += span_warning("There is fungus growing on [src].") -/turf/simulated/wall/update_icon() + +/turf/simulated/wall/update_overlays() + . = ..() if(!damage_overlays[1]) //list hasn't been populated generate_overlays() queue_smooth(src) if(!damage) - if(damage_overlay) - overlays -= damage_overlays[damage_overlay] - damage_overlay = 0 return - var/overlay = round(damage / damage_cap * damage_overlays.len) + 1 - if(overlay > damage_overlays.len) - overlay = damage_overlays.len + var/overlay = round(damage / damage_cap * length(damage_overlays)) + 1 + if(overlay > length(damage_overlays)) + overlay = length(damage_overlays) if(damage_overlay && overlay == damage_overlay) //No need to update. return - if(damage_overlay) - overlays -= damage_overlays[damage_overlay] - overlays += damage_overlays[overlay] - damage_overlay = overlay + + . += damage_overlays[overlay] + /turf/simulated/wall/proc/generate_overlays() var/alpha_inc = 256 / damage_overlays.len @@ -245,35 +245,87 @@ /turf/simulated/wall/burn_down() if(istype(sheet_type, /obj/item/stack/sheet/mineral/diamond)) return - ChangeTurf(/turf/simulated/floor) + return ChangeTurf(/turf/simulated/floor) + -/turf/simulated/wall/proc/thermitemelt(mob/user as mob, speed) - var/wait = 100 - if(speed) - wait = speed +#define THERMITE_PER_SECOND 2.5 +#define DAMAGE_PER_SECOND 60 + +/** + * Melts down wall into its base turf. + * + * Arguments: + * * user - who used thermite, optional argument used to show message. + * * time - optional override; thermite reagent will not be used for melting, only passed time matters. + */ +/turf/simulated/wall/proc/thermitemelt(mob/user, time) + set waitfor = FALSE + + if(melting) + return if(istype(sheet_type, /obj/item/stack/sheet/mineral/diamond)) return - var/obj/effect/overlay/O = new/obj/effect/overlay( src ) - O.name = "Thermite" - O.desc = "Looks hot." - O.icon = 'icons/effects/fire.dmi' - O.icon_state = "2" - O.anchored = 1 - O.density = 1 - O.layer = 5 + var/obj/effect/overlay/visuals = new(src) + visuals.name = "Thermite" + visuals.desc = "Looks hot." + visuals.icon = 'icons/effects/fire.dmi' + visuals.icon_state = "2" + visuals.anchored = TRUE + visuals.density = TRUE + visuals.layer = FLY_LAYER - src.ChangeTurf(/turf/simulated/floor/plating) - - var/turf/simulated/floor/F = src - F.burn_tile() - F.icon_state = "plating" if(user) - to_chat(user, span_warning("The thermite starts melting through the wall.")) + to_chat(user, span_warning("The thermite starts melting through [src].")) + + if(time) + melting = TRUE + var/sound_timer = 10 + while(time > 0) + if(QDELETED(src)) + return + sound_timer++ + if(sound_timer >= 10) + sound_timer = 0 + playsound(src, 'sound/items/welder.ogg', 100, TRUE) + time = max(0, time - 0.1 SECONDS) + sleep(0.1 SECONDS) + if(QDELETED(src)) + return + var/turf/simulated/floor/our_floor = burn_down() + our_floor.burn_tile() + our_floor.cut_overlay(melting_olay) + if(visuals) + qdel(visuals) + return + + melting = TRUE + + while(reagents.get_reagent_amount("thermite") > 0) + if(QDELETED(src)) + return + reagents.remove_reagent("thermite", THERMITE_PER_SECOND) + if(damage_cap - damage <= DAMAGE_PER_SECOND) + var/turf/simulated/floor/our_floor = burn_down() + our_floor.burn_tile() + break + take_damage(DAMAGE_PER_SECOND) + playsound(src, 'sound/items/welder.ogg', 100, TRUE) + sleep(1 SECONDS) + + if(QDELETED(src)) + return + + if(iswallturf(src)) + melting = FALSE + + cut_overlay(melting_olay) + if(visuals) + qdel(visuals) + +#undef THERMITE_PER_SECOND +#undef DAMAGE_PER_SECOND - spawn(wait) - if(O) qdel(O) - return //Interactions @@ -353,7 +405,7 @@ /turf/simulated/wall/welder_act(mob/user, obj/item/I) . = TRUE - if(thermite && I.use_tool(src, user, volume = I.tool_volume)) + if(reagents?.get_reagent_amount("thermite") && I.use_tool(src, user, volume = I.tool_volume)) thermitemelt(user) return if(rotting) diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm index 19d8ef7d187..739e68a34fd 100644 --- a/code/game/turfs/simulated/walls_indestructible.dm +++ b/code/game/turfs/simulated/walls_indestructible.dm @@ -59,7 +59,7 @@ /turf/simulated/wall/indestructible/rcd_deconstruct_act() return RCD_NO_ACT -/turf/simulated/wall/indestructible/thermitemelt(mob/user as mob, speed) +/turf/simulated/wall/indestructible/thermitemelt(mob/user, time) return /turf/simulated/wall/indestructible/fakeglass diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 5caf1ae9d52..ee8318877f8 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -267,7 +267,7 @@ /turf/simulated/wall/mineral/titanium/nodecon/try_decon(obj/item/I, mob/user, params) return -/turf/simulated/wall/mineral/titanium/nodecon/thermitemelt(mob/user as mob, speed) +/turf/simulated/wall/mineral/titanium/nodecon/thermitemelt(mob/user, time) return /turf/simulated/wall/mineral/titanium/nodecon/burn_down() diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index 037bcda8ef2..b7afc177525 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -8,6 +8,7 @@ sheet_type = /obj/item/stack/sheet/runed_metal sheet_amount = 1 girder_type = /obj/structure/girder/cult + var/holy = FALSE /turf/simulated/wall/cult_fake name = "runed metal wall" @@ -20,12 +21,18 @@ sheet_amount = 1 girder_type = /obj/structure/girder/cult_fake + /turf/simulated/wall/cult/Initialize(mapload) . = ..() - if(SSticker.mode)//game hasn't started offically don't do shit.. - new /obj/effect/temp_visual/cult/turf(src) - if(!icon_state == "holy") - icon_state = SSticker.cultdat.cult_wall_icon_state + update_icon(UPDATE_ICON_STATE) + + +/turf/simulated/wall/cult/update_icon_state() + if(SSticker?.cultdat && !holy) + icon_state = SSticker.cultdat.cult_wall_icon_state + return + icon_state = initial(icon_state) + /turf/simulated/wall/cult_fake/Initialize(mapload) . = ..() @@ -42,6 +49,7 @@ icon_state = "holy" sheet_type = /obj/item/stack/sheet/metal girder_type = /obj/structure/girder + holy = TRUE /turf/simulated/wall/cult/artificer/break_wall() new /obj/effect/temp_visual/cult/turf(get_turf(src)) diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index 6739b559b77..2a4ddf66252 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -93,7 +93,7 @@ return ..() /turf/simulated/wall/r_wall/welder_act(mob/user, obj/item/I) - if(thermite && I.use_tool(src, user, volume = I.tool_volume)) + if(reagents?.get_reagent_amount("thermite") && I.use_tool(src, user, volume = I.tool_volume)) thermitemelt(user) return TRUE if(!(d_state in list(RWALL_COVER, RWALL_SUPPORT_RODS, RWALL_CUT_COVER))) @@ -232,9 +232,8 @@ if(prob(30)) dismantle_wall() -/turf/simulated/wall/r_wall/update_icon() - . = ..() +/turf/simulated/wall/r_wall/update_icon_state() if(d_state) icon_state = "r_wall-[d_state]" smooth = SMOOTH_FALSE @@ -243,6 +242,7 @@ smooth = SMOOTH_TRUE icon_state = "" + /turf/simulated/wall/r_wall/devastate_wall() new sheet_type(src, sheet_amount) new /obj/item/stack/sheet/metal(src, 2) diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index e558733e1af..816a23dce65 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -62,9 +62,9 @@ /turf/space/transit/Initialize(mapload) . = ..() - update_icon() + update_icon(UPDATE_ICON_STATE) -/turf/space/transit/update_icon() +/turf/space/transit/update_icon_state() var/p = 9 var/angle = 0 var/state = 1 diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 15e049bb4ae..03c09ca7fcc 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -8,6 +8,7 @@ var/slowdown = 0 //negative for faster, positive for slower var/transparent_floor = FALSE //used to check if pipes should be visible under the turf or not + /// Set if the turf should appear on a different layer while in-game and map editing, otherwise use normal layer. var/real_layer = TURF_LAYER layer = MAP_EDITOR_TURF_LAYER @@ -375,19 +376,24 @@ L.Add(T) return L -//Idem, but don't check for ID and goes through open doors -/turf/proc/AdjacentTurfs(list/closed) - var/list/L = new() - var/turf/simulated/T - for(var/dir in GLOB.alldirs2) //arbitrarily ordered list to favor non-diagonal moves in case of ties + +/// Returns the adjacent turfs. Can check for density or cardinal directions only instead of all 8, or just dense turfs entirely. dense_only takes precedence over open_only. +/turf/proc/AdjacentTurfs(open_only = FALSE, cardinal_only = FALSE, dense_only = FALSE) + var/list/L = list() + var/turf/T + var/list/directions = cardinal_only ? GLOB.cardinal : GLOB.alldirs + for(var/dir in directions) T = get_step(src, dir) - if(T in closed) //turf already proceeded by A* + if(!istype(T)) continue - if(istype(T) && !T.density) - if(!CanAtmosPass(T)) - L.Add(T) + if(dense_only && !T.density) + continue + if((open_only && T.density) && !dense_only) + continue + L.Add(T) return L + // check for all turfs, including space ones /turf/proc/AdjacentTurfsSpace(obj/item/card/id/ID = null, list/closed)//check access if one is passed var/list/L = new() @@ -456,7 +462,7 @@ for(var/obj/O in contents) //this is for deleting things like wires contained in the turf if(O.level != 1) continue - if(O.invisibility == INVISIBILITY_MAXIMUM) + if(O.invisibility == INVISIBILITY_MAXIMUM || O.invisibility == INVISIBILITY_ABSTRACT) O.singularity_act() ChangeTurf(baseturf) return 2 diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index b2466aafa1b..61f3037598d 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2313,7 +2313,7 @@ if(!P.ico) P.ico = new P.ico += "paper_stamp-[stampvalue]" - P.overlays += stampoverlay + LAZYADD(P.stamp_overlays, stampoverlay) P.stamps += "
"
P.update_icon()
P.faxmachineid = fax.UID()
@@ -2408,7 +2408,7 @@
if(!P.ico)
P.ico = new
P.ico += "paper_stamp-[stampvalue]"
- P.overlays += stampoverlay
+ LAZYADD(P.stamp_overlays, stampoverlay)
P.stamps += ""
P.update_icon()
fax.receivefax(P)
@@ -2620,15 +2620,14 @@
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/stamp/centcom
- P.overlays += stampoverlay
P.stamps += ""
else if(stamptype == "text")
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/stamp
- P.overlays += stampoverlay
P.stamps += "[stampvalue]" + LAZYADD(P.stamp_overlays, stampoverlay) if(destination != "All Departments") if(!fax.receivefax(P)) @@ -3647,10 +3646,8 @@ hunter_mob.equipOutfit(O, FALSE) var/obj/item/pinpointer/advpinpointer/N = new /obj/item/pinpointer/advpinpointer(hunter_mob) hunter_mob.equip_to_slot_or_del(N, slot_in_backpack) - N.mode = 3 //MODE_ADV, not defined here N.setting = 2 //SETTING_OBJECT, not defined here - N.target = H - N.pinpoint_at(N.target) + N.pinpoint_at(H) N.modelocked = TRUE if(!locate(/obj/item/implant/dust, hunter_mob)) var/obj/item/implant/dust/D = new /obj/item/implant/dust(hunter_mob) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index c234228a186..f3db9508e82 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -661,7 +661,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) F.active = 1 F.state = 2 F.power = 250 - F.anchored = 1 + F.anchored = TRUE F.warming_up = 3 F.start_fields() F.update_icon() diff --git a/code/modules/admin/verbs/honksquad.dm b/code/modules/admin/verbs/honksquad.dm index 7ea997d11b1..bbb27a3be88 100644 --- a/code/modules/admin/verbs/honksquad.dm +++ b/code/modules/admin/verbs/honksquad.dm @@ -97,7 +97,7 @@ GLOBAL_VAR_INIT(sent_clownsequritysquad, 0) new_honksquad.mind.assigned_role = SPECIAL_ROLE_HONKSQUAD new_honksquad.mind.special_role = SPECIAL_ROLE_HONKSQUAD new_honksquad.mind.offstation_role = TRUE - new_honksquad.add_language("Clownish") + new_honksquad.add_language(LANGUAGE_CLOWN) new_honksquad.change_voice() SSticker.mode.traitors |= new_honksquad.mind//Adds them to current traitor list. Which is really the extra antagonist list. new_honksquad.equip_honksquad(honk_leader_selected, rankName) diff --git a/code/modules/antagonists/changeling/changeling_datum.dm b/code/modules/antagonists/changeling/changeling_datum.dm index 8deac41e17f..abcaeda0bf5 100644 --- a/code/modules/antagonists/changeling/changeling_datum.dm +++ b/code/modules/antagonists/changeling/changeling_datum.dm @@ -343,7 +343,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E for(var/datum/language/language in new_languages) if(is_type_in_UID_list(language, absorbed_languages)) continue - owner.current.add_language("[language.name]") + owner.current.add_language(language.name) absorbed_languages += language.UID() @@ -352,8 +352,8 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E */ /datum/antagonist/changeling/proc/update_languages() for(var/lang_UID in absorbed_languages) - var/datum/language/lang = locateUID(lang_UID) - owner.current.add_language("[lang.name]") + var/datum/language/language = locateUID(lang_UID) + owner.current.add_language(language.name) /** @@ -378,10 +378,10 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E ignored_languages += human_user.dna.species.secondary_langs for(var/lang_UID in absorbed_languages) - var/datum/language/lang = locateUID(lang_UID) - if(lang.name in ignored_languages) + var/datum/language/language = locateUID(lang_UID) + if(language.name in ignored_languages) continue - user.remove_language("[lang.name]") + user.remove_language(language.name) /** diff --git a/code/modules/antagonists/changeling/powers/hivemind.dm b/code/modules/antagonists/changeling/powers/hivemind.dm index 4193596a411..113716a6494 100644 --- a/code/modules/antagonists/changeling/powers/hivemind.dm +++ b/code/modules/antagonists/changeling/powers/hivemind.dm @@ -35,11 +35,11 @@ GLOBAL_LIST_EMPTY(hivemind_bank) linglink.cling = cling linglink.Grant(user)*/ - if(!((GLOB.all_languages["Changeling"] in user.languages)||(GLOB.all_languages["Infiltrated changeling"] in user.languages))) + if(!((GLOB.all_languages[LANGUAGE_HIVE_CHANGELING] in user.languages)||(GLOB.all_languages[LANGUAGE_HIVE_EVENTLING] in user.languages))) if(!cling.evented) - user.add_language("Changeling") + user.add_language(LANGUAGE_HIVE_CHANGELING) else - user.add_language("Infiltrated changeling") + user.add_language(LANGUAGE_HIVE_EVENTLING) /datum/action/changeling/hivemind_pick/Remove(mob/user) @@ -52,10 +52,10 @@ GLOBAL_LIST_EMPTY(hivemind_bank) linglink.Remove(user) QDEL_NULL(linglink)*/ - if(GLOB.all_languages["Changeling"] in user.languages) - user.remove_language("Changeling") - if(GLOB.all_languages["Infiltrated changeling"] in user.languages) - user.remove_language("Infiltrated changeling") + if(GLOB.all_languages[LANGUAGE_HIVE_CHANGELING] in user.languages) + user.remove_language(LANGUAGE_HIVE_CHANGELING) + if(GLOB.all_languages[LANGUAGE_HIVE_EVENTLING] in user.languages) + user.remove_language(LANGUAGE_HIVE_EVENTLING) ..() @@ -67,10 +67,10 @@ GLOBAL_LIST_EMPTY(hivemind_bank) QDEL_NULL(linglink)*/ - if(owner && (GLOB.all_languages["Changeling"] in owner.languages)) - owner.remove_language("Changeling") - if(owner && (GLOB.all_languages["Infiltrated changeling"] in owner.languages)) - owner.remove_language("Infiltrated changeling") + if(owner && (GLOB.all_languages[LANGUAGE_HIVE_CHANGELING] in owner.languages)) + owner.remove_language(LANGUAGE_HIVE_CHANGELING) + if(owner && (GLOB.all_languages[LANGUAGE_HIVE_EVENTLING] in owner.languages)) + owner.remove_language(LANGUAGE_HIVE_EVENTLING) return ..() diff --git a/code/modules/antagonists/changeling/powers/linglink.dm b/code/modules/antagonists/changeling/powers/linglink.dm index 867600317bd..c33cfd6ffa9 100644 --- a/code/modules/antagonists/changeling/powers/linglink.dm +++ b/code/modules/antagonists/changeling/powers/linglink.dm @@ -76,11 +76,11 @@ to_chat(target, "You can now communicate in the changeling hivemind, say \":g message\" to communicate!") for(var/mob/ling in GLOB.mob_list) - if(GLOB.all_languages["Changeling"] in ling.languages) + if(GLOB.all_languages[LANGUAGE_HIVE_CHANGELING] in ling.languages) to_chat(ling, span_changeling("We can sense a foreign presence in the hivemind...")) cling?.is_linking = FALSE - target.add_language("Changeling") + target.add_language(LANGUAGE_HIVE_CHANGELING) target.say(":g AAAAARRRRGGGGGHHHHH!!") target.reagents.add_reagent("salbutamol", 40) // So they don't choke to death while you interrogate them @@ -95,7 +95,7 @@ if(QDELETED(target)) return - target.remove_language("Changeling") + target.remove_language(LANGUAGE_HIVE_CHANGELING) to_chat(target, span_userdanger("The link cannot be sustained any longer, your connection to the hivemind has faded!")) if(!QDELETED(user)) diff --git a/code/modules/antagonists/space_dragon/carp_rift.dm b/code/modules/antagonists/space_dragon/carp_rift.dm index ebaa9518fe9..a7e2f9cf6b4 100644 --- a/code/modules/antagonists/space_dragon/carp_rift.dm +++ b/code/modules/antagonists/space_dragon/carp_rift.dm @@ -92,6 +92,13 @@ return ..() +/obj/structure/carp_rift/update_icon_state() + if(charge_state == CHARGE_COMPLETED) + icon_state = "carp_rift_charged" + return + icon_state = (carp_stored > 0) ? "carp_rift_carpspawn" : "carp_rift" + + /obj/structure/carp_rift/process(seconds_per_tick) // If we're fully charged, just start mass spawning carp. if(charge_state == CHARGE_COMPLETED) @@ -132,7 +139,7 @@ // Can we increase the carp spawn pool size? if(last_carp_inc >= carp_interval) carp_stored += 3 - icon_state = "carp_rift_carpspawn" + update_icon(UPDATE_ICON_STATE) if(light_color != LIGHT_COLOR_PURPLE) light_color = LIGHT_COLOR_PURPLE update_light() @@ -146,7 +153,7 @@ GLOB.command_announcement.Announce("Пространственный объект достиг максимального энергетического заряда в зоне [initial(A.name)]. Пожалуйста, ожидайте.", "Отдел Изучения Дикой Природы") max_integrity = INFINITY obj_integrity = INFINITY - icon_state = "carp_rift_charged" + update_icon(UPDATE_ICON_STATE) light_color = LIGHT_COLOR_YELLOW update_light() armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) @@ -210,7 +217,7 @@ to_chat(newcarp, span_boldwarning("Вы прибыли, чтобы помочь космическому дракону защищать разломы. Следуйте поставленной миссии и защитите разлом любой ценой!")) carp_stored-- if(carp_stored <= 0 && charge_state < CHARGE_COMPLETED) - icon_state = "carp_rift" + update_icon(UPDATE_ICON_STATE) light_color = LIGHT_COLOR_BLUE update_light() return TRUE diff --git a/code/modules/antagonists/space_ninja/creeping_widow/creeping_widow_martial_art.dm b/code/modules/antagonists/space_ninja/creeping_widow/creeping_widow_martial_art.dm index 9094a9f4c16..00d7a1f3c83 100644 --- a/code/modules/antagonists/space_ninja/creeping_widow/creeping_widow_martial_art.dm +++ b/code/modules/antagonists/space_ninja/creeping_widow/creeping_widow_martial_art.dm @@ -15,7 +15,12 @@ icon = 'icons/obj/ninjaobjects.dmi' icon_state = "injector" attack_verb = list("poked", "prodded") - var/used = 0 + var/used = FALSE + + +/obj/item/creeping_widow_injector/update_icon_state() + icon_state = "injector[used ? "-used" : ""]" + /obj/item/creeping_widow_injector/attack_self(mob/living/carbon/human/user as mob) if(!used) @@ -26,13 +31,13 @@ var/datum/martial_art/ninja_martial_art/N = new/datum/martial_art/ninja_martial_art(null) N.teach(user) - used = 1 - icon_state = "injector-used" + used = TRUE + update_icon(UPDATE_ICON_STATE) desc = "A strange autoinjector made of a black metal.
It appears to be used up and empty." - return 0 - else - to_chat(user, "The [src] has been used already!") - return 1 + return FALSE + + to_chat(user, "The [src] has been used already!") + return TRUE // Ninja martial art datum diff --git a/code/modules/antagonists/space_ninja/machinery/ninja_mindscan_machine.dm b/code/modules/antagonists/space_ninja/machinery/ninja_mindscan_machine.dm index 3d56278ff8e..8f99583a893 100644 --- a/code/modules/antagonists/space_ninja/machinery/ninja_mindscan_machine.dm +++ b/code/modules/antagonists/space_ninja/machinery/ninja_mindscan_machine.dm @@ -26,7 +26,7 @@ /obj/machinery/ninja_mindscan_machine/Initialize() . = ..() - update_state_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/ninja_mindscan_machine/Destroy() if(occupant) @@ -54,7 +54,7 @@ ui_interact(user) /// Сюда вписать код ответственный за пихание оккупанта -/obj/machinery/ninja_mindscan_machine/MouseDrop_T(atom/movable/dropped as mob|obj, mob/user as mob) +/obj/machinery/ninja_mindscan_machine/MouseDrop_T(atom/movable/dropped, mob/user, params) // Только ниндзя умеет работать с этой машиной, но я всё равно оставлю проверки ниже во избежание других проблем. if(!isninja(user)) to_chat(user, span_boldwarning("ERROR!!! UNAUTORISED USER!!!")) @@ -106,6 +106,7 @@ if(!Adjacent(dropped_mob) && !Adjacent(user)) to_chat(user, span_boldnotice("You're not close enough to [src].")) return + . = TRUE if(dropped_mob != user) visible_message("[user] starts putting [dropped_mob] into the [src].") if(do_after(user, 20, target = dropped_mob)) @@ -156,7 +157,7 @@ to_chat(possible_occupant, span_notice("[on_enter_occupant_message]")) occupant = possible_occupant occupant.SetSleeping(120 SECONDS) - update_state_icon() + update_icon(UPDATE_ICON_STATE) desc = "[initial(desc)] ([occupant.name])" if(findtext("[possible_occupant.key]","@",1,2)) var/found_text = replacetext(possible_occupant.key, "@", "") @@ -172,7 +173,7 @@ return occupant.forceMove(get_turf(src)) occupant = null - update_state_icon() + update_icon(UPDATE_ICON_STATE) /obj/machinery/ninja_mindscan_machine/force_eject_occupant(mob/target) go_out() @@ -190,9 +191,9 @@ new /obj/effect/temp_visual/dir_setting/ninja/phase(teleport_loc, effect_dir) new /obj/item/radio/headset(teleport_loc) //Если парня запрёт в техах, без средства связи... будет не круто, не так ли? to_chat(ninja, "[span_boldnotice("VOID-Shift")] occupant translocation successful") - update_state_icon() + update_icon(UPDATE_ICON_STATE) -/obj/machinery/ninja_mindscan_machine/proc/update_state_icon() +/obj/machinery/ninja_mindscan_machine/update_icon_state() icon_state = occupant ? initial(icon_state) : "[initial(icon_state)]_open" /obj/machinery/ninja_mindscan_machine/proc/get_occupant_icon() diff --git a/code/modules/antagonists/space_ninja/machinery/ninja_teleporter.dm b/code/modules/antagonists/space_ninja/machinery/ninja_teleporter.dm index 17374d85054..3d6749e53fd 100644 --- a/code/modules/antagonists/space_ninja/machinery/ninja_teleporter.dm +++ b/code/modules/antagonists/space_ninja/machinery/ninja_teleporter.dm @@ -4,7 +4,7 @@ desc = "A console used to send a Spider Clan operative long distances rapidly." icon = 'icons/obj/ninjaobjects.dmi' icon_state = "teleconsole" - anchored = 1 + anchored = TRUE density = 0 /obj/structure/ninjatele/attack_hand(mob/user as mob) diff --git a/code/modules/antagonists/space_ninja/ninja_borg_module.dm b/code/modules/antagonists/space_ninja/ninja_borg_module.dm index d3fb2a1ea51..57b5319b055 100644 --- a/code/modules/antagonists/space_ninja/ninja_borg_module.dm +++ b/code/modules/antagonists/space_ninja/ninja_borg_module.dm @@ -26,7 +26,6 @@ /mob/living/silicon/robot/syndicate/saboteur/ninja/New(loc) ..() mmi = new /obj/item/mmi/robotic_brain/ninja(src) - mmi.icon_state = "wanter" /mob/living/silicon/robot/syndicate/saboteur/ninja/init(alien = FALSE, mob/living/silicon/ai/ai_to_sync_to = null) . = ..() diff --git a/code/modules/antagonists/space_ninja/ninja_datum.dm b/code/modules/antagonists/space_ninja/ninja_datum.dm index 404504579dc..5d1a77c26b4 100644 --- a/code/modules/antagonists/space_ninja/ninja_datum.dm +++ b/code/modules/antagonists/space_ninja/ninja_datum.dm @@ -222,7 +222,7 @@ var/warning = cell.charge >= check_percentage ? "" : "_warning" hud.ninja_energy_display.icon_state = "ninja_energy_display_[my_suit.color_choice][warning]" hud.ninja_energy_display.maptext = "
[round(cell.charge)]
"
- hud.ninja_energy_display.invisibility = my_suit.show_charge_UI ? 0 : 100
+ hud.ninja_energy_display.invisibility = my_suit.show_charge_UI ? 0 : INVISIBILITY_ABSTRACT
// concentration level
if(!hud.ninja_focus_display && owner.martial_art && istype(owner.martial_art, /datum/martial_art/ninja_martial_art))
@@ -237,7 +237,7 @@
// martial art update
if(creeping_widow && my_suit)
hud.ninja_focus_display.icon_state = creeping_widow.has_focus ? "focus_active_[my_suit.color_choice]" : "focus"
- hud.ninja_focus_display.invisibility = my_suit.show_concentration_UI ? 0 : 100
+ hud.ninja_focus_display.invisibility = my_suit.show_concentration_UI ? 0 : INVISIBILITY_ABSTRACT
/**
diff --git a/code/modules/antagonists/traitor/contractor/items/contractor_pinpointer.dm b/code/modules/antagonists/traitor/contractor/items/contractor_pinpointer.dm
index 1d7f33f564f..8008622910c 100644
--- a/code/modules/antagonists/traitor/contractor/items/contractor_pinpointer.dm
+++ b/code/modules/antagonists/traitor/contractor/items/contractor_pinpointer.dm
@@ -11,38 +11,41 @@
/// The minimum range for the pinpointer to function properly.
var/min_range = 15
/// The first person to have used the item. If this is set already, no one else can use it.
- var/mob/owner = null
-
-/obj/item/pinpointer/crew/contractor/pinpoint_at(atom/target)
- if(target && trackable(target))
- // Calc dir
- var/turf/T = get_turf(target)
- var/turf/L = get_turf(src)
- dir = get_dir(L, T)
- // Calc dist
- var/dist = get_dist(L, T)
- if(ISINRANGE(dist, -1, min_range))
- icon_state = icon_direct
- else if(ISINRANGE(dist, min_range + 1, min_range + 8))
- icon_state = icon_close
- else if(ISINRANGE(dist, min_range + 9, min_range + 16))
- icon_state = icon_medium
- else if(ISINRANGE(dist, min_range + 16, INFINITY))
- icon_state = icon_far
- else
+ var/mob/owner
+
+
+/obj/item/pinpointer/crew/contractor/update_icon_state()
+ if(mode == 0) // MODE_OFF
+ icon_state = icon_off
+ return
+
+ if(!target)
icon_state = icon_null
+ return
-/obj/item/pinpointer/crew/contractor/trackable(mob/living/carbon/human/H)
- var/turf/here = get_turf(src)
- var/turf/there = get_turf(H)
- return here && there && there.z == here.z
+ if(ISINRANGE(prev_dist, -1, min_range))
+ icon_state = icon_direct
+ else if(ISINRANGE(prev_dist, min_range + 1, min_range + 8))
+ icon_state = icon_close
+ else if(ISINRANGE(prev_dist, min_range + 9, min_range + 16))
+ icon_state = icon_medium
+ else if(ISINRANGE(prev_dist, min_range + 16, INFINITY))
+ icon_state = icon_far
-/obj/item/pinpointer/crew/contractor/attack_self(mob/living/user)
+
+/obj/item/pinpointer/crew/contractor/is_trackable(mob/living/carbon/human/pin_target)
+ source_turf = get_turf(src)
+ target_turf = get_turf(pin_target)
+ return source_turf && target_turf && source_turf.z == target_turf.z
+
+
+/obj/item/pinpointer/crew/contractor/cycle(mob/user, silent = FALSE)
if(owner)
if(owner != user)
- to_chat(user, "[src] refuses to do anything.")
+ to_chat(user, span_warning("[src] refuses to do anything."))
return
else
owner = user
- to_chat(user, "[src] now recognizes you as its sole user.")
+ to_chat(user, span_notice("[src] now recognizes you as its sole user."))
return ..()
+
diff --git a/code/modules/antagonists/vampire/vampire_datum.dm b/code/modules/antagonists/vampire/vampire_datum.dm
index 0688594de5f..13cef1a53a1 100644
--- a/code/modules/antagonists/vampire/vampire_datum.dm
+++ b/code/modules/antagonists/vampire/vampire_datum.dm
@@ -180,9 +180,11 @@
#define BLOOD_GAINED_MODIFIER 0.5
+
#define CLOSING_IN_TIME_MOD 0.2
#define GRABBING_TIME_MOD 0.3
#define BITE_TIME_MOD 0.15
+
#define STATE_CLOSING_IN 1
#define STATE_GRABBING 2
#define STATE_BITE 3
@@ -291,7 +293,7 @@
else
owner.current.set_nutrition(min(NUTRITION_LEVEL_WELL_FED, owner.current.nutrition + (blood / 2)))
- stop_sucking(target)
+ stop_sucking()
/datum/antagonist/vampire/proc/getting_closer_animation(mob/living/carbon/human/target, stage, vampire_dir)
@@ -338,12 +340,13 @@
owner.current.do_item_attack_animation(target, ATTACK_EFFECT_BITE)
-/datum/antagonist/vampire/proc/stop_sucking(mob/living/carbon/human/target)
- draining = null
- to_chat(owner.current, span_notice("You stop draining [target.name] of blood."))
- owner.current.pixel_x = 0
- owner.current.pixel_y = 0
- owner.current.layer = initial(owner.current.layer)
+/datum/antagonist/vampire/proc/stop_sucking()
+ if(draining)
+ to_chat(owner.current, span_notice("You stop draining [draining.name] of blood."))
+ draining = null
+ owner.current.pixel_x = 0
+ owner.current.pixel_y = 0
+ owner.current.layer = initial(owner.current.layer)
#undef BLOOD_GAINED_MODIFIER
#undef CLOSING_IN_TIME_MOD
diff --git a/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm b/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm
index 5b5c5d1f8ea..c9ada5c6435 100644
--- a/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm
+++ b/code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm
@@ -839,18 +839,6 @@
to_chat(user, span_notice("You pinch arteries on fly and absorb [blood_gained] amount of blood!"))
-/obj/effect/proc_holder/spell/vampire/proc/is_path_exist(atom/source, atom/target)
- var/obj/dummy = new(source.loc)
- dummy.pass_flags |= (PASSTABLE|PASSGRILLE|PASSFENCE|PASSMOB)
- for(var/turf/turf in getline(source, target))
- for(var/atom/movable/AM in turf)
- if(!AM.CanPass(dummy, turf, 1))
- qdel(dummy)
- return FALSE
- qdel(dummy)
- return TRUE
-
-
/obj/effect/proc_holder/spell/vampire/lunge/on_trophie_update(datum/antagonist/vampire/vampire, trophie_type, force = FALSE)
if(trophie_type == INTERNAL_ORGAN_LUNGS || force)
var/lungs_amount = vampire.get_trophies(INTERNAL_ORGAN_LUNGS)
@@ -1015,6 +1003,7 @@
span_notice("You start to transform into the [vampire_animal]."), \
span_italics("You hear an eerie rustle of many wings..."))
+ vampire.stop_sucking()
original_body = user
vampire_animal.status_flags |= GODMODE
user.notransform = TRUE
diff --git a/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm b/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm
index 1facb14919b..b592f2d3a70 100644
--- a/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm
+++ b/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm
@@ -150,7 +150,7 @@
update_vampire_spell_name()
-/obj/effect/proc_holder/spell/fireball/demonic_grasp/update_icon()
+/obj/effect/proc_holder/spell/fireball/demonic_grasp/update_icon_state()
return
diff --git a/code/modules/arcade/arcade_base.dm b/code/modules/arcade/arcade_base.dm
index 2ecf5ecfd5b..3e65692d86b 100644
--- a/code/modules/arcade/arcade_base.dm
+++ b/code/modules/arcade/arcade_base.dm
@@ -5,7 +5,7 @@
icon = 'icons/obj/machines/arcade.dmi'
icon_state = "clawmachine_on"
density = 1
- anchored = 1
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 40
var/tokens = 0
@@ -35,7 +35,7 @@
else
. += "\The [src.name] has [tokens] play credits!"
-/obj/machinery/arcade/attack_hand(mob/user as mob)
+/obj/machinery/arcade/attack_hand(mob/user)
if(..())
if(in_use && src == user.machine) //this one checks if they fell down/died and closes the game
src.close_game()
@@ -44,7 +44,7 @@
return
interact(user)
-/obj/machinery/arcade/interact(mob/user as mob)
+/obj/machinery/arcade/interact(mob/user)
if(stat & BROKEN || panel_open)
return
if(!tokens && !freeplay)
@@ -60,12 +60,6 @@
return
/obj/machinery/arcade/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/screwdriver) && anchored)
- playsound(src.loc, I.usesound, 50, 1)
- panel_open = !panel_open
- to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.")
- update_icon()
- return
if(!freeplay)
if(I.GetID())
if(pay_with_card(user, token_price, name))
@@ -76,15 +70,25 @@
if(pay_with_cash(cash, user, token_price, name))
tokens += 1
return
- if(panel_open && component_parts && istype(I, /obj/item/crowbar))
- default_deconstruction_crowbar(user, I)
- return
return ..()
-/obj/machinery/arcade/update_icon()
- return
-/obj/machinery/arcade/proc/start_play(mob/user as mob)
+/obj/machinery/arcade/screwdriver_act(mob/living/user, obj/item/I)
+ if(!anchored)
+ return FALSE
+ default_deconstruction_screwdriver(user, icon_state, icon_state, I)
+ update_icon(UPDATE_ICON_STATE)
+ return TRUE
+
+
+/obj/machinery/arcade/crowbar_act(mob/living/user, obj/item/I)
+ if(!component_parts || !panel_open)
+ return FALSE
+ default_deconstruction_crowbar(user, I)
+ return TRUE
+
+
+/obj/machinery/arcade/proc/start_play(mob/user)
user.set_machine(src)
if(!freeplay)
tokens -= 1
diff --git a/code/modules/arcade/arcade_prize.dm b/code/modules/arcade/arcade_prize.dm
index fa669d5212b..0c84662dc14 100644
--- a/code/modules/arcade/arcade_prize.dm
+++ b/code/modules/arcade/arcade_prize.dm
@@ -7,20 +7,27 @@
desc = "A toy is a toy, but a prize ball could be anything! It could even be a toy!"
icon = 'icons/obj/machines/arcade.dmi'
icon_state = "prizeball_1"
- var/opening = 0
+ var/choose_icon_state
+ var/opening = FALSE
var/possible_contents = list(/obj/random/carp_plushie, /obj/random/plushie, /obj/random/figure, /obj/item/toy/eight_ball, /obj/item/stack/tickets)
-/obj/item/toy/prizeball/New()
- ..()
- icon_state = pick("prizeball_1","prizeball_2","prizeball_3")
+/obj/item/toy/prizeball/Initialize(mapload)
+ . = ..()
+ choose_icon_state = pick("prizeball_1","prizeball_2","prizeball_3")
+ update_icon(UPDATE_ICON_STATE)
-/obj/item/toy/prizeball/attack_self(mob/user as mob)
+
+/obj/item/toy/prizeball/update_icon_state()
+ icon_state = opening ? "prizeconfetti" : choose_icon_state
+
+
+/obj/item/toy/prizeball/attack_self(mob/user)
if(opening)
return
- opening = 1
+ opening = TRUE
+ update_icon(UPDATE_ICON_STATE)
playsound(loc, 'sound/items/bubblewrap.ogg', 30, TRUE)
- icon_state = "prizeconfetti"
- src.color = pick(GLOB.random_color_list)
+ color = pick(GLOB.random_color_list)
var/prize_inside = pick(possible_contents)
spawn(10)
user.temporarily_remove_item_from_inventory(src)
@@ -72,14 +79,10 @@
/obj/item/stack/tickets/five
amount = 5
-/obj/item/stack/tickets/New(var/loc, var/amount=null)
- ..()
- update_icon()
-
-/obj/item/stack/tickets/attack_self(mob/user as mob)
+/obj/item/stack/tickets/attack_self(mob/user)
return
-/obj/item/stack/tickets/update_icon()
+/obj/item/stack/tickets/update_icon_state()
switch(get_amount())
if(1 to 3)
icon_state = "tickets_1" // One ticket
diff --git a/code/modules/arcade/claw_game.dm b/code/modules/arcade/claw_game.dm
index 6cbc35c4ebc..60117788f6c 100644
--- a/code/modules/arcade/claw_game.dm
+++ b/code/modules/arcade/claw_game.dm
@@ -20,7 +20,7 @@ GLOBAL_VAR(claw_game_html)
/obj/machinery/arcade/claw/New()
..()
machine_image = pick("_1", "_2")
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
component_parts = list()
component_parts += new /obj/item/circuitboard/clawgame(null)
@@ -39,7 +39,7 @@ GLOBAL_VAR(claw_game_html)
bin_upgrades = B.rating
bonus_prize_chance = bin_upgrades * 5 //equals +5% chance per matter bin rating level (+20% with rating 4)
-/obj/machinery/arcade/claw/update_icon()
+/obj/machinery/arcade/claw/update_icon_state()
if(stat & BROKEN)
icon_state = "clawmachine[machine_image]_broken"
else if(panel_open)
@@ -58,7 +58,7 @@ GLOBAL_VAR(claw_game_html)
atom_say("ПОБЕДИТЕЛЬ!")
new /obj/item/toy/prizeball(get_turf(src))
playsound(loc, 'sound/arcade/win.ogg', 50, TRUE)
- addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 10)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), UPDATE_ICON_STATE), 1 SECONDS)
/obj/machinery/arcade/claw/start_play(mob/user as mob)
..()
diff --git a/code/modules/arcade/mob_hunt/battle_computer.dm b/code/modules/arcade/mob_hunt/battle_computer.dm
index 32c0cb292af..c88cb9b91d4 100644
--- a/code/modules/arcade/mob_hunt/battle_computer.dm
+++ b/code/modules/arcade/mob_hunt/battle_computer.dm
@@ -6,7 +6,7 @@
icon_screen = null
icon_keyboard = null
density = 0
- anchored = 1
+ anchored = TRUE
var/obj/item/nanomob_card/card
var/datum/mob_hunt/mob_info
var/obj/effect/landmark/battle_mob_point/avatar_point
@@ -32,12 +32,14 @@
..()
check_connection()
-/obj/machinery/computer/mob_battle_terminal/update_icon()
- if(card)
- icon_state = "mob_battle_loaded"
- else
- icon_state = "mob_battle_empty"
- ..()
+
+/obj/machinery/computer/mob_battle_terminal/update_icon_state()
+ icon_state = "mob_battle_[card ? "loaded" : "empty"]"
+
+
+/obj/machinery/computer/mob_battle_terminal/update_overlays()
+ . = list()
+
/obj/machinery/computer/mob_battle_terminal/Destroy()
eject_card(1)
@@ -286,7 +288,7 @@
icon_screen = null
icon_keyboard = null
density = 0
- anchored = 1
+ anchored = TRUE
dir = EAST
/obj/machinery/computer/mob_healer_terminal/attackby(obj/item/O, mob/user)
diff --git a/code/modules/arcade/mob_hunt/mob_avatar.dm b/code/modules/arcade/mob_hunt/mob_avatar.dm
index eafd03beff9..283f137905b 100644
--- a/code/modules/arcade/mob_hunt/mob_avatar.dm
+++ b/code/modules/arcade/mob_hunt/mob_avatar.dm
@@ -4,7 +4,7 @@
desc = "A wild Nano-Mob appeared! Hit it with your PDA with the game open to attempt to capture it!"
invisibility = INVISIBILITY_ABSTRACT
alpha = 128
- anchored = 1 //just in case
+ anchored = TRUE //just in case
density = 0
icon = 'icons/effects/mob_hunt.dmi'
var/state_name
diff --git a/code/modules/arcade/prize_counter.dm b/code/modules/arcade/prize_counter.dm
index fa75b35bded..5093bc2cedb 100644
--- a/code/modules/arcade/prize_counter.dm
+++ b/code/modules/arcade/prize_counter.dm
@@ -5,7 +5,7 @@
icon = 'icons/obj/machines/arcade.dmi'
icon_state = "prize_counter-on"
density = 1
- anchored = 1
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 40
var/tickets = 0
@@ -20,7 +20,8 @@
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
-/obj/machinery/prize_counter/update_icon()
+
+/obj/machinery/prize_counter/update_icon_state()
if(stat & BROKEN)
icon_state = "prize_counter-broken"
else if(panel_open)
@@ -29,9 +30,9 @@
icon_state = "prize_counter-off"
else
icon_state = "prize_counter-on"
- return
-/obj/machinery/prize_counter/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+
+/obj/machinery/prize_counter/attackby(obj/item/O, var/mob/user, params)
if(istype(O, /obj/item/stack/tickets))
var/obj/item/stack/tickets/T = O
if(user.temporarily_remove_item_from_inventory(T)) //Because if you can't drop it for some reason, you shouldn't be increasing the tickets var
@@ -40,29 +41,37 @@
else
to_chat(user, "\The [T] seems stuck to your hand!")
return
- if(istype(O, /obj/item/screwdriver) && anchored)
- playsound(src.loc, O.usesound, 50, 1)
- panel_open = !panel_open
- to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.")
- update_icon()
- return
if(panel_open)
- if(istype(O, /obj/item/wrench))
- default_unfasten_wrench(user, O)
- if(component_parts && istype(O, /obj/item/crowbar))
+ if(component_parts && O.tool_behaviour == TOOL_CROWBAR)
if(tickets) //save the tickets!
print_tickets()
default_deconstruction_crowbar(user, O)
return
return ..()
-/obj/machinery/prize_counter/attack_hand(mob/user as mob)
+
+/obj/machinery/prize_counter/screwdriver_act(mob/living/user, obj/item/I)
+ if(!anchored)
+ return FALSE
+ default_deconstruction_screwdriver(user, icon_state, icon_state, I)
+ update_icon(UPDATE_ICON_STATE)
+ return TRUE
+
+
+/obj/machinery/snow_machine/wrench_act(mob/user, obj/item/I)
+ . = TRUE
+ if(!panel_open)
+ return .
+ default_unfasten_wrench(user, I)
+
+
+/obj/machinery/prize_counter/attack_hand(mob/user)
if(..())
return
add_fingerprint(user)
interact(user)
-/obj/machinery/prize_counter/interact(mob/user as mob)
+/obj/machinery/prize_counter/interact(mob/user)
user.set_machine(src)
if(stat & (BROKEN|NOPOWER))
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index e1fa3b31a54..40733745909 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -1,8 +1,8 @@
-#define WIRE_RECEIVE (1<<0) //Allows pulse(0) to call Activate()
-#define WIRE_PULSE (1<<1) //Allows pulse(0) to act on the holder
-#define WIRE_PULSE_SPECIAL (1<<2) //Allows pulse(0) to act on the holders special assembly
-#define WIRE_RADIO_RECEIVE (1<<3) //Allows pulse(1) to call Activate()
-#define WIRE_RADIO_PULSE (1<<4) //Allows pulse(1) to send a radio message
+#define WIRE_RECEIVE (1<<0) //Allows pulse(FALSE) to call Activate()
+#define WIRE_PULSE (1<<1) //Allows pulse(FALSE) to act on the holder
+#define WIRE_PULSE_SPECIAL (1<<2) //Allows pulse(FALSE) to act on the holders special assembly
+#define WIRE_RADIO_RECEIVE (1<<3) //Allows pulse(TRUE) to call Activate()
+#define WIRE_RADIO_PULSE (1<<4) //Allows pulse(TRUE) to send a radio message
/obj/item/assembly
name = "assembly"
@@ -30,54 +30,45 @@
var/wires = WIRE_RECEIVE | WIRE_PULSE
var/datum/wires/connected = null // currently only used by timer/signaler
-/obj/item/assembly/proc/activate() //What the device does when turned on
- return
-/obj/item/assembly/proc/pulsed(radio = FALSE) //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
- return
+/obj/item/assembly/Destroy()
+ if(istype(loc, /obj/item/assembly_holder) || istype(holder))
+ var/obj/item/assembly_holder/A = loc
+ if(A.a_left == src)
+ A.a_left = null
+ else if(A.a_right == src)
+ A.a_right = null
+ holder = null
+ return ..()
-/obj/item/assembly/proc/toggle_secure() //Code that has to happen when the assembly is un\secured goes here
- return
-/obj/item/assembly/proc/attach_assembly(obj/A, mob/user) //Called when an assembly is attacked by another
+/// Called when the holder is moved
+/obj/item/assembly/proc/holder_movement(mob/user)
return
-/obj/item/assembly/proc/process_cooldown() //Called via spawn(10) to have it count down the cooldown var
- return
-/obj/item/assembly/proc/holder_movement(mob/user) //Called when the holder is moved
+/// Called when attack_self is called
+/obj/item/assembly/interact(mob/user)
return
-/obj/item/assembly/proc/describe() // Called by grenades to describe the state of the trigger (time left, etc)
- return "The trigger assembly looks broken!"
-/obj/item/assembly/interact(mob/user) //Called when attack_self is called
- return
-
-/obj/item/assembly/process_cooldown()
- cooldown--
- if(cooldown <= 0)
+/// Called via 1 SECONDS to have it count down the cooldown var
+/obj/item/assembly/proc/process_cooldown()
+ if(cooldown-- <= 0)
return FALSE
- addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10)
+ addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 1 SECONDS)
return TRUE
-/obj/item/assembly/Destroy()
- if(istype(loc, /obj/item/assembly_holder) || istype(holder))
- var/obj/item/assembly_holder/A = loc
- if(A.a_left == src)
- A.a_left = null
- else if(A.a_right == src)
- A.a_right = null
- holder = null
- return ..()
-/obj/item/assembly/pulsed(radio = FALSE)
+/// Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
+/obj/item/assembly/proc/pulsed(radio = FALSE)
if(holder && (wires & WIRE_RECEIVE))
activate()
if(radio && (wires & WIRE_RADIO_RECEIVE))
activate()
return TRUE
+
/* Called when this device attempts to act on another device,
* var/radio determines if it was sent via radio or direct
* var/mob/user for logging
@@ -87,61 +78,72 @@
connected.pulse_assembly(src)
return TRUE
if(holder && (wires & WIRE_PULSE))
- holder.process_activation(src, 1, 0, user)
+ holder.process_activation(src, TRUE, FALSE, user)
if(holder && (wires & WIRE_PULSE_SPECIAL))
- holder.process_activation(src, 0, 1, user)
+ holder.process_activation(src, FALSE, TRUE, user)
if(istype(loc, /obj/item/grenade)) // This is a hack. Todo: Manage this better -Sayu
var/obj/item/grenade/G = loc
G.prime(user) // Adios, muchachos
return TRUE
-/obj/item/assembly/activate()
+
+/// What the device does when turned on
+/obj/item/assembly/proc/activate()
if(!secured || cooldown > 0)
return FALSE
cooldown = 2
addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10)
return TRUE
-/obj/item/assembly/toggle_secure()
+
+/// Code that has to happen when the assembly is un\secured goes here
+/obj/item/assembly/proc/toggle_secure()
secured = !secured
update_icon()
return secured
-/obj/item/assembly/attach_assembly(obj/item/assembly/A, mob/user)
- holder = new /obj/item/assembly_holder(get_turf(src))
- if(holder.attach(A, src, user))
- to_chat(user, "You attach [A] to [src]!")
+
+/// Called when an assembly is attacked by another
+/obj/item/assembly/proc/attach_assembly(obj/item/assembly/assembly, mob/user)
+ holder = new /obj/item/assembly_holder(drop_location())
+ user?.put_in_hands(holder, ignore_anim = FALSE)
+ if(holder.attach(assembly, src, user))
+ to_chat(user, span_notice("You attach [assembly] to [src]!"))
return TRUE
return FALSE
+
/obj/item/assembly/attackby(obj/item/W, mob/user, params)
if(isassembly(W))
var/obj/item/assembly/A = W
if(!A.secured && !secured)
attach_assembly(A, user)
return
-
return ..()
+
/obj/item/assembly/screwdriver_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
if(toggle_secure())
- to_chat(user, "[src] is ready!")
+ to_chat(user, span_notice("[src] is ready!"))
else
- to_chat(user, "[src] can now be attached!")
+ to_chat(user, span_notice("[src] can now be attached!"))
+
/obj/item/assembly/process()
- STOP_PROCESSING(SSobj, src)
+ return PROCESS_KILL
+
/obj/item/assembly/examine(mob/user)
. = ..()
- if(in_range(src, user) || loc == user)
+ if(in_range(src, user))
if(secured)
- . += "[src] is ready!"
+ . += span_notice("[src] need to be secured!")
else
- . += "[src] can be attached!"
+ . += span_notice("[src] can be attached!")
+
/obj/item/assembly/attack_self(mob/user)
if(!user)
@@ -150,5 +152,3 @@
interact(user)
return TRUE
-/obj/item/assembly/interact(mob/user)
- return
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 9189df8560f..60efca14515 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -12,21 +12,29 @@
var/obj/item/tank/bombtank = null //the second part of the bomb is a plasma tank
origin_tech = "materials=1;engineering=1"
+
/obj/item/onetankbomb/ComponentInitialize()
. = ..()
AddComponent(/datum/component/proximity_monitor)
+
/obj/item/onetankbomb/examine(mob/user)
. = ..()
. += bombtank.examine(user)
-/obj/item/onetankbomb/update_icon()
+
+/obj/item/onetankbomb/update_icon_state()
if(bombtank)
icon_state = bombtank.icon_state
+
+
+/obj/item/onetankbomb/update_overlays()
+ . = ..()
if(bombassembly)
- overlays += bombassembly.icon_state
- overlays += bombassembly.overlays
- overlays += "bomb_assembly"
+ . += bombassembly.icon_state
+ . += bombassembly.overlays
+ . += "bomb_assembly"
+
/obj/item/onetankbomb/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/analyzer))
@@ -34,13 +42,14 @@
return
return ..()
+
/obj/item/onetankbomb/wrench_act(mob/user, obj/item/I) //This is basically bomb assembly code inverted. apparently it works.
if(status)
return
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
- to_chat(user, "You disassemble [src].")
+ to_chat(user, span_notice("You disassemble [src]."))
bombassembly.loc = user.loc
bombassembly.master = null
bombassembly = null
@@ -49,6 +58,7 @@
bombtank = null
qdel(src)
+
/obj/item/onetankbomb/welder_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, volume = I.tool_volume))
@@ -56,6 +66,7 @@
if(!status)
status = TRUE
investigate_log("[key_name_log(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]", INVESTIGATE_BOMB)
+ log_game("[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature - T0C]")
to_chat(user, "A pressure hole has been bored to [bombtank] valve. [bombtank] can now be ignited.")
add_attack_logs(user, src, "welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]", ATKLOG_FEW)
else
@@ -70,9 +81,10 @@
add_fingerprint(user)
return
+
/obj/item/onetankbomb/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here.
visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
- sleep(10)
+ sleep(1 SECONDS)
if(!src)
return
if(status)
@@ -80,26 +92,32 @@
else
bombtank.release()
+
/obj/item/onetankbomb/HasProximity(atom/movable/AM)
if(bombassembly)
bombassembly.HasProximity(AM)
+
/obj/item/onetankbomb/Crossed(atom/movable/AM, oldloc) //for mousetraps
if(bombassembly)
bombassembly.Crossed(AM, oldloc)
+
/obj/item/onetankbomb/on_found(mob/finder) //for mousetraps
if(bombassembly)
bombassembly.on_found(finder)
+
/obj/item/onetankbomb/hear_talk(mob/living/M, list/message_pieces)
if(bombassembly)
bombassembly.hear_talk(M, message_pieces)
+
/obj/item/onetankbomb/hear_message(mob/living/M, msg)
if(bombassembly)
bombassembly.hear_message(M, msg)
+
// ---------- Procs below are for tanks that are used exclusively in 1-tank bombs ----------
/obj/item/tank/proc/bomb_assemble(W,user) //Bomb assembly proc. This turns assembly+tank into a bomb
@@ -126,6 +144,7 @@
R.update_icon()
return
+
/obj/item/tank/proc/detonate() //This happens when a bomb is told to explode
var/fuel_moles = air_contents.toxins + air_contents.oxygen/6
var/strength = 1
@@ -175,6 +194,7 @@
qdel(master)
qdel(src)
+
/obj/item/tank/proc/release() //This happens when the bomb is not welded. Tank contents are just spat out.
var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles())
var/turf/simulated/T = get_turf(src)
@@ -182,3 +202,4 @@
return
T.assume_air(removed)
air_update_turf()
+
diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm
index 0372ed7d2e6..641e559ae7c 100644
--- a/code/modules/assembly/health.dm
+++ b/code/modules/assembly/health.dm
@@ -1,3 +1,6 @@
+#define MAX_HEALTH_ACTIVATE 0
+#define MIN_HEALTH_ACTIVATE -90
+
/obj/item/assembly/health
name = "health sensor"
desc = "Used for scanning and monitoring health."
@@ -6,10 +9,12 @@
origin_tech = "magnets=1;biotech=1"
secured = FALSE
+ /// Are we scanning our user's health?
var/scanning = FALSE
- var/health_scan
- var/alarm_health = 0
-
+ /// Our user's health
+ var/user_health
+ /// The health amount on which to activate
+ var/alarm_health = MAX_HEALTH_ACTIVATE
/obj/item/assembly/health/activate()
@@ -18,47 +23,51 @@
toggle_scan()
return FALSE
+
/obj/item/assembly/health/toggle_secure()
secured = !secured
if(secured && scanning)
START_PROCESSING(SSobj, src)
else
scanning = FALSE
+ user_health = null // Clear out the user data, we're no longer scanning
STOP_PROCESSING(SSobj, src)
update_icon()
return secured
+
/obj/item/assembly/health/multitool_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
- if(alarm_health == 0)
- alarm_health = -90
+ if(alarm_health == MAX_HEALTH_ACTIVATE)
+ alarm_health = MIN_HEALTH_ACTIVATE
user.show_message("You toggle [src] to \"detect death\" mode.")
else
- alarm_health = 0
+ alarm_health = MAX_HEALTH_ACTIVATE
user.show_message("You toggle [src] to \"detect critical state\" mode.")
+
/obj/item/assembly/health/process()
if(!scanning || !secured)
+ STOP_PROCESSING(SSobj, src) // It should never reach here, but if it somehow does stop processing
return
- var/atom/A = src
- if(connected && connected.holder)
- A = connected.holder
-
- for(A, A && !ismob(A), A=A.loc);
- // like get_turf(), but for mobs.
- var/mob/living/M = A
+ var/atom/our_source = src
+ if(connected?.holder)
+ our_source = connected.holder
- if(M)
- health_scan = M.health
- if(health_scan <= alarm_health)
- pulse(FALSE, M)
- audible_message("[bicon(src)] *beep* *beep*")
- toggle_scan()
+ if(!get(our_source, /mob/living))
+ user_health = null // We aint on a living thing, remove the previous data
return
- return
+
+ var/mob/living/user = our_source
+ user_health = user.health
+ if(user_health <= alarm_health) // Its a health detector, not a death detector
+ pulse(FALSE, user)
+ audible_message("[bicon(src)] *beep* *beep*")
+ toggle_scan()
+
/obj/item/assembly/health/proc/toggle_scan()
if(!secured)
@@ -67,40 +76,44 @@
if(scanning)
START_PROCESSING(SSobj, src)
else
+ user_health = null // Clear out the user data, we're no longer scanning
STOP_PROCESSING(SSobj, src)
- return
+
/obj/item/assembly/health/interact(mob/user)//TODO: Change this to the wires thingy
if(!secured)
- user.show_message("The [name] is unsecured!")
+ user.show_message(span_warning("The [name] is unsecured!"))
return FALSE
var/dat = text({"Health Sensor [scanning?"On":"Off"]"})
- if(scanning && health_scan)
- dat += "Health: [health_scan]" + if(scanning && user_health) + dat += "
Health: [user_health]" var/datum/browser/popup = new(user, "hscan", name, 400, 400, src) popup.set_content(dat) popup.open() - return /obj/item/assembly/health/Topic(href, href_list) ..() - if(!ismob(usr)) + if(!isliving(usr)) return - var/mob/user = usr + var/mob/living/user = usr - if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) - usr << browse(null, "window=hscan") - onclose(usr, "hscan") + if(user.incapacitated() || user.restrained() || !in_range(loc, user)) + user << browse(null, "window=hscan") + onclose(user, "hscan") return if(href_list["scanning"]) toggle_scan() if(href_list["close"]) - usr << browse(null, "window=hscan") + user << browse(null, "window=hscan") return attack_self(user) - return + + +#undef MAX_HEALTH_ACTIVATE +#undef MIN_HEALTH_ACTIVATE + diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 7a27cf88768..1c48989a0a5 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -13,11 +13,6 @@ var/obj/item/assembly/a_left = null var/obj/item/assembly/a_right = null -/obj/item/assembly_holder/proc/attach(obj/item/D, obj/item/D2, mob/user) - return - -/obj/item/assembly_holder/proc/process_activation(var/obj/item/D) - return /obj/item/assembly_holder/Destroy() if(a_left) @@ -26,7 +21,8 @@ a_right.holder = null return ..() -/obj/item/assembly_holder/attach(obj/item/D, obj/item/D2, mob/user) + +/obj/item/assembly_holder/proc/attach(obj/item/D, obj/item/D2, mob/user) if(!D || !D2) return FALSE if(!isassembly(D) || !isassembly(D2)) @@ -50,35 +46,52 @@ if(has_prox_sensors()) AddComponent(/datum/component/proximity_monitor) name = "[A1.name]-[A2.name] assembly" - update_icon() + update_icon(UPDATE_OVERLAYS) return TRUE + /obj/item/assembly_holder/proc/has_prox_sensors() if(istype(a_left, /obj/item/assembly/prox_sensor) || istype(a_right, /obj/item/assembly/prox_sensor)) return TRUE return FALSE -/obj/item/assembly_holder/update_icon() - overlays.Cut() + +/obj/item/assembly_holder/proc/process_activation(obj/D, normal = TRUE, special = TRUE, mob/user) + if(!D) + return FALSE + if(normal && a_right && a_left) + if(a_right != D) + a_right.pulsed() + if(a_left != D) + a_left.pulsed() + if(master) + var/datum/signal/signal = new + signal.source = src + signal.user = user + master.receive_signal(signal) + return TRUE + + +/obj/item/assembly_holder/update_overlays() + . = ..() if(a_left) - overlays += "[a_left.icon_state]_left" + . += "[a_left.icon_state]_left" for(var/O in a_left.attached_overlays) - overlays += "[O]_l" + . += "[O]_l" if(a_right) - overlays += "[a_right.icon_state]_right" + . += "[a_right.icon_state]_right" for(var/O in a_right.attached_overlays) - overlays += "[O]_r" - if(master) - master.update_icon() + . += "[O]_r" + master?.update_icon() /obj/item/assembly_holder/examine(mob/user) . = ..() - if(in_range(src, user) || loc == user) + if(in_range(src, user)) if(secured) - . += "[src] is ready!" + . += span_notice("[src] can be attached!") else - . += "[src] can be attached!" + . += span_notice("[src] need to be secured!") /obj/item/assembly_holder/HasProximity(atom/movable/AM) @@ -94,6 +107,7 @@ if(a_right) a_right.Crossed(AM, oldloc) + /obj/item/assembly_holder/on_found(mob/finder) if(a_left) a_left.on_found(finder) @@ -107,26 +121,31 @@ if(a_right) a_right.hear_talk(M, message_pieces) + /obj/item/assembly_holder/hear_message(mob/living/M, msg) if(a_left) a_left.hear_message(M, msg) if(a_right) a_right.hear_message(M, msg) + /obj/item/assembly_holder/proc/process_movement(mob/user) // infrared beams and prox sensors if(a_left && a_right) a_left.holder_movement(user) a_right.holder_movement(user) + /obj/item/assembly_holder/Move() . = ..() process_movement() return + /obj/item/assembly_holder/pickup(mob/user) . = ..() process_movement(user) + /obj/item/assembly_holder/Bump(atom/A) ..() var/triggered @@ -138,6 +157,7 @@ triggered = AM process_movement(triggered) + /obj/item/assembly_holder/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) // called when a throw stops ..() var/triggered @@ -145,16 +165,17 @@ triggered = throwing.thrower process_movement(triggered) + /obj/item/assembly_holder/attack_hand(mob/user)//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess if(a_left && a_right) a_left.holder_movement(user) a_right.holder_movement(user) ..() - return + /obj/item/assembly_holder/screwdriver_act(mob/user, obj/item/I) if(!a_left || !a_right) - to_chat(user, "BUG:Assembly part missing, please report this!") + to_chat(user, span_warning("BUG:Assembly part missing, please report this!")) return . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) @@ -163,16 +184,17 @@ a_right.toggle_secure() secured = !secured if(secured) - to_chat(user, "[src] is ready!") + to_chat(user, span_notice("[src] can now be attached!")) else - to_chat(user, "[src] can now be taken apart!") + to_chat(user, span_notice("[src] can now be taken apart!")) update_icon() + /obj/item/assembly_holder/attack_self(mob/user) add_fingerprint(user) if(secured) if(!a_left || !a_right) - to_chat(user, "Assembly part missing!") + to_chat(user, span_warning("Assembly part missing!")) return if(istype(a_left, a_right.type))//If they are the same type it causes issues due to window code switch(alert("Which side would you like to use?",,"Left","Right")) @@ -190,24 +212,11 @@ return FALSE if(a_left) a_left.holder = null - a_left.loc = T + a_left.forceMove(T) + user.put_in_hands(a_left, ignore_anim = FALSE) if(a_right) a_right.holder = null - a_right.loc = T + a_right.forceMove(T) + user.put_in_hands(a_left, ignore_anim = FALSE) qdel(src) - -/obj/item/assembly_holder/process_activation(obj/D, normal = TRUE, special = TRUE, mob/user) - if(!D) - return FALSE - if(normal && a_right && a_left) - if(a_right != D) - a_right.pulsed(0) - if(a_left != D) - a_left.pulsed(0) - if(master) - var/datum/signal/signal = new - signal.source = src - signal.user = user - master.receive_signal(signal) - return TRUE diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index b81acbbe2b0..0389339efb7 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -4,42 +4,62 @@ icon_state = "igniter" materials = list(MAT_METAL=500, MAT_GLASS=50) origin_tech = "magnets=1" - var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread + var/datum/effect_system/spark_spread/sparks -/obj/item/assembly/igniter/New() - ..() - sparks.set_up(2, 0, src) + +/obj/item/assembly/igniter/Initialize(mapload) + . = ..() + sparks = new /datum/effect_system/spark_spread + sparks.set_up(2, FALSE, src) sparks.attach(src) + /obj/item/assembly/igniter/Destroy() QDEL_NULL(sparks) return ..() -/obj/item/assembly/igniter/describe() - return "The igniter is [secured ? "secured." : "unsecured."]" +/obj/item/assembly/igniter/examine(mob/user) + . = ..() + . += span_notice("The igniter is [secured ? "secured." : "unsecured."]") /obj/item/assembly/igniter/activate() if(!..()) - return FALSE//Cooldown check + return FALSE //Cooldown check + var/turf/location = get_turf(loc) if(location) - location.hotspot_expose(1000,1000) + location.hotspot_expose(1000, 1000) + + sparks.start() + if(istype(loc, /obj/item/assembly_holder)) - if(istype(loc.loc, /obj/structure/reagent_dispensers/fueltank)) - var/obj/structure/reagent_dispensers/fueltank/tank = loc.loc + var/locloc = loc.loc + if(istype(locloc, /obj/structure/reagent_dispensers/fueltank)) + var/obj/structure/reagent_dispensers/fueltank/tank = locloc if(tank) - tank.boom(TRUE) - if(istype(loc.loc, /obj/item/reagent_containers/glass/beaker)) - var/obj/item/reagent_containers/glass/beaker/beakerbomb = loc.loc + tank.boom(TRUE) // this qdel's `src` + + if(istype(locloc, /obj/item/onetankbomb)) + var/obj/item/onetankbomb/bomb = locloc + if(bomb?.bombtank) + bomb.bombtank.detonate() + + else if(istype(locloc, /obj/item/reagent_containers/glass/beaker)) + var/obj/item/reagent_containers/glass/beaker/beakerbomb = locloc if(beakerbomb) beakerbomb.heat_beaker() - sparks.start() + + else if(istype(locloc, /obj/item/grenade/chem_grenade)) + var/obj/item/grenade/chem_grenade/CG = locloc + CG.prime() + return TRUE /obj/item/assembly/igniter/attack_self(mob/user) - activate() + if(!istype(loc, /obj/item/assembly_holder)) + activate() add_fingerprint(user) - return + diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 7211b74d433..01506870ac0 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -7,7 +7,7 @@ bomb_name = "tripwire mine" - secured = FALSE // toggle_secure()'ed in New() for correct adding to processing_objects, won't work otherwise + secured = FALSE // toggle_secure()'ed in Initialize() for correct adding to processing_objects, won't work otherwise dir = EAST var/on = FALSE var/visible = TRUE @@ -18,6 +18,13 @@ var/emission_cycles = 0 var/emission_cap = 20 + +/obj/item/assembly/infra/Initialize(mapload) + . = ..() + if(!secured) + toggle_secure() + + /obj/item/assembly/infra/Destroy() if(first) QDEL_NULL(first) @@ -25,12 +32,12 @@ fire_location = null return ..() -/obj/item/assembly/infra/describe() - return "The assembly is [secured ? "secure" : "not secure"]. The infrared trigger is [on ? "on" : "off"]." /obj/item/assembly/infra/examine(mob/user) . = ..() - . += describe() + . += span_notice("The assembly is [secured ? "secure" : "not secure"]. The infrared trigger is [on ? "on" : "off"].") + . += span_info("Alt-Click to rotate it.") + /obj/item/assembly/infra/activate() if(!..()) @@ -39,6 +46,7 @@ update_icon() return TRUE + /obj/item/assembly/infra/toggle_secure() secured = !secured if(secured) @@ -51,25 +59,22 @@ update_icon() return secured -/obj/item/assembly/infra/New() - ..() - if(!secured) - toggle_secure() -/obj/item/assembly/infra/proc/arm() // Forces the device to arm no matter its current state. +/// Forces the device to arm no matter its current state. +/obj/item/assembly/infra/proc/arm() if(!secured) // Checked because arm() might be called sometime after the object is spawned. toggle_secure() - on = 1 + on = TRUE -/obj/item/assembly/infra/update_icon() - overlays.Cut() + +/obj/item/assembly/infra/update_overlays() + . = ..() attached_overlays = list() if(on) - overlays += "infrared_on" + . += "infrared_on" attached_overlays += "infrared_on" + holder?.update_icon() - if(holder) - holder.update_icon() /obj/item/assembly/infra/process() var/turf/T = get_turf(src) @@ -89,7 +94,7 @@ emission_cycles = 0 var/obj/effect/beam/i_beam/I = new /obj/effect/beam/i_beam(T) I.master = src - I.density = 1 + I.density = TRUE I.dir = dir I.update_icon() first = I @@ -100,30 +105,36 @@ I.limit = 8 I.process() + /obj/item/assembly/infra/attack_hand() qdel(first) ..() -/obj/item/assembly/infra/Move() - var/t = dir + +/obj/item/assembly/infra/Move(atom/newloc, direct = 0, movetime) + var/prev_dir = dir . = ..() - dir = t + dir = prev_dir qdel(first) + /obj/item/assembly/infra/holder_movement() if(!holder) return FALSE qdel(first) return TRUE + /obj/item/assembly/infra/equipped(mob/user, slot, initial) qdel(first) return ..() + /obj/item/assembly/infra/pickup(mob/user) qdel(first) return ..() + /obj/item/assembly/infra/proc/trigger_beam(atom/movable/AM) var/mob/triggered if(AM.throwing?.thrower) @@ -132,15 +143,17 @@ triggered = AM if(!secured || !on || cooldown > 0) return FALSE + cooldown = 2 + pulse(FALSE, triggered) audible_message("[bicon(src)] *beep* *beep*", hearing_distance = 3) if(first) qdel(first) - cooldown = 2 - addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10) - pulse(FALSE, triggered) + addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 1 SECONDS) + /obj/item/assembly/infra/interact(mob/user)//TODO: change this this to the wire control panel - if(!secured) return + if(!secured) + return user.set_machine(src) var/dat = {"Infrared Laser Status: [on ? "On" : "Off"]
@@ -153,6 +166,7 @@ popup.set_content(dat) popup.open() + /obj/item/assembly/infra/Topic(href, href_list) ..() if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) @@ -167,38 +181,51 @@ if(first) first.vis_spread(visible) if(href_list["rotate"]) - rotate() + rotate(usr) if(href_list["close"]) usr << browse(null, "window=infra") return if(usr) attack_self(usr) -/obj/item/assembly/infra/verb/rotate()//This could likely be better + +/obj/item/assembly/infra/AltClick(mob/user) + if(!Adjacent(user)) + return ..() + rotate(user) + + +/obj/item/assembly/infra/verb/rotate_verb() set name = "Rotate Infrared Laser" set category = "Object" set src in usr - if(usr.stat || !usr.canmove || usr.restrained()) + rotate(usr) + + +/obj/item/assembly/infra/proc/rotate(mob/living/user = usr) + if(!isliving(user) || user.incapacitated() || user.restrained()) return dir = turn(dir, 90) - if(usr.machine == src) - interact(usr) + if(user.machine == src) + interact(user) if(first) qdel(first) +/obj/item/assembly/infra/armed/Initialize(mapload) + . = ..() + addtimer(CALLBACK(src, PROC_REF(delayed_arm)), 0.3 SECONDS) + + +/obj/item/assembly/infra/armed/proc/delayed_arm() + if(holder?.master) + dir = holder.master.dir + arm() -/obj/item/assembly/infra/armed/New() - ..() - spawn(3) - if(holder) - if(holder.master) - dir = holder.master.dir - arm() /obj/item/assembly/infra/armed/stealth visible = FALSE @@ -222,19 +249,31 @@ pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSFENCE +/obj/effect/beam/i_beam/Destroy() + if(master && master.first == src) + master.first = null + QDEL_NULL(next) + if(previous) + previous.next = null + master?.last = previous + return ..() + + /obj/effect/beam/i_beam/proc/hit(atom/movable/AM) - if(master) - master.trigger_beam(AM) + master?.trigger_beam(AM) qdel(src) -/obj/effect/beam/i_beam/proc/vis_spread(v) - visible = v + +/obj/effect/beam/i_beam/proc/vis_spread(new_visibility) + visible = new_visibility if(next) - next.vis_spread(v) + next.vis_spread(new_visibility) + -/obj/effect/beam/i_beam/update_icon() +/obj/effect/beam/i_beam/update_icon_state() transform = turn(matrix(), dir2angle(dir)) + /obj/effect/beam/i_beam/process() life_cycles++ if(loc.density || !master || life_cycles >= life_cap) @@ -242,18 +281,15 @@ return if(left > 0) left-- - if(left < 1) - if(!(visible)) - invisibility = INVISIBILITY_ABSTRACT - else - invisibility = FALSE + if(left < 1 && !visible) + invisibility = INVISIBILITY_ABSTRACT else - invisibility = FALSE + invisibility = 0 if(!next && (limit > 0)) var/obj/effect/beam/i_beam/I = new /obj/effect/beam/i_beam(loc) I.master = master - I.density = 1 + I.density = TRUE I.dir = dir I.update_icon() I.previous = src @@ -266,12 +302,15 @@ master.last = I I.process() + /obj/effect/beam/i_beam/Bump() qdel(src) + /obj/effect/beam/i_beam/Bumped(atom/movable/moving_atom) hit(moving_atom) + /obj/effect/beam/i_beam/Crossed(atom/movable/AM, oldloc) if(!isobj(AM) && !isliving(AM)) return @@ -279,11 +318,3 @@ return hit(AM) -/obj/effect/beam/i_beam/Destroy() - if(master.first == src) - master.first = null - QDEL_NULL(next) - if(previous) - previous.next = null - master.last = previous - return ..() diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index dde6183ca6f..01a1b6734a6 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -8,133 +8,165 @@ bomb_name = "contact mine" + /obj/item/assembly/mousetrap/examine(mob/user) . = ..() if(armed) - . += "It looks like it's armed." + . += span_warning("It looks like it's armed.") + . += span_info("Alt-Click to hide it.") + /obj/item/assembly/mousetrap/activate() - if(..()) - armed = !armed - if(!armed) - if(ishuman(usr)) - var/mob/living/carbon/human/user = usr - if((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)) - to_chat(user, "Your hand slips, setting off the trigger.") - pulse(0, user) - update_icon() - if(usr) - playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) - -/obj/item/assembly/mousetrap/describe() - return "The pressure switch is [armed ? "primed" : "safe"]." - -/obj/item/assembly/mousetrap/update_icon() - if(armed) - icon_state = "mousetraparmed" - else - icon_state = "mousetrap" + if(!..()) + return + + armed = !armed + if(!armed && ishuman(usr)) + var/mob/living/carbon/human/user = usr + if((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)) + to_chat(user, "Your hand slips, setting off the trigger.") + pulse(FALSE, user) + + update_icon() + + if(usr) + playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3) + + +/obj/item/assembly/mousetrap/update_icon_state() + icon_state = "mousetrap[armed ? "armed": ""]" if(holder) holder.update_icon() + /obj/item/assembly/mousetrap/proc/triggered(mob/target, type = "feet") if(!armed) return + var/obj/item/organ/external/affecting = null + if(ishuman(target)) - var/mob/living/carbon/human/H = target - if(PIERCEIMMUNE in H.dna.species.species_traits) + var/mob/living/carbon/human/h_target = target + if(h_target.dna && (PIERCEIMMUNE in h_target.dna.species.species_traits)) playsound(src, 'sound/effects/snap.ogg', 50, TRUE) armed = FALSE update_icon() - pulse(FALSE, target) + pulse(FALSE, h_target) return FALSE + switch(type) if("feet") - if(!H.shoes) - affecting = H.get_organ(pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) - H.Weaken(6 SECONDS) + if(!h_target.shoes) + affecting = h_target.get_organ(pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) + h_target.Weaken(6 SECONDS) + if(BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND) - if(!H.gloves) - affecting = H.get_organ(type) - H.Stun(6 SECONDS) + if(!h_target.gloves) + affecting = h_target.get_organ(type) + h_target.Stun(6 SECONDS) + if(affecting) affecting.receive_damage(1, 0) - else if(ismouse(target)) - var/mob/living/simple_animal/mouse/M = target - visible_message("SPLAT!") - M.apply_damage(5, "brute") - if (M.stat == DEAD) - M.splat(item = src) - playsound(loc, 'sound/effects/snap.ogg', 50, 1) + + else if(ismouse(target) && target.stat != DEAD) + var/mob/living/simple_animal/mouse/mouse = target + visible_message(span_danger("SPLAT!")) + mouse.death() + mouse.splat(src) + + playsound(loc, 'sound/effects/snap.ogg', 50, TRUE) layer = MOB_LAYER - 0.2 armed = FALSE update_icon() - pulse(0, target) + pulse(FALSE, target) + /obj/item/assembly/mousetrap/attack_self(mob/living/user) if(!armed) - to_chat(user, "You arm [src].") + to_chat(user, span_notice("You arm [src].")) else if((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)) triggered(user, user.hand ? BODY_ZONE_PRECISE_L_HAND : BODY_ZONE_PRECISE_R_HAND) - user.visible_message("[user] accidentally sets off [src], breaking [user.p_their()] fingers.", \ - "You accidentally trigger [src]!") + user.visible_message( + span_warning("[user] accidentally sets off [src], breaking [user.p_their()] fingers."), + span_warning("You accidentally trigger [src]!"), + ) return - to_chat(user, "You disarm [src].") + to_chat(user, span_notice("You disarm [src].")) armed = !armed update_icon() - playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) + playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3) + /obj/item/assembly/mousetrap/attack_hand(mob/living/user) - if(armed) - if((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)) - triggered(user, user.hand ? BODY_ZONE_PRECISE_L_HAND : BODY_ZONE_PRECISE_R_HAND) - user.visible_message("[user] accidentally sets off [src], breaking [user.p_their()] fingers.", \ - "You accidentally trigger [src]!") - return + if(armed && (user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)) + triggered(user, user.hand ? BODY_ZONE_PRECISE_L_HAND : BODY_ZONE_PRECISE_R_HAND) + user.visible_message( + span_warning("[user] accidentally sets off [src], breaking [user.p_their()] fingers."), + span_warning("You accidentally trigger [src]!"), + ) + return ..() + /obj/item/assembly/mousetrap/Crossed(atom/movable/AM, oldloc) if(armed) if(ishuman(AM)) - var/mob/living/carbon/H = AM - if(H.m_intent == MOVE_INTENT_RUN) - triggered(H) - H.visible_message("[H] accidentally steps on [src].", \ - "You accidentally step on [src]") + var/mob/living/carbon/h_target = AM + if(h_target.m_intent == MOVE_INTENT_RUN) + triggered(h_target) + h_target.visible_message( + span_warning("[h_target] accidentally steps on [src]."), + span_warning("You accidentally step on [src]!"), + ) else if(ismouse(AM)) triggered(AM) else if(AM.density) // For mousetrap grenades, set off by anything heavy triggered(AM) ..() + /obj/item/assembly/mousetrap/on_found(mob/finder) if(armed) - finder.visible_message("[finder] accidentally sets off [src], breaking [finder.p_their()] fingers.", \ - "You accidentally trigger [src]!") + finder.visible_message( + span_warning("[finder] accidentally sets off [src], breaking [finder.p_their()] fingers."), + span_warning("You accidentally trigger [src]!"), + ) triggered(finder, finder.hand ? BODY_ZONE_PRECISE_L_HAND : BODY_ZONE_PRECISE_R_HAND) return TRUE //end the search! return FALSE + /obj/item/assembly/mousetrap/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) if(!armed) return ..() - visible_message("[src] is triggered by [AM].") - triggered(null) + visible_message(span_warning("[src] is triggered by [AM].")) + triggered() + /obj/item/assembly/mousetrap/armed icon_state = "mousetraparmed" - armed = 1 + armed = TRUE -/obj/item/assembly/mousetrap/verb/hide_under() +/obj/item/assembly/mousetrap/AltClick(mob/user) + if(!Adjacent(user)) + return ..() + hide_under(user) + + +/obj/item/assembly/mousetrap/verb/hide_under_verb() set src in oview(1) set name = "Hide" set category = "Object" - if(usr.stat) + hide_under(usr) + + +/obj/item/assembly/mousetrap/proc/hide_under(mob/user = usr) + if(!isliving(user) || user.incapacitated() || user.restrained()) return - layer = TURF_LAYER+0.2 - to_chat(usr, "You hide [src].") + layer = TURF_LAYER + 0.2 + to_chat(user, span_notice("You hide [src].")) + diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index cce1f06410f..671c69b23be 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -5,22 +5,27 @@ materials = list(MAT_METAL = 800, MAT_GLASS = 200) origin_tech = "magnets=1;engineering=1" - secured = 0 + secured = FALSE bomb_name = "proximity mine" - var/scanning = 0 - var/timing = 0 + var/scanning = FALSE + var/timing = FALSE var/time = 10 + /obj/item/assembly/prox_sensor/ComponentInitialize() . = ..() AddComponent(/datum/component/proximity_monitor) -/obj/item/assembly/prox_sensor/describe() + +/obj/item/assembly/prox_sensor/examine(mob/user) + . = ..() if(timing) - return "The proximity sensor is arming." - return "The proximity sensor is [scanning ? "armed" : "disarmed"]." + . += span_notice("The proximity sensor is arming.") + else + . += span_notice("The proximity sensor is [scanning ? "armed" : "disarmed"].") + /obj/item/assembly/prox_sensor/activate() if(!..()) @@ -29,17 +34,19 @@ update_icon() return FALSE + /obj/item/assembly/prox_sensor/toggle_secure() secured = !secured if(secured) START_PROCESSING(SSobj, src) else - scanning = 0 - timing = 0 + scanning = FALSE + timing = FALSE STOP_PROCESSING(SSobj, src) update_icon() return secured + /obj/item/assembly/prox_sensor/HasProximity(atom/movable/AM) if(!isobj(AM) && !isliving(AM)) return @@ -48,6 +55,7 @@ if(AM.move_speed < 12) sense(AM) + /obj/item/assembly/prox_sensor/proc/sense(atom/movable/AM) var/mob/triggered if(ismob(AM)) @@ -55,23 +63,24 @@ if(!secured || !scanning || cooldown > 0) return FALSE cooldown = 2 - visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*") - addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10) pulse(FALSE, triggered) + visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*") + addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 1 SECONDS) + /obj/item/assembly/prox_sensor/process() if(timing && (time >= 0)) time-- if(timing && time <= 0) - timing = 0 + timing = FALSE toggle_scan() time = 10 + /obj/item/assembly/prox_sensor/dropped(mob/user, silent = FALSE) - ..() - spawn(0) - sense(user) - return + . = ..() + INVOKE_ASYNC(src, PROC_REF(sense), user) + /obj/item/assembly/prox_sensor/proc/toggle_scan() if(!secured) @@ -79,28 +88,31 @@ scanning = !scanning update_icon() -/obj/item/assembly/prox_sensor/update_icon() - overlays.Cut() + +/obj/item/assembly/prox_sensor/update_overlays() + . = ..() attached_overlays = list() if(timing) - overlays += "prox_timing" + . += "prox_timing" attached_overlays += "prox_timing" if(scanning) - overlays += "prox_scanning" + . += "prox_scanning" attached_overlays += "prox_scanning" - if(holder) - holder.update_icon() + holder?.update_icon() -/obj/item/assembly/prox_sensor/Move() + +/obj/item/assembly/prox_sensor/Move(atom/newloc, direct = NONE, movetime) . = ..() sense() + /obj/item/assembly/prox_sensor/holder_movement(user) sense(user) + /obj/item/assembly/prox_sensor/interact(mob/user)//TODO: Change this to the wires thingy if(!secured) - user.show_message("The [name] is unsecured!") + user.show_message(span_warning("The [name] is unsecured!")) return FALSE var/second = time % 60 var/minute = (time - second) / 60 @@ -112,6 +124,7 @@ popup.set_content(dat) popup.open() + /obj/item/assembly/prox_sensor/Topic(href, href_list) ..() if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) @@ -137,3 +150,4 @@ if(usr) attack_self(usr) + diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index 4c1e8ae6d1b..e2ccef0b2bc 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -9,26 +9,27 @@ w_class = WEIGHT_CLASS_HUGE flags = CONDUCT + /obj/item/assembly/shock_kit/Destroy() QDEL_NULL(part1) QDEL_NULL(part2) return ..() -/obj/item/assembly/shock_kit/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/wrench) && !status) - var/turf/T = loc - if(ismob(T)) - T = T.loc - part1.loc = T - part2.loc = T - part1.master = null - part2.master = null - part1 = null - part2 = null - qdel(src) - return + +/obj/item/assembly/shock_kit/wrench_act(mob/living/user, obj/item/I) + . = TRUE + if(!status) + return . add_fingerprint(user) - return + var/drop_loc = drop_location() + part1.forceMove(drop_loc) + part2.forceMove(drop_loc) + part1.master = null + part2.master = null + part1 = null + part2 = null + qdel(src) + /obj/item/assembly/shock_kit/screwdriver_act(mob/user, obj/item/I) . = TRUE @@ -36,18 +37,19 @@ return status = !status if(status) - to_chat(user, "[src] is now ready to be attached to a chair!") + to_chat(user, span_notice("[src] is now ready to be attached to a chair!")) else - to_chat(user, "[src] is now ready!") + to_chat(user, span_notice("[src] is now ready!")) + -/obj/item/assembly/shock_kit/attack_self(mob/user as mob) +/obj/item/assembly/shock_kit/attack_self(mob/user) part1.attack_self(user, status) part2.attack_self(user, status) add_fingerprint(user) - return + /obj/item/assembly/shock_kit/receive_signal() if(istype(loc, /obj/structure/chair/e_chair)) - var/obj/structure/chair/e_chair/C = loc - C.shock() - return + var/obj/structure/chair/e_chair/chair = loc + chair.shock() + diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 406f70f17c0..9d0f1b830e4 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -7,7 +7,7 @@ origin_tech = "magnets=1;bluespace=1" wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE - secured = 1 + secured = TRUE var/receiving = FALSE bomb_name = "remote-control bomb" @@ -18,24 +18,32 @@ var/datum/radio_frequency/radio_connection var/airlock_wire = null -/obj/item/assembly/signaler/New() - ..() - if(SSradio) - set_frequency(frequency) /obj/item/assembly/signaler/Initialize() - ..() + . = ..() if(SSradio) set_frequency(frequency) + /obj/item/assembly/signaler/Destroy() if(SSradio) SSradio.remove_object(src, frequency) radio_connection = null return ..() -/obj/item/assembly/signaler/describe() - return "[src]'s power light is [receiving ? "on" : "off"]" + +/obj/item/assembly/signaler/examine(mob/user) + . = ..() + . += span_notice("The power light is [receiving ? "on" : "off"].") + . += span_info("Alt+Click to send a signal.") + + +/obj/item/assembly/signaler/AltClick(mob/user) + if(!isliving(user) || user.incapacitated() || user.restrained() || !Adjacent(user)) + return ..() + to_chat(user, span_notice("You activate [src].")) + activate() + /obj/item/assembly/signaler/activate() if(cooldown > 0) @@ -46,10 +54,10 @@ signal() return TRUE -/obj/item/assembly/signaler/update_icon() - if(holder) - holder.update_icon() - return + +/obj/item/assembly/signaler/update_icon_state() + holder?.update_icon() + /obj/item/assembly/signaler/interact(mob/user, flag1) var/t1 = "-------" @@ -81,13 +89,14 @@ "} var/datum/browser/popup = new(user, "radio", name, 400, 400) popup.set_content(dat) - popup.open(0) + popup.open(FALSE) onclose(user, "radio") + /obj/item/assembly/signaler/Topic(href, href_list) ..() - if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) + if(usr.incapacitated() || usr.restrained() || !Adjacent(usr)) usr << browse(null, "window=radio") onclose(usr, "radio") return @@ -103,16 +112,17 @@ code = round(code) code = min(100, code) code = max(1, code) + if(href_list["receive"]) receiving = !receiving if(href_list["send"]) - spawn( 0 ) - signal() + INVOKE_ASYNC(src, PROC_REF(signal)) if(usr) attack_self(usr) + /obj/item/assembly/signaler/proc/signal() if(!radio_connection) return @@ -129,6 +139,7 @@ if(usr) GLOB.lastsignalers.Add("[time] : [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) : [format_frequency(frequency)]/[code]") + /obj/item/assembly/signaler/receive_signal(datum/signal/signal) if(!receiving || !signal) return FALSE @@ -140,15 +151,15 @@ return FALSE pulse(1, signal.user) - for(var/mob/O in hearers(1, loc)) - O.show_message("[bicon(src)] *beep* *beep*", 3, "*beep* *beep*", 2) + for(var/mob/hearer in hearers(1, loc)) + hearer.show_message("[bicon(src)] *beep* *beep*", 3, "*beep* *beep*", 2) return TRUE + /obj/item/assembly/signaler/proc/set_frequency(new_frequency) - if(!SSradio) - sleep(20) if(!SSradio) return SSradio.remove_object(src, frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, RADIO_CHAT) + diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index c4393ce999f..6084f4cd5ec 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -15,10 +15,18 @@ var/set_time = 10 var/mob/user // for logging -/obj/item/assembly/timer/describe() + +/obj/item/assembly/timer/Destroy() + user = null + return ..() + +/obj/item/assembly/timer/examine(mob/user) + . = ..() if(timing) - return "The timer is counting down from [time]!" - return "The timer is set for [time] seconds." + . += span_notice("The timer is counting down from [time]!") + else + . += span_notice("The timer is set for [time] seconds.") + /obj/item/assembly/timer/activate() if(!..()) @@ -27,6 +35,7 @@ update_icon() return FALSE + /obj/item/assembly/timer/toggle_secure() secured = !secured if(secured) @@ -37,13 +46,17 @@ update_icon() return secured + /obj/item/assembly/timer/proc/timer_end() if(!secured || cooldown > 0) return FALSE - visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*") cooldown = 2 - addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10) pulse(FALSE, user) + update_icon() + if(loc) + loc.visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*") + addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10) + /obj/item/assembly/timer/process() if(timing && (time > 0)) @@ -53,18 +66,19 @@ timer_end() time = set_time -/obj/item/assembly/timer/update_icon() - overlays.Cut() + +/obj/item/assembly/timer/update_overlays() + . = ..() attached_overlays = list() if(timing) - overlays += "timer_timing" + . += "timer_timing" attached_overlays += "timer_timing" - if(holder) - holder.update_icon() + holder?.update_icon() + -/obj/item/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires +/obj/item/assembly/timer/interact(mob/user)//TODO: Have this use the wires if(!secured) - user.show_message("The [name] is unsecured!") + user.show_message(span_warning("The [name] is unsecured!")) return FALSE var/second = time % 60 var/minute = (time - second) / 60 @@ -90,9 +104,10 @@ popup.set_content(dat) popup.open() + /obj/item/assembly/timer/Topic(href, href_list) ..() - if(usr.incapacitated() || !in_range(loc, usr)) + if(usr.incapacitated() || usr.restrained() || !Adjacent(usr)) usr << browse(null, "window=timer") onclose(usr, "timer") return diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 7dc382cde69..61b965b8c23 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -4,38 +4,48 @@ icon_state = "voice" materials = list(MAT_METAL=500, MAT_GLASS=50) origin_tech = "magnets=1;engineering=1" - var/listening = 0 + var/listening = FALSE var/recorded = null //the activation message var/recorded_type = 0 // 0 for say, 1 for emote bomb_name = "voice-activated bomb" -/obj/item/assembly/voice/describe() + +/obj/item/assembly/voice/examine(mob/user) + . = ..() if(recorded || listening) - return "A meter on [src] flickers with every nearby sound." + . += span_notice("A meter on it flickers with every nearby sound.") else - return "[src] is deactivated." + . += span_notice("It is deactivated.") -/obj/item/assembly/voice/hear_talk(mob/living/M as mob, list/message_pieces) + +/obj/item/assembly/voice/hear_talk(mob/living/M, list/message_pieces) hear_input(M, multilingual_to_message(message_pieces), 0) -/obj/item/assembly/voice/hear_message(mob/living/M as mob, msg) + +/obj/item/assembly/voice/hear_message(mob/living/M, msg) hear_input(M, msg, 1) -/obj/item/assembly/voice/proc/hear_input(mob/living/M as mob, msg, type) + +/obj/item/assembly/voice/proc/hear_input(mob/living/M, msg, type) if(!istype(M,/mob/living)) return if(listening) + if(findtext(msg, "")) + recorded = strip_html_properly(msg) + else + recorded = msg recorded = msg recorded_type = type - listening = 0 + listening = FALSE var/turf/T = get_turf(src) //otherwise it won't work in hand T.visible_message("[bicon(src)] beeps, \"Activation message is [type ? "the sound when one [recorded]" : "'[recorded]'."]\"") else if(findtext(msg, recorded) && type == recorded_type) var/turf/T = get_turf(src) //otherwise it won't work in hand - T.visible_message("[bicon(src)] beeps!") + T.visible_message(span_warning("[bicon(src)] beeps!")) pulse(0, M) + /obj/item/assembly/voice/activate() return // previously this toggled listning when not in a holder, that's a little silly. It was only called in attack_self that way. @@ -52,7 +62,8 @@ /obj/item/assembly/voice/toggle_secure() . = ..() - listening = 0 + listening = FALSE + /obj/item/assembly/voice/noise name = "noise sensor" @@ -62,16 +73,22 @@ origin_tech = "magnets=1;engineering=1" bomb_name = "noise-activated bomb" + /obj/item/assembly/voice/noise/attack_self(mob/user) return -/obj/item/assembly/voice/noise/describe() - return "[src] does not appear to have any controls." -/obj/item/assembly/voice/noise/hear_talk(mob/living/M as mob, list/message_pieces) +/obj/item/assembly/voice/noise/examine(mob/user) + . = ..() + . += span_notice("It does not appear to have any controls.") + + +/obj/item/assembly/voice/noise/hear_talk(mob/living/M, list/message_pieces) return -/obj/item/assembly/voice/noise/hear_message(mob/living/M as mob, msg) + +/obj/item/assembly/voice/noise/hear_message(mob/living/M, msg) pulse(0, M) var/turf/T = get_turf(src) //otherwise it won't work in hand - T.visible_message("[bicon(src)] beeps!") + T.visible_message(span_warning("[bicon(src)] beeps!")) + diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index eaf849d8a00..c4049335180 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -4,74 +4,74 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) desc = "A mysterious gateway built by unknown hands, it allows for faster than light travel to far-flung locations." icon = 'icons/obj/machines/gateway.dmi' icon_state = "off" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - var/active = 0 + var/active = FALSE + /obj/machinery/gateway/Initialize() ..() - update_icon() + update_icon(UPDATE_ICON_STATE) update_density_from_dir() -/obj/machinery/gateway/proc/update_density_from_dir() - if(dir == 2) - density = 0 +/obj/machinery/gateway/proc/update_density_from_dir() + if(dir == SOUTH) + density = FALSE -/obj/machinery/gateway/update_icon() - if(active) - icon_state = "on" - return - icon_state = "off" +/obj/machinery/gateway/update_icon_state() + icon_state = active ? "on" : "off" //this is da important part wot makes things go /obj/machinery/gateway/centerstation - density = 1 icon_state = "offcenter" use_power = IDLE_POWER_USE //warping vars var/list/linked = list() - var/ready = 0 //have we got all the parts for a gateway? + var/ready = FALSE //have we got all the parts for a gateway? var/wait = 0 //this just grabs world.time at world start var/obj/machinery/gateway/centeraway/awaygate = null + /obj/machinery/gateway/centerstation/New() ..() if(!GLOB.the_gateway) GLOB.the_gateway = src -/obj/machinery/gateway/centerstation/Initialize() - ..() - update_icon() + +/obj/machinery/gateway/centerstation/Initialize(mapload) + . = ..() + update_icon(UPDATE_ICON_STATE) wait = world.time + CONFIG_GET(number/gateway_delay) return INITIALIZE_HINT_LATELOAD -/obj/machinery/gateway/centerstation/LateInitialize() - awaygate = locate(/obj/machinery/gateway/centeraway) in GLOB.machines - -/obj/machinery/gateway/centerstation/update_density_from_dir() - return /obj/machinery/gateway/centerstation/Destroy() if(GLOB.the_gateway == src) GLOB.the_gateway = null return ..() -/obj/machinery/gateway/centerstation/update_icon() - if(active) - icon_state = "oncenter" - return - icon_state = "offcenter" + +/obj/machinery/gateway/centerstation/LateInitialize() + awaygate = locate(/obj/machinery/gateway/centeraway) in GLOB.machines + + +/obj/machinery/gateway/centerstation/update_density_from_dir() + return +/obj/machinery/gateway/centerstation/update_icon_state() + icon_state = active ? "oncenter" : "offcenter" + /obj/machinery/gateway/centerstation/process() if(stat & (NOPOWER)) - if(active) toggleoff() + if(active) + toggleoff() return if(active) @@ -90,18 +90,18 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) continue //this is only done if we fail to find a part - ready = 0 + ready = FALSE toggleoff() break - if(linked.len == 8) - ready = 1 + if(length(linked) == 8) + ready = TRUE -/obj/machinery/gateway/centerstation/proc/toggleon(mob/user as mob) +/obj/machinery/gateway/centerstation/proc/toggleon(mob/user) if(!ready) return - if(linked.len != 8) + if(length(linked) != 8) return if(!powered()) return @@ -115,21 +115,21 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) return for(var/obj/machinery/gateway/G in linked) - G.active = 1 + G.active = TRUE G.update_icon() - active = 1 - update_icon() + active = TRUE + update_icon(UPDATE_ICON_STATE) /obj/machinery/gateway/centerstation/proc/toggleoff() for(var/obj/machinery/gateway/G in linked) - G.active = 0 - G.update_icon() - active = 0 - update_icon() + G.active = FALSE + G.update_icon(UPDATE_ICON_STATE) + active = FALSE + update_icon(UPDATE_ICON_STATE) -/obj/machinery/gateway/centerstation/attack_hand(mob/user as mob) +/obj/machinery/gateway/centerstation/attack_hand(mob/user) add_fingerprint(user) if(!ready) detect() @@ -152,17 +152,16 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) moving_atom.forceMove(get_step(awaygate.loc, SOUTH)) moving_atom.dir = SOUTH return - else - var/obj/effect/landmark/dest = pick(GLOB.awaydestinations) - if(dest) - moving_atom.forceMove(dest.loc) - moving_atom.dir = SOUTH - use_power(5000) - return + + var/obj/effect/landmark/dest = pick(GLOB.awaydestinations) + if(dest) + moving_atom.forceMove(dest.loc) + moving_atom.dir = SOUTH + use_power(5000) -/obj/machinery/gateway/centerstation/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W,/obj/item/multitool)) +/obj/machinery/gateway/centerstation/attackby(obj/item/W, mob/user, params) + if(ismultitool(W)) add_fingerprint(user) to_chat(user, "The gate is already calibrated, there is no work for you to do here.") return @@ -172,13 +171,12 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) /obj/machinery/gateway/centeraway - density = 1 icon_state = "offcenter" use_power = NO_POWER_USE var/calibrating_on_activating = FALSE - var/calibrated = 1 + var/calibrated = TRUE var/list/linked = list() //a list of the connected gateway chunks - var/ready = 0 + var/ready = FALSE var/obj/machinery/gateway/centeraway/stationgate = null @@ -191,11 +189,9 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) /obj/machinery/gateway/centeraway/update_density_from_dir() return -/obj/machinery/gateway/centeraway/update_icon() - if(active) - icon_state = "oncenter" - return - icon_state = "offcenter" + +/obj/machinery/gateway/centeraway/update_icon_state() + icon_state = active ? "oncenter" : "offcenter" /obj/machinery/gateway/centeraway/proc/detect() @@ -210,18 +206,18 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) continue //this is only done if we fail to find a part - ready = 0 + ready = FALSE toggleoff() break - if(linked.len == 8) - ready = 1 + if(length(linked) == 8) + ready = TRUE -/obj/machinery/gateway/centeraway/proc/toggleon(mob/user as mob) +/obj/machinery/gateway/centeraway/proc/toggleon(mob/user) if(!ready) return - if(linked.len != 8) + if(length(linked) != 8) return if(!stationgate) stationgate = locate(/obj/machinery/gateway/centerstation) in GLOB.machines @@ -232,21 +228,21 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) calibrated = TRUE for(var/obj/machinery/gateway/G in linked) - G.active = 1 - G.update_icon() - active = 1 - update_icon() + G.active = TRUE + G.update_icon(UPDATE_ICON_STATE) + active = TRUE + update_icon(UPDATE_ICON_STATE) /obj/machinery/gateway/centeraway/proc/toggleoff() for(var/obj/machinery/gateway/G in linked) - G.active = 0 - G.update_icon() - active = 0 - update_icon() + G.active = FALSE + G.update_icon(UPDATE_ICON_STATE) + active = FALSE + update_icon(UPDATE_ICON_STATE) -/obj/machinery/gateway/centeraway/attack_hand(mob/user as mob) +/obj/machinery/gateway/centeraway/attack_hand(mob/user) add_fingerprint(user) if(!ready) detect() @@ -285,21 +281,24 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) if(M.client) M.client.move_delay = max(world.time + 5, M.client.move_delay) -/obj/machinery/gateway/centeraway/proc/exilecheck(var/mob/living/carbon/M) - for(var/obj/item/implant/exile/E in M)//Checking that there is an exile implant in the contents - if(E.imp_in == M)//Checking that it's actually implanted vs just in their pocket - to_chat(M, "The station gate has detected your exile implant and is blocking your entry.") - return 1 - return 0 -/obj/machinery/gateway/centeraway/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W,/obj/item/multitool)) +/obj/machinery/gateway/centeraway/proc/exilecheck(mob/living/carbon/user) + for(var/obj/item/implant/exile/imp in user)//Checking that there is an exile implant in the contents + if(imp.imp_in == user)//Checking that it's actually implanted vs just in their pocket + to_chat(user, "The station gate has detected your exile implant and is blocking your entry.") + return TRUE + return FALSE + + +/obj/machinery/gateway/centeraway/attackby(obj/item/W, mob/user, params) + if(ismultitool(W)) if(calibrated) to_chat(user, "The gate is already calibrated, there is no work for you to do here.") return else add_fingerprint(user) to_chat(user, "Recalibration successful!: This gate's systems have been fine tuned. Travel to this gate will now be on target.") - calibrated = 1 + calibrated = TRUE return return ..() + diff --git a/code/modules/awaymissions/map_rng.dm b/code/modules/awaymissions/map_rng.dm index 6e3a8e82e3a..30edb32fcb4 100644 --- a/code/modules/awaymissions/map_rng.dm +++ b/code/modules/awaymissions/map_rng.dm @@ -3,7 +3,7 @@ icon = 'icons/mob/screen_gen.dmi' icon_state = "x2" invisibility = INVISIBILITY_ABSTRACT - anchored = 1 + anchored = TRUE density = 0 opacity = 0 var/template_name = null diff --git a/code/modules/awaymissions/mission_code/academy.dm b/code/modules/awaymissions/mission_code/academy.dm index 3e488ba1edc..065b2749f7d 100644 --- a/code/modules/awaymissions/mission_code/academy.dm +++ b/code/modules/awaymissions/mission_code/academy.dm @@ -44,191 +44,6 @@ icon_state = "monocle" item_state = "headset" -// Die of Fate -/obj/item/dice/d20/fate - name = "\improper Die of Fate" - desc = "A die with twenty sides. You can feel unearthly energies radiating from it. Using this might be VERY risky." - icon_state = "d20" - var/reusable = TRUE - var/used = FALSE - -/obj/item/dice/d20/fate/stealth - name = "d20" - desc = "A die with twenty sides. The preferred die to throw at the GM." - -/obj/item/dice/d20/fate/one_use - reusable = FALSE - -/obj/item/dice/d20/fate/one_use/stealth - name = "d20" - desc = "A die with twenty sides. The preferred die to throw at the GM." - -/obj/item/dice/d20/fate/cursed - name = "cursed Die of Fate" - desc = "A die with twenty sides. You feel that rolling this is a REALLY bad idea." - color = "#00BB00" - - rigged = DICE_TOTALLY_RIGGED - rigged_value = 1 - -/obj/item/dice/d20/fate/diceroll(mob/user) - . = ..() - if(!used) - if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards)) - to_chat(user, "You feel the magic of the dice is restricted to ordinary humans!") - return - - if(!reusable) - used = TRUE - - var/turf/T = get_turf(src) - T.visible_message("[src] flares briefly.") - - addtimer(CALLBACK(src, PROC_REF(effect), user, .), 1 SECONDS) - -/obj/item/dice/d20/fate/equipped(mob/user, slot, initial) - . = ..() - - if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards)) - to_chat(user, "You feel the magic of the dice is restricted to ordinary humans! You should leave it alone.") - user.drop_item_ground(src) - -/obj/item/dice/d20/fate/proc/create_smoke(amount) - var/datum/effect_system/smoke_spread/smoke = new - smoke.set_up(amount, 0, drop_location()) - smoke.start() - -/obj/item/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user, roll) - var/turf/T = get_turf(src) - switch(roll) - if(1) - //Dust - T.visible_message("[user] turns to dust!") - user.dust() - if(2) - //Death - T.visible_message("[user] suddenly dies!") - user.death() - if(3) - //Swarm of creatures - T.visible_message("A swarm of creatures surround [user]!") - for(var/direction in GLOB.alldirs) - new /mob/living/simple_animal/hostile/netherworld(get_step(get_turf(user),direction)) - if(4) - //Destroy Equipment - T.visible_message("Everything [user] is holding and wearing disappears!") - for(var/obj/item/I in user) - if(istype(I, /obj/item/implant) || istype(I, /obj/item/organ)) - continue - qdel(I) - if(5) - //Monkeying - T.visible_message("[user] transforms into a monkey!") - user.monkeyize() - if(6) - //Cut speed - T.visible_message("[user] starts moving slower!") - var/datum/species/S = user.dna.species - S.speed_mod += 1 - if(7) - //Throw - T.visible_message("Unseen forces throw [user]!") - user.Stun(12 SECONDS) - user.adjustBruteLoss(50) - var/throw_dir = GLOB.cardinal - var/atom/throw_target = get_edge_target_turf(user, throw_dir) - user.throw_at(throw_target, 200, 4) - if(8) - //Fueltank Explosion - T.visible_message("An explosion bursts into existence around [user]!") - explosion(get_turf(user),-1,0,2, flame_range = 2, cause = src) - if(9) - //Cold - T.visible_message("[user] looks a little under the weather!") - var/datum/disease/virus/cold/D = new - D.Contract(user) - if(10) - //Nothing - T.visible_message("Nothing seems to happen.") - if(11) - //Cookie - T.visible_message("A cookie appears out of thin air!") - var/obj/item/reagent_containers/food/snacks/cookie/C = new(drop_location()) - create_smoke(2) - C.name = "Cookie of Fate" - if(12) - //Healing - T.visible_message("[user] looks very healthy!") - user.revive() - if(13) - //Mad Dosh - T.visible_message("Mad dosh shoots out of [src]!") - var/turf/Start = get_turf(src) - for(var/direction in GLOB.alldirs) - var/turf/dirturf = get_step(Start,direction) - if(rand(0,1)) - new /obj/item/stack/spacecash/c1000(dirturf) - else - var/obj/item/storage/bag/money/M = new(dirturf) - for(var/i in 1 to rand(5,50)) - new /obj/item/coin/gold(M) - if(14) - //Free Gun - T.visible_message("An impressive gun appears!") - create_smoke(2) - new /obj/item/gun/projectile/revolver/mateba(drop_location()) - if(15) - //Random One-use spellbook - T.visible_message("A magical looking book drops to the floor!") - create_smoke(2) - new /obj/item/spellbook/oneuse/random(drop_location()) - if(16) - //Servant & Servant Summon - T.visible_message("A Dice Servant appears in a cloud of smoke!") - var/mob/living/carbon/human/H = new(drop_location()) - create_smoke(2) - - H.equipOutfit(/datum/outfit/butler) - var/datum/mind/servant_mind = new /datum/mind() - var/datum/objective/O = new - O.owner = servant_mind - O.target = user.mind - O.explanation_text = "Serve [user.real_name]." - servant_mind.objectives += O - servant_mind.transfer_to(H) - - var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the servant of [user.real_name]?", ROLE_WIZARD, poll_time = 30 SECONDS, source = H) - if(LAZYLEN(candidates)) - var/mob/dead/observer/C = pick(candidates) - message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Dice Servant") - H.key = C.key - to_chat(H, "You are a servant of [user.real_name]. You must do everything in your power to follow their orders.") - - var/obj/effect/proc_holder/spell/summonmob/S = new - S.target_mob = H - user.mind.AddSpell(S) - - if(17) - //Tator Kit - T.visible_message("A suspicious box appears!") - new /obj/item/storage/box/syndicate(drop_location()) - create_smoke(2) - if(18) - //Captain ID - T.visible_message("A golden identification card appears!") - new /obj/item/card/id/captains_spare(drop_location()) - create_smoke(2) - if(19) - //Instrinct Resistance - T.visible_message("[user] looks very robust!") - var/datum/species/S = user.dna.species - S.brute_mod *= 0.5 - S.burn_mod *= 0.5 - - if(20) - //Free wizard! - T.visible_message("Magic flows out of [src] and into [user]!") - user.mind.make_Wizard() // Butler outfit /datum/outfit/butler diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm index 26017e4c37c..f57e3ce7ae9 100644 --- a/code/modules/awaymissions/mission_code/beach.dm +++ b/code/modules/awaymissions/mission_code/beach.dm @@ -5,7 +5,7 @@ opacity = 0 mouse_opacity = MOUSE_OPACITY_TRANSPARENT density = 0 - anchored = 1 + anchored = TRUE invisibility = INVISIBILITY_ABSTRACT var/water_frequency = 15 diff --git a/code/modules/awaymissions/mission_code/blackmarketpackers.dm b/code/modules/awaymissions/mission_code/blackmarketpackers.dm index 37f1ef8b212..dec17fd5ae8 100644 --- a/code/modules/awaymissions/mission_code/blackmarketpackers.dm +++ b/code/modules/awaymissions/mission_code/blackmarketpackers.dm @@ -188,7 +188,7 @@ icon_state = "destroyed_target_prism" /obj/machinery/broken/porta_turret/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/crowbar)) + if(I.tool_behaviour == TOOL_CROWBAR) to_chat(user, "You begin prying the metal coverings off.") if(do_after(user, 20 * I.toolspeed * gettoolspeedmod(user), target = src)) if(prob(70)) @@ -206,8 +206,7 @@ /obj/machinery/firealarm/triggered_nosignals report_fire_alarms = FALSE show_alert_level = FALSE - triggered = TRUE - icon_state = "fire1" + //Spieder spawner diff --git a/code/modules/awaymissions/mission_code/challenge.dm b/code/modules/awaymissions/mission_code/challenge.dm index 49662238100..7de2e5b8bc0 100644 --- a/code/modules/awaymissions/mission_code/challenge.dm +++ b/code/modules/awaymissions/mission_code/challenge.dm @@ -27,7 +27,7 @@ desc = "A heavy duty industrial laser" icon = 'icons/obj/engines_and_power/singularity.dmi' icon_state = "emitter" - anchored = 1 + anchored = TRUE density = 1 use_power = NO_POWER_USE diff --git a/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation.dm b/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation.dm index db62708fbbb..f067c68b895 100644 --- a/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation.dm +++ b/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation.dm @@ -100,9 +100,9 @@ /datum/outfit/oldstation/post_equip(mob/living/carbon/human/H) . = ..() - H.remove_language("Galactic Common") - H.set_default_language(GLOB.all_languages["Sol Common"]) - H.dna.species.default_language = "Sol Common" + H.remove_language(LANGUAGE_GALACTIC_COMMON) + H.set_default_language(GLOB.all_languages[LANGUAGE_SOL_COMMON]) + H.dna.species.default_language = LANGUAGE_SOL_COMMON /datum/outfit/oldstation/officer name = "Old station officer" diff --git a/code/modules/awaymissions/mission_code/ruins/USSP_gorky17.dm b/code/modules/awaymissions/mission_code/ruins/USSP_gorky17.dm index 1f8cfc6ff85..76ea3476529 100644 --- a/code/modules/awaymissions/mission_code/ruins/USSP_gorky17.dm +++ b/code/modules/awaymissions/mission_code/ruins/USSP_gorky17.dm @@ -342,7 +342,7 @@ /////////////////// Paper notes /obj/item/paper/gorky17 - language = "Neo-Russkiya" + language = LANGUAGE_NEO_RUSSIAN /obj/item/paper/gorky17/talisman name = "Проклятый талисман" info = "
НЕ ТРОГАЙ ЭТУ ХРЕНЬ ИЗ ЯЩИКА!
\
diff --git a/code/modules/awaymissions/mission_code/ruins/graveyard.dm b/code/modules/awaymissions/mission_code/ruins/graveyard.dm
index cfd23a2cac0..f6da0b0e414 100644
--- a/code/modules/awaymissions/mission_code/ruins/graveyard.dm
+++ b/code/modules/awaymissions/mission_code/ruins/graveyard.dm
@@ -36,11 +36,10 @@
icon_state = "case-0"
allowed_books = list(/obj/item/storage/funeral_urn)
-/obj/structure/bookcase/ashframe/update_icon()
- if(contents.len < 5)
- icon_state = "case-[contents.len]"
- else
- icon_state = "case-5"
+
+/obj/structure/bookcase/ashframe/update_icon_state()
+ icon_state = "case-[min(length(contents), 5)]"
+
/obj/structure/bookcase/ashframe/random
diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm
index 59480303a93..c75ca6f45d7 100644
--- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm
+++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm
@@ -104,7 +104,7 @@
// Papers
/obj/item/paper/fluff/ruins/oldstation
name = "Cryo Awakening Alert"
- language = "Sol Common"
+ language = LANGUAGE_SOL_COMMON
info = "**WARNING**
Catastrophic damage sustained to station. Powernet exhausted to reawaken crew.
Immediate Objectives
1: Activate emergency power generator
2: Lift station lockdown on the bridge
Please locate the 'Damage Report' on the bridge for a detailed situation report."
/obj/item/paper/fluff/ruins/oldstation/damagereport
@@ -152,7 +152,7 @@
*eep th* *e**l of **m..
The last words completly faded." // yep, the temperature overheat, some players set power to 5 and make the gen to blow up, rip oldstation.
/obj/item/paper/ruins/oldstation
- language = "Sol Common"
+ language = LANGUAGE_SOL_COMMON
/obj/item/paper/ruins/oldstation/protoinventory
name = "Theta RnD Prototype Inventory Secure Storage"
diff --git a/code/modules/awaymissions/mission_code/spacebattle.dm b/code/modules/awaymissions/mission_code/spacebattle.dm
index 90958a14048..afa9d8f43b8 100644
--- a/code/modules/awaymissions/mission_code/spacebattle.dm
+++ b/code/modules/awaymissions/mission_code/spacebattle.dm
@@ -231,11 +231,11 @@
/obj/effect/landmark/awaymissions/spacebattle/mine_spawner
icon = 'icons/obj/spacebattle.dmi'
icon_state = "spawner_mine"
- canmove = 0
+ canmove = FALSE
var/id = null
- var/triggered = 0
+ var/triggered = FALSE
var/faction = null
- var/safety_z_check = 1
+ var/safety_z_check = TRUE
/obj/effect/landmark/awaymissions/spacebattle/mob_spawn
name = "spawner"
@@ -260,7 +260,7 @@
continue
if(S.id == id)
new S.syndi_mob(get_turf(S))
- triggered = 1
+ triggered = TRUE
qdel(src)
/mob/living/proc/spawn_alert(atom/A) // Вызывает появление восклицательного знака над головой при наступании на маркер
@@ -689,26 +689,33 @@
shoes = /obj/item/clothing/shoes/black
suit = /obj/item/clothing/suit/storage/labcoat/science
+
/obj/item/clothing/suit/space/hardsuit/syndi/damaged
name = "damaged blood-red hardsuit"
desc = "Damaged advanced hardsuit designed for work in special operations. There are a many patches visible on the suit. Its mode switcher system looks damaged and forced in travel mode. Property of Gorlex Marauders."
armor = list("melee" = 30, "bullet" = 40, "laser" = 20, "energy" = 20, "bomb" = 30, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90)
w_class = WEIGHT_CLASS_NORMAL
- on = 1
+ icon_state = "hardsuit1-syndi"
+ on = TRUE
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged
actions_types = list(/datum/action/item_action/toggle_helmet)
-/obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged/attack_self(mob/user) //Toggle Helmet
- if(!on)
- to_chat(user, "You cant switch your hardsuit to combat mode.")
- playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1)
- .=..()
/obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged
- on = 1
icon_state = "hardsuit1-syndi"
item_state = "syndie_helm"
actions_types = list(/datum/action/item_action/toggle_helmet_light)
+ on = TRUE
+
+
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged/update_icon_state()
+ return
+
+
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged/adjust_headgear(mob/living/carbon/human/user, toggle = FALSE)
+ if(user)
+ to_chat(user, span_notice("You cant switch your hardsuit to combat mode."))
+ playsound(user, 'sound/machines/buzz-two.ogg', 50, TRUE)
+ return
+ ..()
-/obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged/update_icon()
- icon_state = "hardsuit1-syndi"
diff --git a/code/modules/awaymissions/mission_code/spacehotel.dm b/code/modules/awaymissions/mission_code/spacehotel.dm
index 8b67115ae0e..fdc64fa78c2 100644
--- a/code/modules/awaymissions/mission_code/spacehotel.dm
+++ b/code/modules/awaymissions/mission_code/spacehotel.dm
@@ -144,8 +144,7 @@
return 1
return 0
-/obj/machinery/door/unpowered/hotel_door/update_icon()
- overlays.Cut()
+/obj/machinery/door/unpowered/hotel_door/update_icon_state()
if(density)
icon_state = "door_closed"
else
@@ -193,7 +192,7 @@
icon = 'icons/mob/screen_gen.dmi'
icon_state = "x"
invisibility = INVISIBILITY_ABSTRACT
- anchored = 1
+ anchored = TRUE
density = 0
opacity = 0
var/list/room_doors[0] // assoc list of [room id]=hotel_door
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
index c37899eba9f..02b57d03a95 100644
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ b/code/modules/awaymissions/mission_code/stationCollision.dm
@@ -69,8 +69,8 @@
//Syndicate sub-machine guns.
/obj/item/gun/projectile/automatic/c20r/sc_c20r
-/obj/item/gun/projectile/automatic/c20r/sc_c20r/New()
- ..()
+/obj/item/gun/projectile/automatic/c20r/sc_c20r/Initialize(mapload)
+ . = ..()
for(var/ammo in magazine.stored_ammo)
if(prob(95)) //95% chance
magazine.stored_ammo -= ammo
@@ -78,8 +78,8 @@
//Barman's shotgun
/obj/item/gun/projectile/shotgun/sc_pump
-/obj/item/gun/projectile/shotgun/sc_pump/New()
- ..()
+/obj/item/gun/projectile/shotgun/sc_pump/Initialize(mapload)
+ . = ..()
for(var/ammo in magazine.stored_ammo)
if(prob(95)) //95% chance
magazine.stored_ammo -= ammo
@@ -178,7 +178,7 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
if(prob(25))
mezzer()
-/obj/singularity/narsie/sc_Narsie/consume(var/atom/A)
+/obj/singularity/narsie/sc_Narsie/consume(atom/A)
if(!A.simulated)
return FALSE
if(is_type_in_list(A, uneatable))
@@ -196,7 +196,7 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
for(var/obj/O in T.contents)
if(O.level != 1)
continue
- if(O.invisibility == INVISIBILITY_ABSTRACT)
+ if(O.invisibility == INVISIBILITY_MAXIMUM || O.invisibility == INVISIBILITY_ABSTRACT)
src.consume(O)
T.ChangeTurf(T.baseturf)
return
diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm
index 39e068ef64b..deb58adf9d3 100644
--- a/code/modules/awaymissions/mission_code/wildwest.dm
+++ b/code/modules/awaymissions/mission_code/wildwest.dm
@@ -43,7 +43,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "syndbeacon"
- anchored = 1
+ anchored = TRUE
density = 1
use_power = NO_POWER_USE
@@ -128,7 +128,7 @@
name = "Meat Grinder"
desc = "What is that thing?"
density = 1
- anchored = 1
+ anchored = TRUE
layer = 3
icon = 'icons/mob/blob.dmi'
icon_state = "blobpod"
diff --git a/code/modules/awaymissions/pamphlet.dm b/code/modules/awaymissions/pamphlet.dm
index ffbb188ada2..77e3f053ef1 100644
--- a/code/modules/awaymissions/pamphlet.dm
+++ b/code/modules/awaymissions/pamphlet.dm
@@ -34,5 +34,5 @@
environs."
//we don't want the silly text overlay!
-/obj/item/paper/pamphlet/update_icon()
+/obj/item/paper/pamphlet/update_icon_state()
return
diff --git a/code/modules/awaymissions/zvis.dm b/code/modules/awaymissions/zvis.dm
index 5dd78cc4772..c0dcd99c93c 100644
--- a/code/modules/awaymissions/zvis.dm
+++ b/code/modules/awaymissions/zvis.dm
@@ -155,7 +155,7 @@
icon = 'icons/mob/screen_gen.dmi'
icon_state = "x2"
invisibility = INVISIBILITY_ABSTRACT
- anchored = 1
+ anchored = TRUE
var/id = null // id of other portal turf we connect to
diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm
index 9f74ac9aeff..ac6ded10777 100644
--- a/code/modules/buildmode/buttons.dm
+++ b/code/modules/buildmode/buttons.dm
@@ -26,7 +26,7 @@
update_icon()
return TRUE
-/obj/screen/buildmode/mode/update_icon()
+/obj/screen/buildmode/mode/update_icon_state()
icon_state = bd.mode.get_button_iconstate()
/obj/screen/buildmode/help
@@ -43,7 +43,7 @@
screen_loc = "NORTH,WEST+2"
name = "Change Dir"
-/obj/screen/buildmode/bdir/update_icon()
+/obj/screen/buildmode/bdir/update_icon_state()
dir = bd.build_dir
/obj/screen/buildmode/bdir/Click()
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index e2028b4ea82..95c8c0da5d4 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -10,6 +10,7 @@
//I would just like the code ready should it ever need to be used.
#define SUGGESTED_CLIENT_VERSION 514 // only integers (e.g: 513, 514) are useful here. This is the part BEFORE the ".", IE 513 out of 513.1536
#define SUGGESTED_CLIENT_BUILD 1568 // only integers (e.g: 1536, 1539) are useful here. This is the part AFTER the ".", IE 1536 out of 513.1536
+#define MINIMUM_FPS_VERSION 511 // used as check, if you can update fps or not
#define SSD_WARNING_TIMER 30 // cycles, not seconds, so 30=60s
@@ -310,6 +311,7 @@
prefs = GLOB.preferences_datums[ckey]
if(!prefs)
prefs = new /datum/preferences(src)
+ set_macros()
GLOB.preferences_datums[ckey] = prefs
else
prefs.parent = src
@@ -321,10 +323,10 @@
prefs.init_keybindings(prefs.keybindings_overrides) //The earliest sane place to do it where prefs are not null, if they are null you can't do crap at lobby
prefs.last_ip = address //these are gonna be used for banning
prefs.last_id = computer_id //these are gonna be used for banning
- if(world.byond_version >= 511 && byond_version >= 511 && prefs.clientfps)
+ if(world.byond_version >= MINIMUM_FPS_VERSION && byond_version >= MINIMUM_FPS_VERSION && prefs.clientfps)
fps = prefs.clientfps
- if(world.byond_version >= 511 && byond_version >= 511 && !prefs.clientfps)
+ if(world.byond_version >= MINIMUM_FPS_VERSION && byond_version >= MINIMUM_FPS_VERSION && !prefs.clientfps)
fps = CONFIG_GET(number/clientfps)
// Check if the client has or has not accepted TOS
@@ -977,33 +979,40 @@
/client/proc/activate_darkmode()
///// BUTTONS /////
/* Rpane */
- winset(src, "rpane.fullscreenb", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "rpane.textb", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "rpane.infob", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "rpane.wikib", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "rpane.forumb", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "rpane.rulesb", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "rpane.githubb", "background-color=#40628a;text-color=#FFFFFF")
+ winset(src, "rpane.fullscreenb", "background-color=#494949;text-color=#a4bad6")
+ winset(src, "rpane.textb", "background-color=#494949;text-color=#a4bad6")
+ winset(src, "rpane.infob", "background-color=#494949;text-color=#a4bad6")
+ winset(src, "rpane.wikib", "background-color=#494949;text-color=#a4bad6")
+ winset(src, "rpane.rulesb", "background-color=#494949;text-color=#a4bad6")
+ winset(src, "rpane.githubb", "background-color=#494949;text-color=#a4bad6")
winset(src, "rpane.webmap", "background-color=#494949;text-color=#a4bad6")
- /* Mainwindow */
- winset(src, "mainwindow.saybutton", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "mainwindow.mebutton", "background-color=#40628a;text-color=#FFFFFF")
+ /* Outputwindow */
+ winset(src, "outputwindow.saybutton", "background-color=#494949;text-color=#a4bad6")
+ winset(src, "outputwindow.mebutton", "background-color=#494949;text-color=#a4bad6")
+
///// UI ELEMENTS /////
/* Mainwindow */
- winset(src, "mainwindow", "background-color=#272727")
- winset(src, "mainwindow.mainvsplit", "background-color=#272727")
- winset(src, "mainwindow.tooltip", "background-color=#272727")
+ winset(src, "mainwindow", "background-color=#171717")
+ winset(src, "mainwindow.mainvsplit", "background-color=#202020")
+ winset(src, "mainwindow.tooltip", "background-color=#171717")
/* Outputwindow */
- winset(src, "outputwindow.browseroutput", "background-color=#272727")
+ winset(src, "outputwindow", "background-color=#202020")
+ winset(src, "outputwindow.input", "text-color=#a4bad6;background-color=#202020")
+ winset(src, "outputwindow.browseroutput", "background-color=#202020")
/* Rpane */
- winset(src, "rpane", "background-color=#272727")
- winset(src, "rpane.rpanewindow", "background-color=#272727")
+ winset(src, "rpane", "background-color=#202020")
+ winset(src, "rpane.rpanewindow", "background-color=#202020")
/* Browserwindow */
- winset(src, "browserwindow", "background-color=#272727")
- winset(src, "browserwindow.browser", "background-color=#272727")
+
+ //winset(src, "browserwindow", "background-color=#272727")
+ //winset(src, "browserwindow.browser", "background-color=#272727")
/* Infowindow */
- winset(src, "infowindow", "background-color=#272727;text-color=#FFFFFF")
- winset(src, "infowindow.info", "background-color=#272727;text-color=#FFFFFF;highlight-color=#009900;tab-text-color=#FFFFFF;tab-background-color=#272727")
+ winset(src, "infowindow", "background-color=#202020;text-color=#a4bad6")
+ winset(src, "infowindow.info", "background-color=#171717;text-color=#a4bad6;highlight-color=#009900;tab-text-color=#a4bad6;tab-background-color=#202020")
+ //Macros
+ winset(src, "default-Tab", "parent=default;name=Tab;command=\".winset \\\"mainwindow.macro=legacy input.focus=true input.background-color=[COLOR_DARK_INPUT_ENABLED]\\\"\"")
+ winset(src, "legacy-Tab", "parent=legacy;name=Tab;command=\".winset \\\"mainwindow.macro=default map.focus=true input.background-color=[COLOR_DARK_INPUT_DISABLED]\\\"\"")
+
// NOTIFY USER
to_chat(src, "Darkmode Enabled")
@@ -1014,29 +1023,36 @@
winset(src, "rpane.textb", "background-color=none;text-color=#000000")
winset(src, "rpane.infob", "background-color=none;text-color=#000000")
winset(src, "rpane.wikib", "background-color=none;text-color=#000000")
- winset(src, "rpane.forumb", "background-color=none;text-color=#000000")
+ //winset(src, "rpane.forumb", "background-color=none;text-color=#000000")
winset(src, "rpane.rulesb", "background-color=none;text-color=#000000")
winset(src, "rpane.githubb", "background-color=none;text-color=#000000")
- winset(src, "rpane.webmap", "background-color=#494949;text-color=#a4bad6")
- /* Mainwindow */
- winset(src, "mainwindow.saybutton", "background-color=none;text-color=#000000")
- winset(src, "mainwindow.mebutton", "background-color=none;text-color=#000000")
+ winset(src, "rpane.webmap", "background-color=none;text-color=#000000")
+ /* Outputwindow */
+ winset(src, "outputwindow.saybutton", "background-color=none;text-color=#000000")
+ winset(src, "outputwindow.mebutton", "background-color=none;text-color=#000000")
+
///// UI ELEMENTS /////
/* Mainwindow */
winset(src, "mainwindow", "background-color=none")
winset(src, "mainwindow.mainvsplit", "background-color=none")
winset(src, "mainwindow.tooltip", "background-color=none")
/* Outputwindow */
+ winset(src, "outputwindow", "background-color=none")
+ winset(src, "outputwindow.input", "text-color=none; background-color=#F0F0F0")
winset(src, "outputwindow.browseroutput", "background-color=none")
/* Rpane */
winset(src, "rpane", "background-color=none")
winset(src, "rpane.rpanewindow", "background-color=none")
/* Browserwindow */
- winset(src, "browserwindow", "background-color=none")
- winset(src, "browserwindow.browser", "background-color=none")
+ //winset(src, "browserwindow", "background-color=none")
+ //winset(src, "browserwindow.browser", "background-color=none")
/* Infowindow */
winset(src, "infowindow", "background-color=none;text-color=#000000")
winset(src, "infowindow.info", "background-color=none;text-color=#000000;highlight-color=#007700;tab-text-color=#000000;tab-background-color=none")
+ //Macros
+ winset(src, "default-Tab", "parent=default;name=Tab;command=\".winset \\\"mainwindow.macro=legacy input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"")
+ winset(src, "legacy-Tab", "parent=legacy;name=Tab;command=\".winset \\\"mainwindow.macro=default map.focus=true input.background-color=[COLOR_INPUT_DISABLED]\\\"\"")
+
///// NOTIFY USER /////
to_chat(src, "Darkmode Disabled") // what a sick fuck
@@ -1347,7 +1363,14 @@
log_adminwarn("[key] has just connected with BYOND v[byond_version].[byond_build] for the first time. BYOND account registered on [byondacc_date] ([byondacc_age] days old)")
/client/proc/show_update_notice()
- to_chat(src, "Your BYOND client (v: [byond_version].[byond_build]) is out of date. This can cause glitches. We highly suggest you download the latest client from byond.com before playing. You can also update via the BYOND launcher application.")
+ var/list/msg = list({""})
+ msg += "Ваша версия BYOND устарела:
"
+ msg += "Это может привести к проблемам, таким как к неправильному отображением вещей или лагам.
"
+ msg += "Ваша версия: [byond_version].[byond_build]
"
+ msg += "Требуемая версия, чтобы убрать это окно: [SUGGESTED_CLIENT_VERSION].[SUGGESTED_CLIENT_BUILD] или выше
"
+ msg += "Посетите сайт BYOND, чтобы скачать последнюю версию.
"
+ src << browse(msg.Join(""), "window=warning_popup")
+ to_chat(src, span_userdanger("Ваш клиент BYOND (версия: [byond_version].[byond_build]) устарел. Это может вызвать лаги. Мы крайне рекомендуем скачать последнюю версию с byond.com Прежде чем играть. Также можете обновиться через приложение BYOND."))
/client/proc/update_ambience_pref()
@@ -1401,7 +1424,7 @@
/// Returns the biggest number from client.view so we can do easier maths
/client/proc/maxview()
var/list/screensize = getviewsize(view)
- return max(screensize[1], screensize[2])
+ return round(max(screensize[1], screensize[2]) / 2)
#undef LIMITER_SIZE
diff --git a/code/modules/client/preference/loadout/loadout_donor.dm b/code/modules/client/preference/loadout/loadout_donor.dm
index 338ecaa832a..bc1229a279c 100644
--- a/code/modules/client/preference/loadout/loadout_donor.dm
+++ b/code/modules/client/preference/loadout/loadout_donor.dm
@@ -3,6 +3,18 @@
sort_category = "Donor"
subtype_path = /datum/gear/donor
+/datum/gear/donor/ussptracksuit_black
+ donator_tier = 1
+ cost = 1
+ display_name = "track suit (black)"
+ path = /obj/item/clothing/under/ussptracksuit_black
+
+/datum/gear/donor/ussptracksuit_white
+ donator_tier = 1
+ cost = 1
+ display_name = "track suit (white)"
+ path = /obj/item/clothing/under/ussptracksuit_white
+
/datum/gear/donor/kittyears
display_name = "Kitty ears"
path = /obj/item/clothing/head/kitty
diff --git a/code/modules/client/preference/loadout/loadout_glasses.dm b/code/modules/client/preference/loadout/loadout_glasses.dm
index a84af914c49..b53c8bd360e 100644
--- a/code/modules/client/preference/loadout/loadout_glasses.dm
+++ b/code/modules/client/preference/loadout/loadout_glasses.dm
@@ -22,3 +22,8 @@
/datum/gear/glasses/prescription
display_name = "Prescription glasses"
path = /obj/item/clothing/glasses/regular
+
+/datum/gear/glasses/sectacticool
+ display_name = "Security tactical glasses"
+ path = /obj/item/clothing/glasses/hud/security/sunglasses/tacticool
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm
index 3844d89b851..8e08be9c49c 100644
--- a/code/modules/client/preference/loadout/loadout_hat.dm
+++ b/code/modules/client/preference/loadout/loadout_hat.dm
@@ -202,3 +202,8 @@
/datum/gear/hat/capsolgov
display_name = "cap, Sol Gov"
path = /obj/item/clothing/head/soft/solgov
+
+/datum/gear/hat/lwhelmet
+ display_name = "security lightweight helmet"
+ path = /obj/item/clothing/head/helmet/lightweighthelmet
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm
index 2016a37c03b..025838ff869 100644
--- a/code/modules/client/preference/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference/loadout/loadout_uniform.dm
@@ -442,3 +442,13 @@
display_name = "hawaiian shirt (orange)"
description = "Come one step closer and I will knock his teeth out!"
path = /obj/item/clothing/under/orangehawaiianshirt
+
+/datum/gear/uniform/ussptracksuit_red
+ display_name = "track suit (red)"
+ description = "A classic track suit. There is a small tag on the clothes that says \"Made in the USSP\"."
+ path = /obj/item/clothing/under/ussptracksuit_red
+
+/datum/gear/uniform/ussptracksuit_blue
+ display_name = "track suit (blue)"
+ description = "A classic track suit. There is a small tag on the clothes that says \"Made in the USSP\"."
+ path = /obj/item/clothing/under/ussptracksuit_blue
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index cb0827a3c31..0f4169430a5 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -140,7 +140,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
var/e_colour = "#000000" //Eye color
var/alt_head = "None" //Alt head style.
var/species = "Human"
- var/language = "None" //Secondary language
+ var/language = "None" //Secondary language for choise.
var/autohiss_mode = AUTOHISS_FULL //Species autohiss level. OFF, BASIC, FULL.
var/tts_seed = null
@@ -196,6 +196,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
var/med_record = ""
var/sec_record = ""
var/gen_record = ""
+ var/exploit_record = ""
var/disabilities = 0
var/nanotrasen_relation = "Neutral"
@@ -245,6 +246,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
var/list/keybindings_overrides = null
/// View range preference for this client
var/viewrange = DEFAULT_CLIENT_VIEWSIZE
+ /// How dark things are if client is a ghost, 0-255
+ var/ghost_darkness_level = LIGHTING_PLANE_ALPHA_VISIBLE
/// Minigames notification about their end, start and etc.
var/minigames_notifications = TRUE
@@ -253,7 +256,6 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
/datum/preferences/New(client/C)
parent = C
b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
- parent?.set_macros()
max_gear_slots = CONFIG_GET(number/max_loadout_points)
var/loaded_preferences_successfully = FALSE
if(istype(C))
@@ -307,13 +309,12 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
species = initial(species)
S = GLOB.all_species[species]
random_character()
-
dat += "
| "
dat += "Name: "
dat += "[real_name]"
dat += "(Randomize)"
- dat += "(Always Randomize) " + dat += "(Always Randomize) " dat += " | "
dat += " " @@ -748,13 +749,13 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts var/list/html = list() html += "" if(!length(SSjobs.occupations)) - html += "The Jobs subsystem is not yet finished creating jobs, please try again later" - html += " " // Easier to press up here. + html += "Подсистема вакансий ещё не успела создать вакансии, пожалуйста, повторите попытку позже" + html += " " // Easier to press up here. else html += " Unavailable occupations are crossed out. " - html += " " // Easier to press up here. - html += " Left-click to raise an occupation preference, right-click to lower it. "
+ html += "Выберите предпочитаемые должностиОпределите приоритет на получение желаемой работы. " + html += " " // Easier to press up here. + html += " Левый клик - для повышения предпочтения профессии, правый - для понижения. "
html += ""
html += "
|
"
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
@@ -501,9 +569,9 @@
if(!stamped)
stamped = new
stamped += S.type
- overlays += stampoverlay
+ stamp_overlays += stampoverlay
+ update_icon(UPDATE_OVERLAYS)
- playsound(S, pick(S.stamp_sounds), 35, 1, -1)
/*
* Premade paper
@@ -531,7 +599,7 @@
/obj/item/paper/flag
icon_state = "flag_neutral"
item_state = "paper"
- anchored = 1.0
+ anchored = TRUE
/obj/item/paper/jobs
name = "Job Information"
@@ -550,8 +618,10 @@
name = "paper scrap"
icon_state = "scrap"
-/obj/item/paper/crumpled/update_icon()
- return
+
+/obj/item/paper/crumpled/update_icon_state()
+ if(info)
+ icon_state = "scrap_words"
/obj/item/paper/crumpled/bloody
icon_state = "scrap_bloodied"
@@ -567,9 +637,10 @@
info = "
